X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=cpmrm.c;h=d6639532b7af888a8890f9e0adcc057cb6ed9f9d;hb=749b004e4bb5830a6246a30ebe0a158e448327c5;hp=b88bdcab9f477618c245e91e73c96ad813af306d;hpb=32087c67d53a8f8058b359388f23e2dbc9436d54;p=debian%2Fcpmtools

diff --git a/cpmrm.c b/cpmrm.c
index b88bdca..d663953 100644
--- 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)
   {
@@ -60,6 +66,7 @@ int main(int argc, char *argv[]) /*{{{*/
       exitcode=1;
     }
   }
+  cpmUmount(&drive);
   exit(exitcode);
 }
 /*}}}*/