Imported Upstream version 2.17

[debian/cpmtools] / fsck.cpm.c

diff --git a/fsck.cpm.c b/fsck.cpm.c
index 9878609c22fde985e26a728ab8f3ae8e0cefbc55..c1458037fcb1b2660c621f68258e05861c48729e 100644 (file)
--- a/fsck.cpm.c
+++ b/fsck.cpm.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "getopt.h"
+#include "getopt_.h"
 #include "cpmdir.h"
 #include "cpmfs.h"
 
@@ -571,13 +571,14 @@ int main(int argc, char *argv[])
 {
   const char *err;
   const char *image;
-  const char *format=FORMAT;
+  const char *format;
   const char *devopts=NULL;
   int c,usage=0;
   struct cpmSuperBlock sb;
   struct cpmInode root;
   enum Result ret;
 
+  if (!(format=getenv("CPMTOOLSFMT"))) format=FORMAT;
   while ((c=getopt(argc,argv,"T:f:nh?"))!=EOF) switch(c)
   {
     case 'f': format=optarg; break;
@@ -588,7 +589,7 @@ int main(int argc, char *argv[])
   }
 
   if (optind!=(argc-1)) usage=1;
-  else image=argv[optind];
+  else image=argv[optind++];
 
   if (usage)
   {