diff options
| author | mikeh <mikeh@FreeBSD.org> | 2001-03-25 04:57:05 +0000 |
|---|---|---|
| committer | mikeh <mikeh@FreeBSD.org> | 2001-03-25 04:57:05 +0000 |
| commit | e51e7e067d9cfc20e2881f888c5f45046c153df8 (patch) | |
| tree | b1ac3afa472ab794d2a7118bc10ebee16c55812f /usr.bin/mail/strings.c | |
| parent | afd190c2240ce9ef47e8180f3d48af53f636952f (diff) | |
| download | FreeBSD-src-e51e7e067d9cfc20e2881f888c5f45046c153df8.zip FreeBSD-src-e51e7e067d9cfc20e2881f888c5f45046c153df8.tar.gz | |
Merge various changes from OpenBSD and NetBSD.
o remove panic() in favor of err(3) and use err(3) functions
consistently throughout
o use stat(2)'s S_IS* macros rather than S_IF*
o [r]index -> str[r]chr
o convert some static buffers to dynamic ones
o use real tempfiles rather than reopening the same templates
o rename some functions that clash with libc
o convert wait_status from union to int and use wait(2) status macros
o fix multiple potential buffer overflows
o fix a few comments
o add $FreeBSD$
Reviewed by: nra, nectar (earlier version)
Diffstat (limited to 'usr.bin/mail/strings.c')
| -rw-r--r-- | usr.bin/mail/strings.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c index 2f24f31..08626d9 100644 --- a/usr.bin/mail/strings.c +++ b/usr.bin/mail/strings.c @@ -32,7 +32,11 @@ */ #ifndef lint +#if 0 static char sccsid[] = "@(#)strings.c 8.1 (Berkeley) 6/6/93"; +#endif +static const char rcsid[] = + "$FreeBSD$"; #endif /* not lint */ /* @@ -75,14 +79,11 @@ salloc(size) index++; } if (sp >= &stringdope[NSPACE]) - panic("String too large"); + errx(1, "String too large"); if (sp->s_topFree == NOSTR) { index = sp - &stringdope[0]; - sp->s_topFree = malloc(STRINGSIZE << index); - if (sp->s_topFree == NOSTR) { - fprintf(stderr, "No room for space %d\n", index); - panic("Internal error"); - } + if ((sp->s_topFree = malloc(STRINGSIZE << index)) == NOSTR) + err(1, "No room for space %d", index); sp->s_nextFree = sp->s_topFree; sp->s_nleft = STRINGSIZE << index; } |
