projects
/
debian
/
cpmtools
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New upstream version 2.20
[debian/cpmtools]
/
cpmchattr.c
diff --git
a/cpmchattr.c
b/cpmchattr.c
index 9fbf074ca1934bcacb5ad72304e45cbe4467bd48..be39130b86b056d0c993b22b1072b0fe9afef0cb 100644
(file)
--- a/
cpmchattr.c
+++ b/
cpmchattr.c
@@
-1,12
+1,17
@@
/* #includes */ /*{{{C}}}*//*{{{*/
/* #includes */ /*{{{C}}}*//*{{{*/
+#include "config.h"
+
#include <ctype.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include "config.h"
-#include "getopt.h"
+#include "getopt
_
.h"
#include "cpmfs.h"
#include "cpmfs.h"
+
+#ifdef USE_DMALLOC
+#include <dmalloc.h>
+#endif
/*}}}*/
const char cmd[]="cpmchattr";
/*}}}*/
const char cmd[]="cpmchattr";
@@
-16,7
+21,7
@@
int main(int argc, char *argv[]) /*{{{*/
/* variables */ /*{{{*/
const char *err;
const char *image;
/* variables */ /*{{{*/
const char *err;
const char *image;
- const char *format
=FORMAT
;
+ const char *format;
const char *devopts=NULL;
int c,i,usage=0,exitcode=0;
struct cpmSuperBlock drive;
const char *devopts=NULL;
int c,i,usage=0,exitcode=0;
struct cpmSuperBlock drive;
@@
-27,6
+32,7
@@
int main(int argc, char *argv[]) /*{{{*/
/*}}}*/
/* parse options */ /*{{{*/
/*}}}*/
/* parse options */ /*{{{*/
+ if (!(format=getenv("CPMTOOLSFMT"))) format=FORMAT;
while ((c=getopt(argc,argv,"T:f:h?"))!=EOF) switch(c)
{
case 'T': devopts=optarg; break;
while ((c=getopt(argc,argv,"T:f:h?"))!=EOF) switch(c)
{
case 'T': devopts=optarg; break;
@@
-38,8
+44,8
@@
int main(int argc, char *argv[]) /*{{{*/
if (optind>=(argc-2)) usage=1;
else
{
if (optind>=(argc-2)) usage=1;
else
{
- image=argv[optind];
- attrs = argv[optind+
1
];
+ image=argv[optind
++
];
+ attrs = argv[optind+
+
];
}
if (usage)
}
if (usage)
@@
-51,23
+57,29
@@
int main(int argc, char *argv[]) /*{{{*/
/* open image */ /*{{{*/
if ((err=Device_open(&drive.dev, image, O_RDWR, devopts)))
{
/* open image */ /*{{{*/
if ((err=Device_open(&drive.dev, image, O_RDWR, devopts)))
{
- fprintf(stderr,"%s: can not open %s (%s)\n",cmd,image,err);
+ fprintf(stderr,"%s: cannot open %s (%s)\n",cmd,image,err);
+ exit(1);
+ }
+ if (cpmReadSuper(&drive,&root,format)==-1)
+ {
+ fprintf(stderr,"%s: cannot read superblock (%s)\n",cmd,boo);
exit(1);
}
exit(1);
}
- cpmReadSuper(&drive,&root,format);
/*}}}*/
cpmglob(optind,argc,argv,&root,&gargc,&gargv);
for (i=0; i<gargc; ++i)
{
struct cpmInode ino;
/*}}}*/
cpmglob(optind,argc,argv,&root,&gargc,&gargv);
for (i=0; i<gargc; ++i)
{
struct cpmInode ino;
- int
err
;
+ int
rc
;
cpm_attr_t attrib;
cpm_attr_t attrib;
-
err
= cpmNamei(&root,gargv[i], &ino)==-1;
- if (!
err) err
= cpmAttrGet(&ino, &attrib);
- if (!
err
)
+
rc
= cpmNamei(&root,gargv[i], &ino)==-1;
+ if (!
rc) rc
= cpmAttrGet(&ino, &attrib);
+ if (!
rc
)
{
{
- int n, m;
+ unsigned int n;
+ int m;
+
m = 0;
for (n = 0; n < strlen(attrs); n++)
{
m = 0;
for (n = 0; n < strlen(attrs); n++)
{
@@
-93,14
+105,15
@@
int main(int argc, char *argv[]) /*{{{*/
}
if (m) attrib &= ~mask; else attrib |= mask;
}
}
if (m) attrib &= ~mask; else attrib |= mask;
}
-
err
= cpmAttrSet(&ino, attrib);
+
rc
= cpmAttrSet(&ino, attrib);
}
}
- if (
err
)
+ if (
rc
)
{
fprintf(stderr,"%s: can not set attributes for %s: %s\n",cmd,gargv[i],boo);
exitcode=1;
}
}
{
fprintf(stderr,"%s: can not set attributes for %s: %s\n",cmd,gargv[i],boo);
exitcode=1;
}
}
+ cpmUmount(&drive);
exit(exitcode);
}
/*}}}*/
exit(exitcode);
}
/*}}}*/