Subject: Minor cleanup from The Grand Reorg (#354) Index: libexec/comsat/comsat.c,new/nmcoll 2.11BSD Description: Out of the hundreds of files updated, moved, added during the grand reorganization (updates 335-342 and 343-352) three files somehow were overlooked. Repeat-By: Observation. Or by performing a checksum verify between the "master" 2.11BSD reference system and another 2.11 system with all updates applied. Or by noticing that 'comsat' wasn't delivering mail notification properly. Or 'welcome' wasn't working quite right sometimes. Or that 'nmcoll.0' wasn't removed from the source directory when the "make clean" was done. The man page also needed an update. Fix: Cut where indicated saving to file (/tmp/354). Then: patch -p0 < /tmp/354 cd /usr/src/libexec/comsat make make install make clean cd /usr/src/local/welcome make make install make clean cd /usr/src/new/nmcoll make make install make clean cd /usr/src/sbin/badsect make make install make clean As always this and previous updates to 2.11BSD are available via anonymous FTP to either FTP.IIPO.GTEGSC.COM or MOE.2BSD.COM in the directory /pub/2.11BSD. ---------------------------cut here-------------------------- *** /usr/src/libexec/comsat/comsat.c.old Sat Dec 24 22:11:38 1988 --- /usr/src/libexec/comsat/comsat.c Sat Nov 16 19:06:39 1996 *************** *** 10,24 **** * is provided ``as is'' without express or implied warranty. */ ! #ifndef lint char copyright[] = "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; - #endif /* not lint */ ! #ifndef lint ! static char sccsid[] = "@(#)comsat.c 5.11 (Berkeley) 3/29/88"; ! #endif /* not lint */ #include #include --- 10,22 ---- * is provided ``as is'' without express or implied warranty. */ ! #if !defined(lint) && defined(DOSCCS) char copyright[] = "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char sccsid[] = "@(#)comsat.c 5.11.1 (2.11BSD) 1996/11/16"; ! #endif #include #include *************** *** 36,41 **** --- 34,40 ---- #include #include #include + #include /* * comsat *************** *** 47,53 **** char hostname[MAXHOSTNAMELEN]; struct utmp *utmp = NULL; ! time_t lastmsgtime, time(); int nutmp, uf; main(argc, argv) --- 46,52 ---- char hostname[MAXHOSTNAMELEN]; struct utmp *utmp = NULL; ! time_t lastmsgtime; int nutmp, uf; main(argc, argv) *************** *** 54,60 **** int argc; char **argv; { - extern int errno; register int cc; char msgbuf[100]; struct sockaddr_in from; --- 53,58 ---- *************** *** 69,79 **** } openlog("comsat", LOG_PID, LOG_DAEMON); if (chdir("/usr/spool/mail")) { ! syslog(LOG_ERR, "chdir: /usr/spool/mail"); exit(1); } ! if ((uf = open("/etc/utmp", O_RDONLY, 0)) < 0) { ! syslog(LOG_ERR, ".main: /etc/utmp: %m"); (void) recv(0, msgbuf, sizeof (msgbuf) - 1, 0); exit(1); } --- 67,77 ---- } openlog("comsat", LOG_PID, LOG_DAEMON); if (chdir("/usr/spool/mail")) { ! syslog(LOG_ERR, "chdir: /usr/spool/mail: %m"); exit(1); } ! if ((uf = open(_PATH_UTMP, O_RDONLY, 0)) < 0) { ! syslog(LOG_ERR, ".main: %s: %m", _PATH_UTMP); (void) recv(0, msgbuf, sizeof (msgbuf) - 1, 0); exit(1); } *** /usr/src/local/welcome/welcome.c.old Tue Feb 7 09:30:42 1995 --- /usr/src/local/welcome/welcome.c Sun Feb 5 00:46:27 1995 *************** *** 73,79 **** printf("\033[4;46Hlqqqqqqqqqqqqqqqqk"); printf("\033[5;46Hx x"); printf("\033[6;46Hmqwqqqqqqqqqqqqqqj"); ! printf("\033[5;50H\033(B\033)B%s\033(0\033)0",ttyname(0)); printf("\033[7;16Hlqqqqqqqqqvqqqqqqqqqqqqqqqqqqqqqvqqqqqqqqk"); #else TTY printf("\033[7;16Hlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqk"); --- 73,79 ---- printf("\033[4;46Hlqqqqqqqqqqqqqqqqk"); printf("\033[5;46Hx x"); printf("\033[6;46Hmqwqqqqqqqqqqqqqqj"); ! printf("\033[5;50H\033(B\033)B%s\033(0\033)0",ttyname(ttyslot(0))); printf("\033[7;16Hlqqqqqqqqqvqqqqqqqqqqqqqqqqqqqqqvqqqqqqqqk"); #else TTY printf("\033[7;16Hlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqk"); *** /usr/src/new/nmcoll/Makefile.old Fri Jan 22 22:00:50 1993 --- /usr/src/new/nmcoll/Makefile Tue Dec 17 19:42:56 1996 *************** *** 1,3 **** --- 1,7 ---- + # + # 'nmcoll' is remnant from the era before long(er) symbol names were + # supported in object files. + # DESTDIR= DEFS= *************** *** 14,19 **** --- 18,25 ---- /usr/man/manroff nmcoll.1 > nmcoll.0 clean: + -rm -f nmcoll.0 + depend: tags: lint: *** /usr/src/new/nmcoll/nmcoll.1.old Sat Jun 20 14:43:32 1987 --- /usr/src/new/nmcoll/nmcoll.1 Tue Dec 17 19:44:25 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)nmcoll.1 6.2 (Berkeley) 6/20/87 .\" ! .TH NMCOLL 1 "June 20, 1987" .UC 2 .SH NAME nmcoll \- find name collisions in object files (2BSD) --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)nmcoll.1 6.2.1 (2.11BSD) 1996/12/17 .\" ! .TH NMCOLL 1 "December 17, 1996" .UC 2 .SH NAME nmcoll \- find name collisions in object files (2BSD) *************** *** 18,24 **** and produces a listing of suspicious name duplications. .I Nmcoll is useful when porting programs that were developed with compilers that support ! flex (long) names to 2.10BSD which only supports seven significant characters in external names. .SH "SEE ALSO" a.out(5) --- 18,28 ---- and produces a listing of suspicious name duplications. .I Nmcoll is useful when porting programs that were developed with compilers that support ! flex (long) names to 2.11BSD which only supports seven significant characters in external names. + .SH NOTES + .I Nmcoll + is a carryover from the era before longer symbol names were supported in + object files. .SH "SEE ALSO" a.out(5) *** /usr/src/sbin/badsect/badsect.c.old Tue Aug 10 19:44:51 1993 --- /usr/src/sbin/badsect/badsect.c Sun Nov 17 18:13:26 1996 *************** *** 12,21 **** * Sanity check on sector number August 10,1993 by Steven Schultz */ #include #include #include - - long atol(); main(argc, argv) int argc; --- 12,20 ---- * Sanity check on sector number August 10,1993 by Steven Schultz */ #include + #include #include #include main(argc, argv) int argc; *** /VERSION.old Tue Dec 17 21:53:53 1996 --- /VERSION Tue Dec 17 21:34:31 1996 *************** *** 1,4 **** ! Current Patch Level: 353 2.11 BSD ============ --- 1,4 ---- ! Current Patch Level: 354 2.11 BSD ============