bonsai/harakit
5
4
Fork 3
Code Issues 41 Pull Requests 7 Projects 1 Releases 30 Activity

mm(1): remove terminate macro

Browse Source
This commit is contained in:
dtb 2024-07-29 11:08:30 -06:00
parent 2e172d93e8
commit 162c6411b3
Signed by: trinity
GPG Key ID: 34C0543BBB6AF81B
1 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/mm.c
View File

@ -88,25 +88,6 @@ oserr(char *s, char *r) {
return EX_OSERR; return EX_OSERR;
} }
/* Hijacks i and j from main and destructs the files[2] struct used by main by
* closing its files and freeing its files and names arrays, returning retval
* from main. */
#define terminate \
for (i = 0; i < 2; ++i) { \
for (j = 0; j < files[i].s; ++j) { \
if ( \
files[i].files[j] != stdin \
&& files[i].files[j] != stdout \
&& files[i].files[j] != stderr \
) { \
fclose(files[i].files[j]); \
} \
} \
free(files[i].files); \
free(files[i].names); \
} \
return retval
static int static int
usage(char *argv0) { usage(char *argv0) {
(void)fprintf( (void)fprintf(
@ -163,8 +144,7 @@ int main(int argc, char *argv[]) {
break; break;
} }
retval = oserr(program_name, "-e"); return oserr(program_name, "-e");
terminate;
case 'i': case 'i':
if ( if (
(strcmp(optarg, "-") == 0 (strcmp(optarg, "-") == 0
@ -172,8 +152,7 @@ int main(int argc, char *argv[]) {
|| Files_open(&files[0], optarg) != NULL || Files_open(&files[0], optarg) != NULL
) { break; } ) { break; }
retval = oserr(program_name, optarg); return oserr(program_name, optarg);
terminate;
case 'o': case 'o':
if ( if (
(strcmp(optarg, "-") == 0 (strcmp(optarg, "-") == 0
@ -190,27 +169,21 @@ int main(int argc, char *argv[]) {
} }
} }
retval = oserr(program_name, optarg); return oserr(program_name, optarg);
terminate;
case 'n': case 'n':
if (signal(SIGINT, SIG_IGN) != SIG_ERR) { break; } if (signal(SIGINT, SIG_IGN) != SIG_ERR) { break; }
retval = oserr(program_name, "-n"); return oserr(program_name, "-n");
terminate;
case 'u': case 'u':
k = 1; k = 1;
break; break;
default: default:
retval = usage(program_name); return usage(program_name);
terminate;
} }
} }
} }
if (optind != argc) { if (optind != argc) { return usage(program_name); }
retval = usage(program_name);
terminate;
}
files[0].s += files[0].s == 0; files[0].s += files[0].s == 0;
files[1].s += files[1].s == 0; files[1].s += files[1].s == 0;
@ -258,11 +231,11 @@ int main(int argc, char *argv[]) {
files[1].names[k] = files[1].names[k+1]; files[1].names[k] = files[1].names[k+1];
} }
if(--files[1].s == 0) { terminate; } if(--files[1].s == 0) { return retval; }
} }
} }
} }
} }
terminate; return retval;
} }