diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/cut.c | 6 | ||||
| -rw-r--r-- | coreutils/uudecode.c | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/coreutils/cut.c b/coreutils/cut.c index abe0572..3ed2648 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -344,10 +344,8 @@ extern int cut_main(int argc, char **argv) int i; FILE *file; for (i = optind; i < argc; i++) { - file = fopen(argv[i], "r"); - if (file == NULL) { - perror_msg("%s", argv[i]); - } else { + file = wfopen(argv[i], "r"); + if(file) { cut_file(file); fclose(file); } diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index 6ac9f1b..a4059dd 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c @@ -201,9 +201,8 @@ static int decode (const char *inname, const char *forced_outname) { struct passwd *pw; - register int n; register char *p; - int mode, n1; + int mode; char buf[2 * BUFSIZ]; char *outname; int do_base64 = 0; @@ -249,12 +248,7 @@ static int decode (const char *inname, error_msg("%s: No user `%s'", inname, buf + 1); return FALSE; } - n = strlen (pw->pw_dir); - n1 = strlen (p); - outname = (char *) xmalloc ((size_t) (n + n1 + 2)); - memcpy (outname + n + 1, p, (size_t) (n1 + 1)); - memcpy (outname, pw->pw_dir, (size_t) n); - outname[n] = '/'; + outname = concat_path_file(pw->pw_dir, p); dofre = TRUE; } } |