[brlcad-commits] CVS: brlcad/src/conv/comgeom cvt.c,1.5,1.6

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/src/conv/comgeom
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16374

Modified Files:
	cvt.c 
Log Message:
should be using bu_getopt and friends

Index: cvt.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/comgeom/cvt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -w -u -r1.5 -r1.6
--- cvt.c	23 Jan 2007 01:13:25 -0000	1.5
+++ cvt.c	31 Jan 2007 20:38:57 -0000	1.6
@@ -58,6 +58,7 @@
 #include "vmath.h"
 #include "raytrace.h"
 #include "wdb.h"
+#include "bu.h"
 
 
 /* defined in region.c */
@@ -107,16 +108,16 @@
     register int	c;
     char		*file_name;
 
-    while ( (c = getopt( argc, argv, "d:v:s:" )) != EOF )  {
+    while ( (c = bu_getopt( argc, argv, "d:v:s:" )) != EOF )  {
 	switch( c )  {
 	    case 'd':
-		verbose = atoi(optarg);
+		verbose = atoi(bu_optarg);
 		break;
 	    case 's':
-		strncpy( name_it, optarg, sizeof(name_it) );
+		strncpy( name_it, bu_optarg, sizeof(name_it) );
 		break;
 	    case 'v':
-		version = atoi(optarg);
+		version = atoi(bu_optarg);
 		break;
 
 	    default:		/* '?' */
@@ -124,14 +125,14 @@
 	}
     }
 
-    if( optind+2 > argc )
+    if( bu_optind+2 > argc )
 	return(0);		/* FAIL */
 
     /* Input File */
-    if( optind >= argc )  {
+    if( bu_optind >= argc )  {
 	return(0);		/* FAIL */
     } else {
-	file_name = argv[optind++];
+	file_name = argv[bu_optind++];
 	if( (infp = fopen(file_name, "r")) == NULL )  {
 	    perror(file_name);
 	    return(0);
@@ -139,17 +140,17 @@
     }
 
     /* Output File */
-    if( optind >= argc )  {
+    if( bu_optind >= argc )  {
 	return(0);		/* FAIL */
     } else {
-	file_name = argv[optind++];
+	file_name = argv[bu_optind++];
 	if( (outfp = wdb_fopen(file_name)) == NULL )  {
 	    perror(file_name);
 	    return(0);
 	}
     }
 
-    if ( argc > ++optind )
+    if ( argc > ++bu_optind )
 	(void)fprintf( stderr, "comgeom-g: excess argument(s) ignored\n" );
 
     return(1);		/* OK */