Apple-2-SW/mpw-tools
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw-tools.git synced 2024-05-28 18:41:27 +00:00
Code Issues Projects Releases Wiki Activity

minor delete tweaks

Browse Source
This commit is contained in:
Kelvin Sherlock 2016-02-08 23:21:04 -05:00
parent ac2093c87d
commit 1864ad281e
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Delete-flags.c
View File

@ -66,7 +66,7 @@ int FlagsParse(int argc, char **argv)
{
case 'h':
FlagsHelp();
break;
exit(0);
case 'y':
case 'Y':
flags._y = 1;
@ -89,7 +89,7 @@ int FlagsParse(int argc, char **argv)
break;
default:
fprintf(stderr, "illegal option -- %c\n", c);
fprintf(stderr, "### Delete - \"-%c\" is not an option.", c);
exit(1);
}

26
Delete.c
View File

@ -88,9 +88,21 @@ int prompt(const char *file) {
first = ch = getchar();
while (ch != '\n' && ch != EOF) ch = getchar();
if (first == 'y' || first == 'Y') return 1;
if (first == 'c' || first == 'C') return -1;
return 0;
}
int check(const char *name) {
int m = mode(name);
if (m != 2 || flags._y) return 1;
// directory.
if (flags._n) return 0;
if (flags._c) return -1;
return prompt(name);
}
static char error_message[255];
int main(int argc, char **argv) {
@ -118,20 +130,16 @@ int main(int argc, char **argv) {
for (i = 1 ; i < argc; ++i) {
OSErr err;
int m;
int st;
char *file = argv[i];
char *p = c2p(file);
// todo -- y/n/c flags.
m = mode(p);
if (m == 2 && !flags._y) {
// directory...
if (flags._n) continue;
if (flags._c) { status = 4; break; }
if (!prompt(file)) continue;
}
st = check(file);
if (st == 0) continue;
if (st == -1) { status = 4; break; }
err = FSDelete((unsigned char *)p, 0);
if (err && !flags._i) {