From: Martin Mares Date: Fri, 22 Mar 2002 20:20:16 +0000 (+0000) Subject: Split ywho and nwho. X-Git-Tag: v1.13~37 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=23d6cfdc09df59f926dfba76318bb6208e19f1b3;p=nwho.git Split ywho and nwho. --- diff --git a/ChangeLog b/ChangeLog index 50351b5..8d272a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-03-22 Martin Mares + + * Split ywho and nwho. + + * net.h: State is now kept in /var/state/nwho. + 2001-02-06 Martin Mares * Released as version 1.9. diff --git a/Makefile b/Makefile index 4b3255e..a013f80 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,11 @@ -# Makefile for the ywho toolkit +# Makefile for the nwho toolkit CFLAGS=-O2 -Wall -Wno-parentheses LDFLAGS=-s ROOT=/ -REL=ywho-1.9 +REL=nwho-1.9 -all: ywho nwhod nwho - -ywho: ywho.o - -ywho.o: ywho.c +all: nwhod nwho nwhod: nwhod.o @@ -20,13 +16,12 @@ nwho: nwho.o nwho.o: nwho.c net.h clean: - rm -f *.o ywho nwhod nwho *~ + rm -f *.o nwhod nwho *~ rm -rf dist install: - strip ywho mkdir -p $(ROOT)/usr/bin $(ROOT)/usr/sbin - install -s -m 755 ywho nwho $(ROOT)/usr/bin + install -s -m 755 nwho $(ROOT)/usr/bin ln -sf nwho $(ROOT)/usr/bin/nuptime install -s -m 755 nwhod $(ROOT)/usr/sbin install -d -m 755 $(ROOT)/var/spool/nwho diff --git a/README b/README index 8377457..50dc89e 100644 --- a/README +++ b/README @@ -1,42 +1,9 @@ -This package contains the Yet Another Who-like Utility, version 1.8. +This package contains the Yet Another Network Who-like Utility, version 1.9. -Copyright (c) 1996--1999 Martin Mares +Copyright (c) 1996--2001 Martin Mares All files in this package can be freely distributed and used according to the terms of the GNU General Public License, either version 2 or (at your opinion) any newer version. This is the same distribution policy as for the Linux kernel itself -- see /usr/src/linux/COPYING for details. - - -Yes, this is yet another who-like utility displaying all -information about logged in users and compressed system status -to see everything in just a single jiffie. - -This archive also contains a simple rwho/rwhod replacement, -but it's probably worth rewriting from scratch anyway. - -If you have any bug reports or suggestions, send them to the author. - - -No real documentation exists yet, but let's take a explanatory look -on ywho output: - - day of week (0=mon,6=sun) - | -kernel version CPU system uptime runtime date | time - | | | | | | | -Linux 2.0.35 on AMD K6-2, up 69d08, run 6d00 at 28-03-99/6 23.57:10 - -tasks: running/total load memory info number of logged-in users - | | | | -R/T=2/86, LAV=0.30/0.12/0.06, free 67M of RAM, used 3M of swap, 8 users. - - messages---++-------daemons running on behalf of that user - || -user line || logged in from how long run time of user's tasks - | | || | | | -Name Li MD From LogT IdleT RunT Command -mj p0 -D albireo.ucw.cz 04.01 | 4s ywho - | - idle time diff --git a/debian/changelog b/debian/changelog index 0ad27b1..257223a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ywho (1.9-4) unstable; urgency=low + + * Split ywho and nwho. + + -- Martin Mares Fri, 22 Mar 2002 21:18:30 +0100 + ywho (1.9-3) unstable; urgency=low * Minor bugfix of console formatting. diff --git a/debian/control b/debian/control index 729541d..e858262 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,10 @@ -Source: ywho +Source: nwho Section: ucw Priority: optional Maintainer: Martin Mares Standards-Version: 2.1.0.0 -Package: ywho +Package: nwho Architecture: any Depends: ${shlibs:Depends} Description: Extended who diff --git a/debian/copyright b/debian/copyright index dd04f64..4e28a03 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ -YWho -- who/rwho/rwhod replacement -Copyright (c) 1996--1999 Martin Mares +NWho -- rwho/rwhod replacement +Copyright (c) 1996--2001 Martin Mares This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/rules b/debian/rules index 7d14701..5267064 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ binary-arch: build dh_testdir dh_testroot dh_clean -k - dh_installdirs etc sbin + dh_installdirs etc sbin var/state/nwho $(MAKE) ROOT=`pwd`/debian/tmp install @@ -34,7 +34,7 @@ binary-arch: build # dh_installinit # dh_installcron # dh_installmanpages - dh_undocumented nwho.1 nwhod.8 ywho.1 + dh_undocumented nwho.1 nwhod.8 dh_installchangelogs dh_strip # dh_compress diff --git a/net.h b/net.h index de3a11f..54a0959 100644 --- a/net.h +++ b/net.h @@ -28,7 +28,7 @@ struct rywho_pkt { struct userinfo users[MAX_USERS]; }; -#define NWHO_SPOOL_DIR "/var/spool/nwho" +#define NWHO_SPOOL_DIR "/var/state/nwho" #define NWHO_MAGIC 0x21913332 #define DEFAULT_SEND_TIME 30 diff --git a/nwhod.c b/nwhod.c index 812759f..23accf6 100644 --- a/nwhod.c +++ b/nwhod.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include