X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fsdf2img.c;fp=src%2Fsdf2img.c;h=600d8d77582a43369545876a2d09a941956e882f;hb=c95a927599e20c3d7762073450e3126d9694107d;hp=b19013b796cac96bc5344322a7811fb064149507;hpb=1e8e203f6b646a69235589d3b8f931da12e77b91;p=ctsim.git

diff --git a/src/sdf2img.c b/src/sdf2img.c
index b19013b..600d8d7 100644
--- a/src/sdf2img.c
+++ b/src/sdf2img.c
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sdf2img.c,v 1.2 2000/05/08 20:02:32 kevin Exp $
+**  $Id: sdf2img.c,v 1.3 2000/05/16 04:33:59 kevin Exp $
 **  $Log: sdf2img.c,v $
+**  Revision 1.3  2000/05/16 04:33:59  kevin
+**  Improved option processing
+**
 **  Revision 1.2  2000/05/08 20:02:32  kevin
 **  ANSI C changes
 **
@@ -25,8 +28,9 @@
 **  along with this program; if not, write to the Free Software
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
+
 /* FILE
- *   sdf2img.c				Convert an SDF file to a viewable format image
+ *   sdf2img.c		Convert an SDF file to a viewable format image
  */
 
 #include "ct.h"
@@ -89,9 +93,9 @@ static struct option my_options[] =
 #define O_FORMAT_PGMASC_STR "pgmasc"
 
 void 
-usage (const char *program)
+sdf2img_usage (const char *program)
 {
-  fprintf(stdout, "usage: %s sdfname outfile [OPTIONS]\n", kbasename(program));
+  fprintf(stdout, "sdf2img_usage: %s sdfname outfile [OPTIONS]\n", kbasename(program));
   fprintf(stdout, "Convert SDF2D file to an image file\n");
   fprintf(stdout, "\n");
   fprintf(stdout, "     sdfname    Name of input SDF file\n");
@@ -124,11 +128,11 @@ usage (const char *program)
   fprintf(stdout, "     --verbose  Set verbose mode\n");
   fprintf(stdout, "     --version  Print version\n");
   fprintf(stdout, "     --help     Print this help message\n");
-  exit(1);
 }
 
+
 int 
-main (int argc, char *const argv[])
+sdf2img_main (int argc, char *const argv[])
 {
   IMAGE *im;
   double densmin = HUGE_VAL, densmax = -HUGE_VAL;
@@ -162,8 +166,8 @@ main (int argc, char *const argv[])
 	  if (endptr != endstr)
 	    {
 	      fprintf(stderr, "Error setting --min to %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 	  break;
 	case O_MAX:
@@ -173,8 +177,8 @@ main (int argc, char *const argv[])
 	  if (endptr != endstr)
 	    {
 	      fprintf(stderr, "Error setting --max to %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 	  break;
 	case O_SCALE:
@@ -183,8 +187,8 @@ main (int argc, char *const argv[])
 	  if (endptr != endstr)
 	    {
 	      fprintf(stderr,"Error setting --scale to %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 	  break;
 	case O_AUTO:
@@ -203,8 +207,8 @@ main (int argc, char *const argv[])
 	  else
 	    {
 	      fprintf(stderr, "Invalid auto mode %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 		break;
 	case O_CENTER:
@@ -215,8 +219,8 @@ main (int argc, char *const argv[])
 	  else
 	    {
 	      fprintf(stderr, "Invalid center mode %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
 		break;
 	case O_FORMAT:
@@ -234,10 +238,10 @@ main (int argc, char *const argv[])
 #endif
 	  else {
 	      fprintf(stderr, "Invalid format mode %s\n", optarg);
-	      usage(argv[0]);
-	      exit(1);
+	      sdf2img_usage(argv[0]);
+	      return (1);
 	    }
-		break;
+	  break;
 	case O_LABELS:
 	  opt_labels = 1;
 	  break;
@@ -259,18 +263,18 @@ main (int argc, char *const argv[])
 	  exit(0);
 	case O_HELP:
 	case '?':
-	  usage(argv[0]);
-	  exit(0);
+	  sdf2img_usage(argv[0]);
+	  return (0);
 	default:
-	  usage(argv[0]);
-	  exit(1);
+	  sdf2img_usage(argv[0]);
+	  return (1);
 	}
     }
 
   if (optind + 2 != argc)
     {
-      usage(argv[0]);
-      exit(1);
+      sdf2img_usage(argv[0]);
+      return (1);
     }
   
   in_file = argv[optind];
@@ -279,7 +283,7 @@ main (int argc, char *const argv[])
   if ((im = image_load (in_file)) == NULL)
     {
       fprintf(stderr, "File %s does not exist\n", in_file);
-      exit(1);
+      return (1);
     }
 
   if (opt_labels) 
@@ -391,7 +395,7 @@ main (int argc, char *const argv[])
 	  else
 	    {
 	      fprintf(stderr, "Internal Error: Invalid auto mode %d\n", opt_auto);
-	      exit(1);
+	      return (1);
 	    }
 	}
       if (opt_stats)
@@ -415,7 +419,7 @@ main (int argc, char *const argv[])
 	  else
 	    {
 	      fprintf(stderr, "Internal Error: Invalid center mode %d\n", opt_center);
-	      exit(1);
+	      return (1);
 	    }
 	  if (! opt_set_max)
 	    densmax = center + window;
@@ -445,7 +449,7 @@ main (int argc, char *const argv[])
   else
     {
       fprintf(stderr, "Internal Error: Invalid format mode %d\n", opt_format);
-      exit(1);
+      return (1);
     }
   return (0);
 }
@@ -692,3 +696,10 @@ sdf2d_to_gif (IMAGE *im, char *outfile, int nxcell, int nycell, double densmin,
 #endif
 }
 
+#ifndef NO_MAIN
+int 
+main (int argc, char *const argv[])
+{
+  return (sdf2img_main(argc, argv));
+}
+#endif