jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-01 19:23:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Be picky about the format of the commandline and cleanup

Browse Source 
a warning related to qsort.

PR:		6420
Submitted by:	Ruslan Ermilov <ru@ucb.crimea.ua>
This commit is contained in:
Steve Price 1998-05-03 23:22:37 +00:00
parent 7c50fe7bb0
commit e1f4275a7c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=35659
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/rwho/rwho.c
View File

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)rwho.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)rwho.c 8.1 (Berkeley) 6/6/93";
#endif #endif
static const char rcsid[] = static const char rcsid[] =
"$Id$"; "$Id: rwho.c,v 1.11 1997/08/08 12:20:24 charnier Exp $";
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -80,7 +80,7 @@ time_t now;
int aflg; int aflg;
static void usage __P((void)); static void usage __P((void));
int utmpcmp __P((struct myutmp *, struct myutmp *)); int utmpcmp __P((const void *, const void *));
int int
main(argc, argv) main(argc, argv)
@ -106,6 +106,12 @@ main(argc, argv)
default: default:
usage(); usage();
} }
argc -= optind;
argv += optind;
if (argc != 0)
usage();
if (chdir(_PATH_RWHODIR) || (dirp = opendir(".")) == NULL) if (chdir(_PATH_RWHODIR) || (dirp = opendir(".")) == NULL)
err(1, "%s", _PATH_RWHODIR); err(1, "%s", _PATH_RWHODIR);
mp = myutmp; mp = myutmp;
@ -189,17 +195,21 @@ usage()
exit(1); exit(1);
} }
#define MYUTMP(a) ((struct myutmp *)(a))
int int
utmpcmp(u1, u2) utmpcmp(u1, u2)
struct myutmp *u1, *u2; const void *u1, *u2;
{ {
int rc; int rc;
rc = strncmp(u1->myutmp.out_name, u2->myutmp.out_name, sizeof(u2->myutmp.out_name)); rc = strncmp(MYUTMP(u1)->myutmp.out_name, MYUTMP(u2)->myutmp.out_name,
sizeof(MYUTMP(u2)->myutmp.out_name));
if (rc) if (rc)
return (rc); return (rc);
rc = strcmp(u1->myhost, u2->myhost); rc = strcmp(MYUTMP(u1)->myhost, MYUTMP(u2)->myhost);
if (rc) if (rc)
return (rc); return (rc);
return (strncmp(u1->myutmp.out_line, u2->myutmp.out_line, sizeof(u2->myutmp.out_line))); return (strncmp(MYUTMP(u1)->myutmp.out_line, MYUTMP(u2)->myutmp.out_line,
sizeof(MYUTMP(u2)->myutmp.out_line)));
} }