X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fargs.h;h=c0350e4a0ecc88d6d07c55d18f7393150da61bb8;hp=a99c13824c6b2e64df2cdef3014970f8811a1102;hb=e0a27e1bd83ff2d60745dd6030e0f5ef7ef97b82;hpb=f75f79c8da5305b7e1fb246031188dc5cff6086f

diff --git a/lib/args.h b/lib/args.h
index a99c138..c0350e4 100644
--- a/lib/args.h
+++ b/lib/args.h
@@ -46,7 +46,7 @@ static void processargs(int argn2,char**argv2)
         if(t<argn2-1) next=argv2[t+1];
         else        next=0;
 
-        if(argv2[t][0]=='-')
+        if(argv2[t][0]=='-' && argv2[t][1])
         {
             if(argv2[t][1]=='-')
             {
@@ -82,23 +82,24 @@ static void processargs(int argn2,char**argv2)
                         s++;
                     } while(!ret);
                 }
-                else // - usually means "read stdout"
-                {
-                    t+=args_callback_option(&argv2[t][1],next);
-                }
             }
         }
         else
         {
-            t+=args_callback_command(argv2[t],next);
+	    int num = args_callback_command(argv2[t],next);
+	    if(num>2) {
+		fprintf(stderr, "internal error in command line parsing\n");
+		exit(1);
+	    }
+            t+=num;
         }
     }
 }
 
 struct options_t
 {
-    char*shortoption;
-    char*longoption;
+    const char*shortoption;
+    const char*longoption;
 };
 
 static int args_long2shortoption(struct options_t*options, char*name, char*val)
@@ -206,4 +207,44 @@ static char is_in_range(int t, char*irange)
     return 0;
 }
 
+static char* filename2template(char*filename, int*startindex)
+{
+    int l = strlen(filename);
+    char*newname = (char*)malloc(l+5);
+    /* first look whether the file is already numbered */
+    while(1) {
+        l--;
+        if(l<0 || strchr("0123456789", filename[l]))
+            break;
+    };
+    if(l>=0) {
+        int lastdigit=l;
+        int firstdigit=l;
+        while(firstdigit && strchr("0123456789", filename[firstdigit-1]))
+            firstdigit--;
+        *startindex = atoi(filename+firstdigit);
+        memcpy(newname, filename, firstdigit);
+        sprintf(newname+firstdigit, "%%%dd", lastdigit+1-firstdigit);
+        strcat(newname+firstdigit, filename+lastdigit+1);
+        return newname;
+    }
+    /* if it isn't, try to paste a %d between filename and extension */
+    char*dot = strrchr(filename, '.');
+    if(dot) {
+        int pos = dot-filename;
+        memcpy(newname, filename, pos);
+        newname[pos++] = '.';
+        newname[pos++] = '%';
+        newname[pos++] = 'd';
+        strcpy(newname+pos, dot);
+        *startindex = 1;
+        return newname;
+    }
+    /* if that didn't work either, just append the number at the end */
+    strcpy(newname, filename);
+    strcat(newname, ".%d");
+    *startindex = 1;
+    return newname;
+}
+
 #endif //__args_h__