Revert to version 1.16 which was more correct than either of my attempts.

This commit is contained in:
Brian Somers 2001-08-21 12:54:15 +00:00
parent 65d5e55cdd
commit 08741a6f5c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=82057

View File

@ -143,13 +143,13 @@ main(int argc, char *argv[]) {
p = cmd;
offset = snprintf(cmd, cmdsize, EXEC "%s", argv[0]);
if (offset < 0 || offset >= cmdsize)
if ((size_t)offset >= cmdsize)
err(1, "snprintf() failed");
p += offset;
cmdsize -= offset;
for (i = 1; i <= nargs; i++) {
offset = snprintf(p, cmdsize, " %c%d", magic, i);
if (offset < 0 || offset >= cmdsize)
if ((size_t)offset >= cmdsize)
err(1, "snprintf() failed");
p += offset;
cmdsize -= offset;
@ -163,7 +163,7 @@ main(int argc, char *argv[]) {
nargs = 1;
} else {
offset = snprintf(cmd, cmdsize, EXEC "%s", argv[0]);
if (offset < 0 || offset >= cmdsize)
if ((size_t)offset >= cmdsize)
err(1, "snprintf() failed");
nargs = n;
}
@ -196,7 +196,7 @@ main(int argc, char *argv[]) {
if (p[0] == magic && isdigit(p[1]) && p[1] != '0') {
offset = snprintf(q, l, "%s",
argv[(++p)[0] - '0']);
if (offset < 0 || offset >= l)
if ((size_t)offset >= l)
err(1, "snprintf() failed");
q += offset;
l -= offset;