last minute adjustments

diff --git a/INSTALL b/INSTALL
index b95d84f4f76a687de8758f57631f832c311fd8db..cdafe170fb68f20382631c6c7b544117ef09c146 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,15 @@
-To build all programs in psmisc, simply execute
+Installation instructions for psmisc package
+============================================
 
-    make
+To compile this program you will need ncurses.
 
-To install fuser, killall, pstree, and their man pages, run (as root)
+To build this, type
+       ./configure
+       make
 
-    make install
+To install fuser, killall, pstree and their man pagess, type:
+       make install
 
-fuser is installed in /bin, killall and pstree are installed in /usr/bin
+To get pidof, link killall to pidof:
+       ln -s killall pidof
 
-pidof is not installed by  make install  because different versions of
-pidof exist and a different one may already be installed. If you want to
-install the pidof that comes with psmisc (and its man page), simply run
-(as root)
-
-    make install-pidof

diff --git a/NEWS b/NEWS
index 7c01bfbf134a8c756b46237a88e845a330d53dbd..f03b748a70508facd5a849a53379aa752dcc8a82 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,3 +5,6 @@ line with other programs.  To specify signals use the -s flag.
 EG before version 20 you would do killall -HUP 123 now do
 killall -s HUP 123
 
+The license has changed to GPL for version 20 onwards with permission
+of the original authors.  People who want to use these programs under
+the previous license will have to look at psmisc 19 or below.

diff --git a/README b/README
index 7ae83708e64f9db1c3ee298ccb1a818c99241e4d..f0a8abef91f290d0041084f9b7216631459f130b 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-psmisc, version 19
+psmisc, version 20
 ==================
 
 This package contains four little utilities that use the proc FS:

diff --git a/psmisc-19.lsm b/psmisc-19.lsm
deleted file mode 100644 (file)
index 82006a1..0000000
--- a/psmisc-19.lsm
+++ /dev/null
@@ -1,14 +0,0 @@
-Begin3
-Title:         psmisc
-Version:       19
-Entered-date:  25OCT99
-Description:   miscellaneous proc FS tools: fuser, killall, pidof, and pstree
-Keywords:      psmisc, fuser, killall, pidof, pstree
-Author:                Werner Almesberger <Werner.Almesberger@epfl.ch>
-Maintained-by: Werner Almesberger <Werner.Almesberger@epfl.ch>
-Primary-site:  lrcftp.epfl.ch /pub/linux/local/psmisc
-               21 kB psmisc-19.tar.gz
-Alternate-site:        sunsite.unc.edu /pub/Linux/system/status/ps
-Platforms:     Should work with most kernels. Requires /proc
-Copying-policy:        BSD-like
-End

diff --git a/src/Makefile.am b/src/Makefile.am
index a1af250c860180f79f10d294fc5e0cd353cba1c7..1ee58305e5cf62eda6db0fbbcbc714865a1fc038 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ CFLAGS = -Wall
 
 bin_PROGRAMS = fuser killall pstree
 
-fuser_SOURCES = fuser.c comm.h signals.c signals.h signames.h
+fuser_SOURCES = fuser.c comm.h signals.c signals.h signames.h loop.h
 
 killall_SOURCES = killall.c comm.h signals.c signals.h signames.h
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 046039040817d44e7ebb40a94f8e1d1ba7b5c45f..984c6183aace7366cffb776463d01d7c6624c840 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -68,7 +68,7 @@ CFLAGS = -Wall
 
 bin_PROGRAMS = fuser killall pstree
 
-fuser_SOURCES = fuser.c comm.h signals.c signals.h signames.h
+fuser_SOURCES = fuser.c comm.h signals.c signals.h signames.h loop.h
 
 killall_SOURCES = killall.c comm.h signals.c signals.h signames.h
 

diff --git a/src/loop.h b/src/loop.h
new file mode 100644 (file)
index 0000000..1bd7fa8
--- /dev/null
+++ b/src/loop.h
@@ -0,0 +1,37 @@
+/*
+ * include/linux/loop.h
+ *
+ * Written by Theodore Ts'o, 3/29/93.
+ *
+ * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
+ * permitted under the GNU Public License.
+ */
+
+#define LO_NAME_SIZE   64
+#define LO_KEY_SIZE    32
+       
+struct loop_info {
+       int             lo_number;      /* ioctl r/o */
+       dev_t           lo_device;      /* ioctl r/o */
+       unsigned long   lo_inode;       /* ioctl r/o */
+       dev_t           lo_rdevice;     /* ioctl r/o */
+       int             lo_offset;
+       int             lo_encrypt_type;
+       int             lo_encrypt_key_size;    /* ioctl w/o */
+       int             lo_flags;       /* ioctl r/o */
+       char            lo_name[LO_NAME_SIZE];
+       unsigned char   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+       unsigned long   lo_init[2];
+       char            reserved[4];
+};
+
+#define LO_CRYPT_NONE  0
+#define LO_CRYPT_XOR   1
+#define LO_CRYPT_DES   2
+#define LO_CRYPT_IDEA  3
+#define MAX_LO_CRYPT   4
+
+#define LOOP_SET_FD    0x4C00
+#define LOOP_CLR_FD    0x4C01
+#define LOOP_SET_STATUS        0x4C02
+#define LOOP_GET_STATUS        0x4C03