From: Craig Small Date: Mon, 19 Mar 2001 02:38:07 +0000 (+0000) Subject: last minute adjustments X-Git-Tag: psmisc-21~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5f55a24384fb04fcf2a3ee0b48c50bb8a4e0a00;p=psmisc last minute adjustments --- diff --git a/INSTALL b/INSTALL index b95d84f..cdafe17 100644 --- 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 7c01bfb..f03b748 100644 --- 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 7ae8370..f0a8abe 100644 --- 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 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 -Maintained-by: Werner Almesberger -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 a1af250..1ee5830 100644 --- 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 0460390..984c618 100644 --- 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 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