--- ray/src/ot/oconv.c	1994/02/27 10:16:42	2.7
+++ ray/src/ot/oconv.c	1995/06/02 17:47:04	2.11
@@ -22,12 +22,10 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #define	 OMARGIN	(10*FTINY)	/* margin around global cube */
 
-#define	 MAXOBJFIL	63		/* maximum number of scene files */
+#define	 MAXOBJFIL	127		/* maximum number of scene files */
 
 char  *progname;			/* argv[0] */
 
-char  *libpath;				/* library search path */
-
 int  nowarn = 0;			/* supress warnings? */
 
 int  objlim = 5;			/* # of objects before split */
@@ -46,9 +44,8 @@ int  (*addobjnotify[])() = {NULL};	/* new object notif
 
 main(argc, argv)		/* convert object files to an octree */
 int  argc;
-char  **argv;
+char  *argv[];
 {
-	extern char  *getenv();
 	FVECT  bbmin, bbmax;
 	char  *infile = NULL;
 	int  inpfrozen = 0;
@@ -58,15 +55,11 @@ char  **argv;
 
 	progname = argv[0] = fixargv0(argv[0]);
 
-	if ((libpath = getenv(ULIBVAR)) == NULL)
-		libpath = DEFPATH;
-
 	initotypes();
 
 	for (i = 1; i < argc && argv[i][0] == '-'; i++)
 		switch (argv[i][1]) {
 		case '\0':				/* scene from stdin */
-			outflags &= ~IO_FILES;
 			goto breakopt;
 		case 'i':				/* input octree */
 			infile = argv[++i];
@@ -104,9 +97,8 @@ breakopt:
 		nfiles = readoct(infile, IO_ALL, &thescene, ofname);
 		if (nfiles == 0)
 			inpfrozen++;
-	}
-
-	newheader("RADIANCE", stdout);	/* new binary file header */
+	} else
+		newheader("RADIANCE", stdout);	/* new binary file header */
 	printargs(argc, argv, stdout);
 	fputformat(OCTFMT, stdout);
 	printf("\n");