07f8b6fea
Denys Vlasenko
2023-05-07
Subject
readlink: code shrink
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/readlink.c+4 -5
| @@ -68,12 +68,11 @@ int readlink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | |
| int readlink_main(int argc UNUSED_PARAM, char **argv) | |
| { | |
| char *buf; | |
| - | char *fname; |
| unsigned opt; | |
| + | /* -n must use bit 0 (see printf below) */ |
| opt = getopt32(argv, "^" "n" IF_FEATURE_READLINK_FOLLOW("fvsq") | |
| "\0" "=1"); | |
| - | fname = argv[optind]; |
| /* compat: coreutils readlink reports errors silently via exit code */ | |
| if (!(opt & 4)) /* not -v */ | |
| @@ -81,14 +80,14 @@ int readlink_main(int argc UNUSED_PARAM, char **argv) | |
| /* NOFORK: only one alloc is allowed; must free */ | |
| if (opt & 2) { /* -f */ | |
| - | buf = xmalloc_realpath_coreutils(fname); |
| + | buf = xmalloc_realpath_coreutils(argv[optind]); |
| } else { | |
| - | buf = xmalloc_readlink_or_warn(fname); |
| + | buf = xmalloc_readlink_or_warn(argv[optind]); |
| } | |
| if (!buf) | |
| return EXIT_FAILURE; | |
| - | printf((opt & 1) ? "%s" : "%s\n", buf); |
| + | printf("%s%s", buf, &"\n"[opt & 1]); |
| free(buf); | |
| fflush_stdout_and_exit_SUCCESS(); | |