X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Frs2sdf.c;h=80d1304853b7f6e102f3682bf1a9a4b8412f53de;hb=301180c6c8edb98580ee6657e87f5a21342b5d96;hp=9ea63c658c444c0413a5a8180539d218207ae017;hpb=13838bda88b63a2535b5baaf7197006767de4b8e;p=ctsim.git

diff --git a/src/rs2sdf.c b/src/rs2sdf.c
index 9ea63c6..80d1304 100644
--- a/src/rs2sdf.c
+++ b/src/rs2sdf.c
@@ -2,10 +2,17 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: rs2sdf.c,v 1.1 2000/04/28 13:02:44 kevin Exp $
+**  $Id: rs2sdf.c,v 1.3 2000/05/16 04:33:59 kevin Exp $
 **  $Log: rs2sdf.c,v $
-**  Revision 1.1  2000/04/28 13:02:44  kevin
-**  Initial revision
+**  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
+**
+**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
+**  Initial CVS import for first public release
+**
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -21,6 +28,7 @@
 **  along with this program; if not, write to the Free Software
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
+
 /* FILE
  *   rs2sdf.c			Convert Raysum to image
  *
@@ -30,9 +38,7 @@
 
 #include "ct.h"
 
-#define O_VERBOSE  7
-#define O_HELP     8
-#define O_VERSION  9
+enum { O_VERBOSE, O_HELP, O_VERSION };
 
 static struct option my_options[] =
 {
@@ -44,20 +50,20 @@ static struct option my_options[] =
 
 
 void 
-usage (const char *program)
+rs2sdf_usage (const char *program)
 {
-  fprintf(stdout, "usage: %s in-rs-file out-sdf-file [OPTIONS]\n", kbasename(program));
+  fprintf(stdout, "rs2sdf_usage: %s in-rs-file out-sdf-file [OPTIONS]\n", kbasename(program));
   fprintf(stdout, "This program converts a raysum file to a SDF2D file\n");
   fprintf(stdout, "\n");
   fprintf(stdout, "   --verbose   Verbose mode\n");
   fprintf(stdout, "   --version   Print version\n");
   fprintf(stdout, "   --help      Print this help message\n");
-  exit(1);
 }
 
 	  
+
 int 
-main (const int argc, char *const argv[])
+rs2sdf_main (const int argc, char *const argv[])
 {
   IMAGE *im;
   RAYSUM *rs;
@@ -87,23 +93,25 @@ main (const int argc, char *const argv[])
 	  exit(0);
 	case O_HELP:
 	case '?':
-	  usage(argv[0]);
-	  exit(0);
+	  rs2sdf_usage(argv[0]);
+	  return (0);
 	default:
-	  usage(argv[0]);
-	  exit(1);
+	  rs2sdf_usage(argv[0]);
+	  return (1);
 	}
     }
   
-  if (argc - optind != 2)
-    usage(argv[0]);
+  if (argc - optind != 2) {
+    rs2sdf_usage(argv[0]);
+    return (1);
+  }
 
   rs_name = argv[optind];
   im_name = argv[optind + 1];
 
   if (file_exists(rs_name) == FALSE) {
     fprintf (stderr, "Raysum file %s does not exist\n", rs_name);
-    exit(1);
+    return (1);
   }
   
   rs = raysum_open (rs_name);
@@ -136,3 +144,11 @@ main (const int argc, char *const argv[])
   
   return(0);
 }
+
+#ifndef NO_MAIN
+int 
+main (const int argc, char *const argv[])
+{
+  return (rs2sdf_main(argc, argv));
+}
+#endif