added -a option

[swftools.git] / src / jpeg2swf.c

diff --git a/src/jpeg2swf.c b/src/jpeg2swf.c
index 17e6226..4781b48 100644 (file)
--- a/src/jpeg2swf.c
+++ b/src/jpeg2swf.c
@@ -15,8 +15,7 @@
 #include <fcntl.h>\r
 #include <jpeglib.h>\r
 #include "../lib/rfxswf.h"\r
-\r
-#include "args.h" // not really a header ;-)\r
+#include "../lib/args.h" // not really a header ;-)\r
 \r
 #define MAX_INPUT_FILES 1024\r
 #define VERBOSE(x) (global.verbose>=x)\r
@@ -176,7 +175,7 @@ int CheckInputFile(char * fname,char ** realname)
         if ((f=fopen(s,"rb"))==NULL)\r
         { sprintf(s,"%s.JPEG",fname);\r
           if ((f=fopen(s,"rb"))==NULL)\r
-            return 0;\r
+            return -1;\r
         }\r
       }\r
     }\r
@@ -233,7 +232,7 @@ int args_callback_option(char*arg,char*val)
       if (val) global.force_height = atoi(val); res = 1; break;\r
 \r
     case 'V':\r
-      printf("jpeg2swf - part of swftools 0.0.1\n");exit(0);\r
+      printf("jpeg2swf - part of %s %s\n", PACKAGE, VERSION);exit(0);\r
       \r
     default:\r
       res = -1;\r
@@ -247,27 +246,18 @@ int args_callback_option(char*arg,char*val)
   return res;\r
 }\r
 \r
-struct options_t\r
-{ char*shortoption;\r
-  char*longoption;\r
-} options[] =\r
+struct options_t options[] =\r
 {{"q","quality"},\r
  {"o","output"},\r
  {"r","rate"},\r
  {"v","verbose"},\r
  {"X","width"},\r
  {"Y","height"},\r
- {"v","verbose"},\r
  {"V","version"}\r
 };\r
 \r
 int args_callback_longoption(char*name,char*val) {\r
-    int t;\r
-    for(t=0;t<sizeof(options)/sizeof(struct options_t);t++)\r
-        if(!strcmp(options[t].longoption, name))\r
-            return args_callback_option(options[t].shortoption,val);\r
-    if (VERBOSE(1)) fprintf(stderr, "Unknown option: --%s\n", name);\r
-    exit(1);\r
+    return args_long2shortoption(options, name, val);\r
 }\r
 \r
 int args_callback_command(char*arg,char*next)  // actually used as filename\r