diff options
| author | imp <imp@FreeBSD.org> | 2001-05-29 18:03:14 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-05-29 18:03:14 +0000 |
| commit | 6d5c9e2a159911e48f405cbdbd6eaeb8fb1aa421 (patch) | |
| tree | a7285d6ceab135cd35a2477ee8b4752f5ad7c3ad /bin/ed/main.c | |
| parent | 6709d5cb0cba6c2b7897b943a8a49cb42034ab88 (diff) | |
| download | FreeBSD-src-6d5c9e2a159911e48f405cbdbd6eaeb8fb1aa421.zip FreeBSD-src-6d5c9e2a159911e48f405cbdbd6eaeb8fb1aa421.tar.gz | |
Use PATH_MAX rather than MAXPATHLEN. Also fix a possible off by one
error caused by the -1 being on the wrong side of the comparison.
This would not cause an overflow, as near as I can tell, because we
truncate later anyway. We'd just fail to get a diagnostic for 1024
and 1025 byte file names.
Diffstat (limited to 'bin/ed/main.c')
| -rw-r--r-- | bin/ed/main.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bin/ed/main.c b/bin/ed/main.c index 2fef891..bb651e5 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -96,7 +96,7 @@ int scripted = 0; /* if set, suppress diagnostics */ int sigflags = 0; /* if set, signals received while mutex set */ int sigactive = 0; /* if set, signal handlers are enabled */ -char old_filename[MAXPATHLEN + 1] = ""; /* default filename */ +char old_filename[PATH_MAX] = ""; /* default filename */ long current_addr; /* current address in editor buffer */ long addr_last; /* last address in editor buffer */ int lineno; /* script line number */ @@ -948,9 +948,10 @@ get_filename() ibufp++; if ((n = get_shell_command()) < 0) return NULL; - if (n) printf("%s\n", shcmd + 1); + if (n) + printf("%s\n", shcmd + 1); return shcmd; - } else if (n - 1 > MAXPATHLEN) { + } else if (n > PATH_MAX - 1) { sprintf(errmsg, "filename too long"); return NULL; } @@ -961,7 +962,7 @@ get_filename() return NULL; } #endif - REALLOC(file, filesz, MAXPATHLEN + 1, NULL); + REALLOC(file, filesz, PATH_MAX, NULL); for (n = 0; *ibufp != '\n';) file[n++] = *ibufp++; file[n] = '\0'; @@ -1338,7 +1339,7 @@ has_trailing_escape(s, t) } -/* strip_escapes: return copy of escaped string of at most length MAXPATHLEN */ +/* strip_escapes: return copy of escaped string of at most length PATH_MAX */ char * strip_escapes(s) char *s; @@ -1348,7 +1349,7 @@ strip_escapes(s) int i = 0; - REALLOC(file, filesz, MAXPATHLEN + 1, NULL); + REALLOC(file, filesz, PATH_MAX, NULL); while (i < filesz - 1 /* Worry about a possible trailing escape */ && (file[i++] = (*s == '\\') ? *++s : *s)) s++; @@ -1391,7 +1392,7 @@ handle_hup(signo) sigflags &= ~(1 << (signo - 1)); if (addr_last && write_file("ed.hup", "w", 1, addr_last) < 0 && (s = getenv("HOME")) != NULL && - (n = strlen(s)) + 8 <= MAXPATHLEN && /* "ed.hup" + '/' */ + (n = strlen(s)) + 8 <= PATH_MAX && /* "ed.hup" + '/' */ (hup = (char *) malloc(n + 10)) != NULL) { strcpy(hup, s); if (hup[n - 1] != '/') |
