diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-10-13 01:18:33 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-10-13 01:18:33 +0000 |
| commit | 08c9683bed58fb361ef989904a5bf1f1d077fb5a (patch) | |
| tree | 94b2a6549e211894e16a902fb1410169adc74a10 | |
| parent | 509cae3754fca2608ef1e6bf1b8f4073fdeba9fd (diff) | |
Notes
| -rw-r--r-- | gnu/usr.bin/patch/common.h | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/patch/patch.c | 13 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gnu/usr.bin/patch/common.h b/gnu/usr.bin/patch/common.h index 5267e170a273..ed97132183f6 100644 --- a/gnu/usr.bin/patch/common.h +++ b/gnu/usr.bin/patch/common.h @@ -29,9 +29,12 @@ #define Fclose (void)fclose #define Fflush (void)fflush #define Sprintf (void)sprintf +#define Snprintf (void)snprintf #define Mktemp (void)mktemp #define Strcpy (void)strcpy #define Strcat (void)strcat +#define Strlcpy (void)strlcpy +#define Strlcat (void)strlcat /* NeXT declares malloc and realloc incompatibly from us in some of these files. Temporarily redefine them to prevent errors. */ diff --git a/gnu/usr.bin/patch/patch.c b/gnu/usr.bin/patch/patch.c index df6442130276..8e06c33beaf5 100644 --- a/gnu/usr.bin/patch/patch.c +++ b/gnu/usr.bin/patch/patch.c @@ -90,6 +90,7 @@ char rcsid[] = * */ +#include <paths.h> #include "INTERN.h" #include "common.h" #include "EXTERN.h" @@ -166,7 +167,7 @@ char **argv; tmpdir = getenv ("TMPDIR"); if (tmpdir == NULL) { - tmpdir = "/tmp"; + tmpdir = _PATH_TMP; } tmpname_len = strlen (tmpdir) + 20; @@ -387,7 +388,7 @@ char **argv; if (failed) { failtotal += failed; if (!*rejname) { - Strcpy(rejname, outname); + Strlcpy(rejname, outname, sizeof(rejname)); addext(rejname, ".rej", '#'); } if (skip_rest_of_patch) { @@ -524,9 +525,9 @@ get_some_switches(void) do_defines = TRUE; if (!isalpha((unsigned char)*optarg) && '_' != *optarg) fatal1("argument to -D is not an identifier\n"); - Sprintf(if_defined, "#ifdef %s\n", optarg); - Sprintf(not_defined, "#ifndef %s\n", optarg); - Sprintf(end_defined, "#endif /* %s */\n", optarg); + Snprintf(if_defined, sizeof(if_defined), "#ifdef %s\n", optarg); + Snprintf(not_defined, sizeof(not_defined), "#ifndef %s\n", optarg); + Snprintf(end_defined, sizeof(end_defined), "#endif /* %s */\n", optarg); break; case 'e': diff_type = ED_DIFF; @@ -565,7 +566,7 @@ get_some_switches(void) strippath = 0; break; case 'r': - Strcpy(rejname, optarg); + Strlcpy(rejname, optarg, sizeof(rejname)); break; case 'R': reverse = TRUE; |