projects
/
debian
/
cpmtools
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try harder to get libdsk used
[debian/cpmtools]
/
cpmrm.c
diff --git
a/cpmrm.c
b/cpmrm.c
index 65430da6d752548e98648baad4f7d0cbe722af84..f49ed4a68b5d741b7f13fe71b9ad83c1a5b60f62 100644
(file)
--- a/
cpmrm.c
+++ b/
cpmrm.c
@@
-9,10
+9,6
@@
#include "getopt_.h"
#include "cpmfs.h"
#include "getopt_.h"
#include "cpmfs.h"
-
-#ifdef USE_DMALLOC
-#include <dmalloc.h>
-#endif
/*}}}*/
const char cmd[]="cpmrm";
/*}}}*/
const char cmd[]="cpmrm";
@@
-24,6
+20,7
@@
int main(int argc, char *argv[]) /*{{{*/
const char *image;
const char *format;
const char *devopts=NULL;
const char *image;
const char *format;
const char *devopts=NULL;
+ int uppercase=0;
int c,i,usage=0,exitcode=0;
struct cpmSuperBlock drive;
struct cpmInode root;
int c,i,usage=0,exitcode=0;
struct cpmSuperBlock drive;
struct cpmInode root;
@@
-33,10
+30,11
@@
int main(int argc, char *argv[]) /*{{{*/
/* parse options */ /*{{{*/
if (!(format=getenv("CPMTOOLSFMT"))) format=FORMAT;
/* parse options */ /*{{{*/
if (!(format=getenv("CPMTOOLSFMT"))) format=FORMAT;
- while ((c=getopt(argc,argv,"T:f:h?"))!=EOF) switch(c)
+ while ((c=getopt(argc,argv,"T:f:
u
h?"))!=EOF) switch(c)
{
case 'T': devopts=optarg; break;
case 'f': format=optarg; break;
{
case 'T': devopts=optarg; break;
case 'f': format=optarg; break;
+ case 'u': uppercase=1; break;
case 'h':
case '?': usage=1; break;
}
case 'h':
case '?': usage=1; break;
}
@@
-46,7
+44,7
@@
int main(int argc, char *argv[]) /*{{{*/
if (usage)
{
if (usage)
{
- fprintf(stderr,"Usage: %s [-f format] [-T dsktype] image pattern ...\n",cmd);
+ fprintf(stderr,"Usage: %s [-f format] [-T dsktype]
[-u]
image pattern ...\n",cmd);
exit(1);
}
/*}}}*/
exit(1);
}
/*}}}*/
@@
-56,7
+54,7
@@
int main(int argc, char *argv[]) /*{{{*/
fprintf(stderr,"%s: cannot open %s (%s)\n",cmd,image,err);
exit(1);
}
fprintf(stderr,"%s: cannot open %s (%s)\n",cmd,image,err);
exit(1);
}
- if (cpmReadSuper(&drive,&root,format)==-1)
+ if (cpmReadSuper(&drive,&root,format
,uppercase
)==-1)
{
fprintf(stderr,"%s: cannot read superblock (%s)\n",cmd,boo);
exit(1);
{
fprintf(stderr,"%s: cannot read superblock (%s)\n",cmd,boo);
exit(1);