Imported Upstream version 2.10

[debian/cpmtools] / cpmrm.c

diff --git a/cpmrm.c b/cpmrm.c
index b88bdcab9f477618c245e91e73c96ad813af306d..0749235263731cb2b1db2ca8c7aaf9ea7ffd745a 100644 (file)
--- a/cpmrm.c
+++ b/cpmrm.c
@@ -1,12 +1,18 @@
 /* #includes */ /*{{{C}}}*//*{{{*/
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "config.h"
-#include "getopt.h"
+
+#include "getopt_.h"
 #include "cpmfs.h"
+
+#ifdef USE_DMALLOC
+#include <dmalloc.h>
+#endif
 /*}}}*/
 
 const char cmd[]="cpmrm";
@@ -35,7 +41,7 @@ int main(int argc, char *argv[]) /*{{{*/
   }
 
   if (optind>=(argc-1)) usage=1;
-  else image=argv[optind];
+  else image=argv[optind++];
 
   if (usage)
   {