diff -dru util-linux-2.11y/MCONFIG util-linux-2.11y.fjo/MCONFIG --- util-linux-2.11y/MCONFIG Mon Nov 25 11:29:48 2002 +++ util-linux-2.11y.fjo/MCONFIG Tue Feb 25 10:10:55 2003 @@ -10,8 +10,8 @@ # Select for ARCH one of intel, alpha, sparc, arm, m68k, mips # Select for CPU i386 if the binaries must be able to run on an intel 386 # (by default i486 code is generated, see below) -CPU=$(shell uname -m) -ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/') +CPU=i386 +ARCH=intel # If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp # will use PAM for authentication. Additionally, passwd will not be @@ -68,7 +68,7 @@ # user's tty to "tty" [The login in util-linux does this correctly, and # xterm will do it correctly if X is compiled with USE_TTY_GROUP set # properly.] -USE_TTY_GROUP=yes +USE_TTY_GROUP=NO # If HAVE_KILL is set to "yes", then kill will not be built or # installed from the misc-utils subdirectory. @@ -83,7 +83,7 @@ # If HAVE_RESET is set to "yes", then reset won't be installed. The version # of reset that comes with the ncurses package is less aggressive. -HAVE_RESET=yes +HAVE_RESET=no # If HAVE_SLN is set to "yes", then sln won't be installed # (but the man page sln.8 will be installed anyway). @@ -100,7 +100,7 @@ # If configure decides that Native Language Support (NLS) is available, # it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set # DISABLE_NLS to "yes". -DISABLE_NLS=no +DISABLE_NLS=yes # Different optimizations for different cpus. # gcc 3.0 likes options -mcpu=i486 instead of -m486 @@ -198,7 +198,7 @@ INSTALLBIN= $(INSTALL) -m $(BINMODE) INSTALLMAN= $(INSTALL) -m $(MANMODE) INSTALLDAT= $(INSTALL) -m $(DATMODE) -INSTALLSUID= $(INSTALL) -m $(SUIDMODE) -o root +INSTALLSUID= $(INSTALL) -m $(SUIDMODE) ifeq "$(DISABLE_NLS)" "yes" NLSFLAGS = -DDISABLE_NLS diff -dru util-linux-2.11y/disk-utils/mkfs.cramfs.c util-linux-2.11y.fjo/disk-utils/mkfs.cramfs.c --- util-linux-2.11y/disk-utils/mkfs.cramfs.c Sat Nov 2 14:48:00 2002 +++ util-linux-2.11y.fjo/disk-utils/mkfs.cramfs.c Tue Feb 25 10:10:55 2003 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff -dru util-linux-2.11y/disk-utils/raw.c util-linux-2.11y.fjo/disk-utils/raw.c --- util-linux-2.11y/disk-utils/raw.c Fri Mar 8 23:58:37 2002 +++ util-linux-2.11y.fjo/disk-utils/raw.c Tue Feb 25 10:10:55 2003 @@ -15,11 +15,10 @@ #include #include #include -#include +#include #include #include #include -#include #include #ifdef OLD_RAW_DEVS @@ -31,6 +30,15 @@ #endif #define DEVFS_RAWCTLDEV "/dev/raw/rawctl" +#define RAW_SETBIND _IO( 0xac, 0 ) +#define RAW_GETBIND _IO( 0xac, 1 ) + +struct raw_config_request +{ + int raw_minor; + u_int64_t block_major; + u_int64_t block_minor; +}; char * progname; int do_query = 0; diff -dru util-linux-2.11y/fdisk/cfdisk.c util-linux-2.11y.fjo/fdisk/cfdisk.c --- util-linux-2.11y/fdisk/cfdisk.c Tue Nov 26 17:44:08 2002 +++ util-linux-2.11y.fjo/fdisk/cfdisk.c Tue Feb 25 10:10:55 2003 @@ -76,7 +76,6 @@ #include #include #include -#include #include "nls.h" #include "xstrncpy.h" @@ -324,7 +323,7 @@ int logical = 0; int logical_sectors[MAXIMUM_PARTS]; -__sighandler_t old_SIGINT, old_SIGTERM; +sig_t old_SIGINT, old_SIGTERM; int arrow_cursor = FALSE; int display_units = MEGABYTES; diff -dru util-linux-2.11y/fdisk/fdiskaixlabel.h util-linux-2.11y.fjo/fdisk/fdiskaixlabel.h --- util-linux-2.11y/fdisk/fdiskaixlabel.h Sun Feb 20 17:50:51 2000 +++ util-linux-2.11y.fjo/fdisk/fdiskaixlabel.h Tue Feb 25 10:10:55 2003 @@ -1,4 +1,3 @@ -#include /* for __u32 etc */ /* * Copyright (C) Andreas Neuper, Sep 1998. * This file may be redistributed under diff -dru util-linux-2.11y/fdisk/fdiskbsdlabel.c util-linux-2.11y.fjo/fdisk/fdiskbsdlabel.c --- util-linux-2.11y/fdisk/fdiskbsdlabel.c Thu Oct 31 14:43:42 2002 +++ util-linux-2.11y.fjo/fdisk/fdiskbsdlabel.c Tue Feb 25 10:10:55 2003 @@ -42,6 +42,15 @@ Also fixed unaligned accesses in alpha_bootblock_checksum() */ +typedef __signed__ char __s8; +typedef unsigned char __u8; + +typedef __signed__ short __s16; +typedef unsigned short __u16; + +typedef __signed__ int __s32; +typedef unsigned int __u32; + #include #include #include diff -dru util-linux-2.11y/fdisk/fdiskbsdlabel.h util-linux-2.11y.fjo/fdisk/fdiskbsdlabel.h --- util-linux-2.11y/fdisk/fdiskbsdlabel.h Thu Oct 31 14:45:34 2002 +++ util-linux-2.11y.fjo/fdisk/fdiskbsdlabel.h Tue Feb 25 10:10:55 2003 @@ -31,8 +31,6 @@ * SUCH DAMAGE. */ -#include /* for __u32, __u16, __u8, __s16 */ - #ifndef BSD_DISKMAGIC #define BSD_DISKMAGIC ((__u32) 0x82564557) #endif diff -dru util-linux-2.11y/fdisk/fdisksgilabel.c util-linux-2.11y.fjo/fdisk/fdisksgilabel.c --- util-linux-2.11y/fdisk/fdisksgilabel.c Thu May 9 01:51:31 2002 +++ util-linux-2.11y.fjo/fdisk/fdisksgilabel.c Tue Feb 25 10:10:55 2003 @@ -9,6 +9,16 @@ * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo * Internationalization */ + +typedef __signed__ char __s8; +typedef unsigned char __u8; + +typedef __signed__ short __s16; +typedef unsigned short __u16; + +typedef __signed__ int __s32; +typedef unsigned int __u32; + #include /* stderr */ #include /* uint */ #include /* strstr */ diff -dru util-linux-2.11y/fdisk/fdisksgilabel.h util-linux-2.11y.fjo/fdisk/fdisksgilabel.h --- util-linux-2.11y/fdisk/fdisksgilabel.h Tue Feb 20 11:26:53 2001 +++ util-linux-2.11y.fjo/fdisk/fdisksgilabel.h Tue Feb 25 10:10:55 2003 @@ -1,4 +1,3 @@ -#include /* for __u32 etc */ /* * Copyright (C) Andreas Neuper, Sep 1998. * This file may be modified and redistributed under diff -dru util-linux-2.11y/fdisk/fdisksunlabel.c util-linux-2.11y.fjo/fdisk/fdisksunlabel.c --- util-linux-2.11y/fdisk/fdisksunlabel.c Fri Nov 1 02:55:25 2002 +++ util-linux-2.11y.fjo/fdisk/fdisksunlabel.c Tue Feb 25 10:10:55 2003 @@ -10,6 +10,15 @@ * Internationalization */ +typedef __signed__ char __s8; +typedef unsigned char __u8; + +typedef __signed__ short __s16; +typedef unsigned short __u16; + +typedef __signed__ int __s32; +typedef unsigned int __u32; + #include /* stderr */ #include /* uint */ #include /* strstr */ diff -dru util-linux-2.11y/fdisk/fdisksunlabel.h util-linux-2.11y.fjo/fdisk/fdisksunlabel.h --- util-linux-2.11y/fdisk/fdisksunlabel.h Mon Oct 2 23:42:10 2000 +++ util-linux-2.11y.fjo/fdisk/fdisksunlabel.h Tue Feb 25 10:10:55 2003 @@ -1,5 +1,3 @@ -#include /* for __u16, __u32 */ - typedef struct { unsigned char info[128]; /* Informative text string */ unsigned char spare0[14]; @@ -21,8 +19,8 @@ unsigned short nsect; /* Sectors per track */ unsigned char spare3[4]; /* Even more magic... */ struct sun_partition { - __u32 start_cylinder; - __u32 num_sectors; + u_int32_t start_cylinder; + u_int32_t num_sectors; } partitions[8]; unsigned short magic; /* Magic number */ unsigned short csum; /* Label xor'd checksum */ diff -dru util-linux-2.11y/hwclock/clock-ppc.c util-linux-2.11y.fjo/hwclock/clock-ppc.c --- util-linux-2.11y/hwclock/clock-ppc.c Sun Mar 11 14:49:43 2001 +++ util-linux-2.11y.fjo/hwclock/clock-ppc.c Tue Feb 25 10:10:55 2003 @@ -62,7 +62,7 @@ * reading '/etc/clock -au' instead of '/etc/clock -u -s', this error * is automatically corrected at every boot. * - * To do this job, the program reads and writes the file '/etc/adjtime' + * To do this job, the program reads and writes the file '/var/lib/hwclock/adjtime' * to determine the correction, and to save its data. In this file are * three numbers: * @@ -75,13 +75,13 @@ * * Installation and use of this program: * - * a) create a file '/etc/adjtime' containing as the first and only line: + * a) create a file '/var/lib/hwclock/adjtime' containing as the first and only line: * '0.0 0 0.0' * b) run 'clock -au' or 'clock -a', depending on whether your cmos is in * universal or local time. This updates the second number. * c) set your system time using the 'date' command. * d) update your cmos time using 'clock -wu' or 'clock -w' - * e) replace the first number in /etc/adjtime by your correction. + * e) replace the first number in /var/lib/hwclock/adjtime by your correction. * f) put the command 'clock -au' or 'clock -a' in your '/etc/rc.local' * * If the adjustment doesn't work for you, try contacting me by E-mail. @@ -114,7 +114,7 @@ * clock -u a cron job. The kernel adjusts cmos time every 11 * minutes - see kernel/sched.c and kernel/time.c set_rtc_mmss(). * This means we should really have a cron job updating - * /etc/adjtime every 11 mins (set last_time to the current time + * /var/lib/hwclock/adjtime every 11 mins (set last_time to the current time * and not_adjusted to ???). * b) Swapped arguments of outb() to agree with asm/io.h macro of the * same name. Use outb() from asm/io.h as it's slightly better. @@ -144,7 +144,7 @@ #define VERSION "1.4" /* Here the information for time adjustments is kept. */ -#define ADJPATH "/etc/adjtime" +#define ADJPATH "/var/lib/hwclock/adjtime" /* Apparently the RTC on PowerMacs stores seconds since 1 Jan 1904 */ #define RTC_OFFSET 2082844800 diff -dru util-linux-2.11y/hwclock/hwclock.8 util-linux-2.11y.fjo/hwclock/hwclock.8 --- util-linux-2.11y/hwclock/hwclock.8 Sat Jul 6 20:30:12 2002 +++ util-linux-2.11y.fjo/hwclock/hwclock.8 Tue Feb 25 10:10:55 2003 @@ -173,7 +173,7 @@ .TP .B \-\-noadjfile disables the facilities provided by -.IR /etc/adjtime . +.IR /var/lib/hwclock/adjtime . .B hwclock will not read nor write to that file with this option. Either .B \-\-utc @@ -429,7 +429,7 @@ It works like this: .B hwclock keeps a file, -.I /etc/adjtime, +.I /var/lib/hwclock/adjtime, that keeps some historical information. This is called the adjtime file. .PP Suppose you start with no adjtime file. You issue a @@ -572,7 +572,7 @@ .I TZ .SH FILES -.I /etc/adjtime +.I /var/lib/hwclock/adjtime .I /usr/share/zoneinfo/ .RI ( /usr/lib/zoneinfo on old systems) diff -dru util-linux-2.11y/hwclock/hwclock.c util-linux-2.11y.fjo/hwclock/hwclock.c --- util-linux-2.11y/hwclock/hwclock.c Sat Nov 2 16:07:24 2002 +++ util-linux-2.11y.fjo/hwclock/hwclock.c Tue Feb 25 10:10:55 2003 @@ -45,7 +45,7 @@ * reading '/etc/clock -au' instead of '/etc/clock -u -s', this error * is automatically corrected at every boot. * - * To do this job, the program reads and writes the file '/etc/adjtime' + * To do this job, the program reads and writes the file '/var/lib/hwclock/adjtime' * to determine the correction, and to save its data. In this file are * three numbers: * @@ -58,13 +58,13 @@ * * Installation and use of this program: * - * a) create a file '/etc/adjtime' containing as the first and only line: + * a) create a file '/var/lib/hwclock/adjtime' containing as the first and only line: * '0.0 0 0.0' * b) run 'clock -au' or 'clock -a', depending on whether your cmos is in * universal or local time. This updates the second number. * c) set your system time using the 'date' command. * d) update your cmos time using 'clock -wu' or 'clock -w' - * e) replace the first number in /etc/adjtime by your correction. + * e) replace the first number in /var/lib/hwclock/adjtime by your correction. * f) put the command 'clock -au' or 'clock -a' in your '/etc/rc.local' */ @@ -95,10 +95,10 @@ #define FLOOR(arg) ((arg >= 0 ? (int) arg : ((int) arg) - 1)); /* Here the information for time adjustments is kept. */ -#define ADJPATH "/etc/adjtime" +#define ADJPATH "/var/lib/hwclock/adjtime" /* Store the date here when "badyear" flag is set. */ -#define LASTDATE "/var/lib/lastdate" +#define LASTDATE "/var/lib/hwclock/lastdate" struct adjtime { /* This is information we keep in the adjtime file that tells us how @@ -230,10 +230,10 @@ static int read_adjtime(struct adjtime *adjtime_p) { /*---------------------------------------------------------------------------- - Read the adjustment parameters out of the /etc/adjtime file. + Read the adjustment parameters out of the /var/lib/hwclock/adjtime file. Return them as the adjtime structure <*adjtime_p>. - If there is no /etc/adjtime file, return defaults. + If there is no /var/lib/hwclock/adjtime file, return defaults. If values are missing from the file, return defaults for them. return value 0 if all OK, !=0 otherwise. @@ -763,10 +763,10 @@ } else if (adjtime_p->last_calib_time != 0) { /* * At adjustment time we adjust the hardware clock according - * to the contents of /etc/adjtime. + * to the contents of /var/lib/hwclock/adjtime. * * At calibration time we set the hardware clock and - * update /etc/adjtime, that is, for each calibration + * update /var/lib/hwclock/adjtime, that is, for each calibration * (except the first) we also do an adjustment. * * We are now at calibration time. @@ -1215,7 +1215,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" - " --noadjfile do not access /etc/adjtime. Requires the use of\n" + " --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" ),RTC_DEV); #ifdef __alpha__ @@ -1272,7 +1272,7 @@ * Returns: * EX_USAGE: bad invocation * EX_NOPERM: no permission - * EX_OSFILE: cannot open /dev/rtc or /etc/adjtime + * EX_OSFILE: cannot open /dev/rtc or /var/lib/hwclock/adjtime * EX_IOERR: ioctl error getting or setting the time * 0: OK (or not) * 1: failure @@ -1301,7 +1301,7 @@ setlocale(LC_ALL, ""); #ifdef LC_NUMERIC /* We need LC_CTYPE and LC_TIME and LC_MESSAGES, but must avoid - LC_NUMERIC since it gives problems when we write to /etc/adjtime. + LC_NUMERIC since it gives problems when we write to /var/lib/hwclock/adjtime. - gqueri@mail.dotcom.fr */ setlocale(LC_NUMERIC, "C"); #endif @@ -1575,7 +1575,7 @@ 2) Running the "date" program to interpret the value of our --date option. - Reading the /etc/adjtime file is the next biggest source of delay and + Reading the /var/lib/hwclock/adjtime file is the next biggest source of delay and uncertainty. The user wants to know what time it was at the moment he invoked us, diff -dru util-linux-2.11y/hwclock/kd.c util-linux-2.11y.fjo/hwclock/kd.c --- util-linux-2.11y/hwclock/kd.c Sun Jul 7 13:16:32 2002 +++ util-linux-2.11y.fjo/hwclock/kd.c Tue Feb 25 10:10:55 2003 @@ -13,7 +13,6 @@ static char *con_fd_filename; /* usually "/dev/tty1" */ /* Get defines for KDGHWCLK and KDSHWCLK (m68k) */ -#include #ifndef KDGHWCLK #define KDGHWCLK 0x4B50 /* get hardware clock */ #define KDSHWCLK 0x4B51 /* set hardware clock */ diff -dru util-linux-2.11y/misc-utils/Makefile util-linux-2.11y.fjo/misc-utils/Makefile --- util-linux-2.11y/misc-utils/Makefile Sat Nov 2 14:51:02 2002 +++ util-linux-2.11y.fjo/misc-utils/Makefile Tue Feb 25 10:19:25 2003 @@ -19,8 +19,8 @@ BIN= -USRBIN= cal chkdupexe ddate logger look mcookie \ - namei rename script whereis +USRBIN= chkdupexe ddate logger look mcookie \ + namei rename whereis MAYBE= reset setterm diff -dru util-linux-2.11y/misc-utils/cal.c util-linux-2.11y.fjo/misc-utils/cal.c --- util-linux-2.11y/misc-utils/cal.c Thu Oct 31 16:36:04 2002 +++ util-linux-2.11y.fjo/misc-utils/cal.c Tue Feb 25 10:15:09 2003 @@ -71,7 +71,7 @@ #ifdef HAVE_langinfo_h # include #else -# include /* libc4 only */ +//# include /* libc4 only */ #endif #include "widechar.h" diff -dru util-linux-2.11y/misc-utils/whereis.c util-linux-2.11y.fjo/misc-utils/whereis.c --- util-linux-2.11y/misc-utils/whereis.c Thu Mar 15 11:09:58 2001 +++ util-linux-2.11y.fjo/misc-utils/whereis.c Tue Feb 25 10:10:55 2003 @@ -38,7 +38,7 @@ */ #include -#include +#include #include #include #include @@ -317,7 +317,7 @@ void findin(char *dir, char *cp) { DIR *dirp; - struct direct *dp; + struct dirent *dp; char *d, *dd; int l; char dirbuf[1024]; diff -dru util-linux-2.11y/mount/Makefile util-linux-2.11y.fjo/mount/Makefile --- util-linux-2.11y/mount/Makefile Tue Nov 26 10:15:57 2002 +++ util-linux-2.11y.fjo/mount/Makefile Tue Feb 25 10:10:55 2003 @@ -1,8 +1,6 @@ include ../make_include include ../MCONFIG -DEFINES = -DHAVE_NFS - RPCSVCDIR = rpcsvc RPC_CFLAGS = -Wno-unused RPCGEN = rpcgen @@ -25,8 +23,6 @@ MAYBE = pivot_root swapoff LO_OBJS = lomount.o $(LIB)/xstrncpy.o -NFS_OBJS = nfsmount.o nfsmount_xdr.o nfsmount_clnt.o -GEN_FILES = nfsmount.h nfsmount_xdr.c nfsmount_clnt.c all: $(PROGS) diff -dru util-linux-2.11y/mount/swap.configure util-linux-2.11y.fjo/mount/swap.configure --- util-linux-2.11y/mount/swap.configure Fri Jul 9 04:56:39 1999 +++ util-linux-2.11y.fjo/mount/swap.configure Tue Feb 25 10:10:55 2003 @@ -19,14 +19,12 @@ fi fi echo $PAGEH > conftest.c -echo $SWAPH >> conftest.c echo '#include main(){ exit(0); swapon("/dev/null", 0); }' >> conftest.c eval $compile if test -s conftest && ./conftest 2>/dev/null; then echo "#define SWAPON_HAS_TWO_ARGS" > swapargs.h echo $PAGEH >> swapargs.h - echo $SWAPH >> swapargs.h else echo > swapargs.h echo " diff -dru util-linux-2.11y/mount/swap_constants.h util-linux-2.11y.fjo/mount/swap_constants.h --- util-linux-2.11y/mount/swap_constants.h Fri Jul 9 04:56:40 1999 +++ util-linux-2.11y.fjo/mount/swap_constants.h Tue Feb 25 10:10:55 2003 @@ -13,3 +13,6 @@ #ifndef SWAP_FLAG_PRIO_SHIFT #define SWAP_FLAG_PRIO_SHIFT 0 #endif + +extern int swapon (__const char *__path, int __flags) __THROW; +extern int swapoff (__const char *__path) __THROW; diff -dru util-linux-2.11y/po/ca.po util-linux-2.11y.fjo/po/ca.po --- util-linux-2.11y/po/ca.po Mon Nov 25 00:47:17 2002 +++ util-linux-2.11y.fjo/po/ca.po Tue Feb 25 10:10:55 2003 @@ -5677,7 +5677,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - Consulta i configura el rellotge de maquinari (RTC)\n" @@ -5705,7 +5705,7 @@ " --date Especifica el temps en que es desitja establir el RTC\n" " --epoch=any Especifica l'any que correspon al començament del valor de\n" " l'època del RTC\n" -" --noadjfile No accedir a /etc/adjtime. Requereix l'us de --utc o --" +" --noadjfile No accedir a /var/lib/hwclock/adjtime. Requereix l'us de --utc o --" "localtime\n" #: hwclock/hwclock.c:1223 diff -dru util-linux-2.11y/po/cat-id-tbl.c util-linux-2.11y.fjo/po/cat-id-tbl.c --- util-linux-2.11y/po/cat-id-tbl.c Mon Nov 25 11:52:47 2002 +++ util-linux-2.11y.fjo/po/cat-id-tbl.c Tue Feb 25 10:10:55 2003 @@ -1489,7 +1489,7 @@ --date specifies the time to which to set the hardware clock\n\ --epoch=year specifies the year which is the beginning of the \n\ hardware clock's epoch value\n\ - --noadjfile do not access /etc/adjtime. Requires the use of\n\ + --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n\ either --utc or --localtime\n", 1079}, {"\ --jensen, --arc, --srm, --funky-toy\n\ diff -dru util-linux-2.11y/po/cs.po util-linux-2.11y.fjo/po/cs.po --- util-linux-2.11y/po/cs.po Mon Nov 25 00:47:17 2002 +++ util-linux-2.11y.fjo/po/cs.po Tue Feb 25 10:10:55 2003 @@ -5577,7 +5577,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - nastavuje a zji¹»uje reálný èas (RTC)\n" diff -dru util-linux-2.11y/po/da.po util-linux-2.11y.fjo/po/da.po --- util-linux-2.11y/po/da.po Mon Nov 25 00:47:18 2002 +++ util-linux-2.11y.fjo/po/da.po Tue Feb 25 10:10:55 2003 @@ -5591,7 +5591,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - læs og sæt maskinuret (RTC)\n" @@ -5619,7 +5619,7 @@ " --date angiver tiden, som maskinuret skal sættes til\n" " --epoch=år angiver det år, som er begyndelsen på maskinurets\n" " epokeværdi\n" -" --noadjfile tilgå ikke /etc/adjtime. Det kræver, at der bruges\n" +" --noadjfile tilgå ikke /var/lib/hwclock/adjtime. Det kræver, at der bruges\n" " enten --utc eller --localtime\n" #: hwclock/hwclock.c:1223 diff -dru util-linux-2.11y/po/de.po util-linux-2.11y.fjo/po/de.po --- util-linux-2.11y/po/de.po Mon Nov 25 00:47:18 2002 +++ util-linux-2.11y.fjo/po/de.po Tue Feb 25 10:10:56 2003 @@ -5616,7 +5616,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - Die Hardwareuhr (RTC) setzen und abfragen\n" @@ -5646,7 +5646,7 @@ "ist\n" " --date diese Zeit zum setzen der Hardwareuhr verwenden\n" " --epoch=year diesen Wert als Epochenwert der Hardwareuhr verwenden\n" -" --noadjfile nicht auf /etc/adjtime zugreifen; erfordert Benutzung von\n" +" --noadjfile nicht auf /var/lib/hwclock/adjtime zugreifen; erfordert Benutzung von\n" " entweder --utc oder --localtime\n" #: hwclock/hwclock.c:1223 diff -dru util-linux-2.11y/po/es.po util-linux-2.11y.fjo/po/es.po --- util-linux-2.11y/po/es.po Mon Nov 25 00:47:19 2002 +++ util-linux-2.11y.fjo/po/es.po Tue Feb 25 10:10:56 2003 @@ -5725,7 +5725,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - Consulta y establece el reloj de hardware (RTC)\n" @@ -5759,7 +5759,7 @@ " de hardware\n" " --epoch=año Especifica el año que corresponde al principio del valor de\n" " época del reloj de hardware\n" -" --noadjfile No accede a /etc/adjtime. Necesita del uso de --utc\n" +" --noadjfile No accede a /var/lib/hwclock/adjtime. Necesita del uso de --utc\n" " o de --localtime\n" #: hwclock/hwclock.c:1223 diff -dru util-linux-2.11y/po/et.po util-linux-2.11y.fjo/po/et.po --- util-linux-2.11y/po/et.po Mon Nov 25 00:47:19 2002 +++ util-linux-2.11y.fjo/po/et.po Tue Feb 25 10:10:56 2003 @@ -5532,7 +5532,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock -- riistvaralise kella (RTC) väärtuse vaatamiseks ja seadmiseks\n" @@ -5560,7 +5560,7 @@ " --date annab aja, mis riistvaralise kella väärtuseks panna\n" " --epoch=aasta annab aasta, mida hakata lugema riistvaralise kella\n" " epohhi alguseks\n" -" --noadjfile mitte kasutada faili /etc/adjtime. Vajab kas --utc või\n" +" --noadjfile mitte kasutada faili /var/lib/hwclock/adjtime. Vajab kas --utc või\n" " --localtime võtit\n" #: hwclock/hwclock.c:1223 diff -dru util-linux-2.11y/po/fi.po util-linux-2.11y.fjo/po/fi.po --- util-linux-2.11y/po/fi.po Mon Nov 25 00:47:20 2002 +++ util-linux-2.11y.fjo/po/fi.po Tue Feb 25 10:10:56 2003 @@ -5603,7 +5603,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - lukee ja asettaa laitteistokellon (RTC)\n" @@ -5632,7 +5632,7 @@ " --date määrittää ajan, johon laitteistokello asetetaan\n" " --epoch=year määrittää vuoden, joka on laitteistokellon\n" " epoch-arvon nollakohta\n" -" --noadjfile ei käytetä tiedostoa /etc/adjtime. Vaatii joko valitsimen\n" +" --noadjfile ei käytetä tiedostoa /var/lib/hwclock/adjtime. Vaatii joko valitsimen\n" " --utc tai --localtime käyttämistä\n" #: hwclock/hwclock.c:1223 diff -dru util-linux-2.11y/po/fr.po util-linux-2.11y.fjo/po/fr.po --- util-linux-2.11y/po/fr.po Mon Nov 25 00:47:20 2002 +++ util-linux-2.11y.fjo/po/fr.po Tue Feb 25 10:10:56 2003 @@ -5686,7 +5686,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" diff -dru util-linux-2.11y/po/it.po util-linux-2.11y.fjo/po/it.po --- util-linux-2.11y/po/it.po Mon Nov 25 00:47:21 2002 +++ util-linux-2.11y.fjo/po/it.po Tue Feb 25 10:10:56 2003 @@ -5670,7 +5670,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - ricerca e impostazione del clock di sistema (RTC)\n" diff -dru util-linux-2.11y/po/ja.po util-linux-2.11y.fjo/po/ja.po --- util-linux-2.11y/po/ja.po Mon Nov 25 00:47:21 2002 +++ util-linux-2.11y.fjo/po/ja.po Tue Feb 25 10:10:56 2003 @@ -5558,7 +5558,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - ¥Ï¡¼¥É¥¦¥§¥¢»þ·× (RTC) ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤äÀßÄê¤ò¹Ô¤¦\n" @@ -5586,7 +5586,7 @@ " --badyear BIOS ¤ËÌäÂ꤬¤¢¤ë¤¿¤á¡¢rtc ¤Îǯ¤ò̵»ë¤¹¤ë\n" " --date ¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Ë»ØÄꤹ¤ë»þ¹ï\n" " --epoch=year ¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Î¥¨¥Ý¥Ã¥¯Ãͤε¯¸»¤Ë»ØÄꤹ¤ëǯ\n" -" -noadjfile /etc/adjtime ¤Ë¥¢¥¯¥»¥¹¤·¤Ê¤¤¡£--utc Ëô¤Ï --localtime\n" +" -noadjfile /var/lib/hwclock/adjtime ¤Ë¥¢¥¯¥»¥¹¤·¤Ê¤¤¡£--utc Ëô¤Ï --localtime\n" " ¤Î¤¤¤º¤ì¤«¤Î»ÈÍѤòɬÍפȤ¹¤ë\n" #: hwclock/hwclock.c:1223 diff -dru util-linux-2.11y/po/nl.po util-linux-2.11y.fjo/po/nl.po --- util-linux-2.11y/po/nl.po Mon Nov 25 00:47:22 2002 +++ util-linux-2.11y.fjo/po/nl.po Tue Feb 25 10:10:56 2003 @@ -5638,7 +5638,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" diff -dru util-linux-2.11y/po/pt_BR.po util-linux-2.11y.fjo/po/pt_BR.po --- util-linux-2.11y/po/pt_BR.po Mon Nov 25 00:47:22 2002 +++ util-linux-2.11y.fjo/po/pt_BR.po Tue Feb 25 10:10:56 2003 @@ -5649,7 +5649,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - consulta e ajusta o relógio de hardware (RTC).\n" diff -dru util-linux-2.11y/po/ru.po util-linux-2.11y.fjo/po/ru.po --- util-linux-2.11y/po/ru.po Tue Oct 8 00:56:51 2002 +++ util-linux-2.11y.fjo/po/ru.po Tue Feb 25 10:10:56 2003 @@ -4918,7 +4918,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" diff -dru util-linux-2.11y/po/sl.po util-linux-2.11y.fjo/po/sl.po --- util-linux-2.11y/po/sl.po Mon Nov 25 00:47:22 2002 +++ util-linux-2.11y.fjo/po/sl.po Tue Feb 25 10:10:56 2003 @@ -5214,7 +5214,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" diff -dru util-linux-2.11y/po/sv.po util-linux-2.11y.fjo/po/sv.po --- util-linux-2.11y/po/sv.po Mon Nov 25 00:47:23 2002 +++ util-linux-2.11y.fjo/po/sv.po Tue Feb 25 10:10:56 2003 @@ -5649,7 +5649,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - fråga och ställ hårdvaruklockan (RTC)\n" @@ -5676,7 +5676,7 @@ " --badyear ignorera året i rtc:n eftersom bioset är trasigt\n" " --date anger tiden som hårdvaruklockan ska ställas till\n" " --epoch=år anger det år som är början på hårdvaruklockans epokvärde\n" -" --noadjfile försök inte komma åt /etc/adjtime. Kräver att antingen\n" +" --noadjfile försök inte komma åt /var/lib/hwclock/adjtime. Kräver att antingen\n" " --utc eller --localtime används\n" #: hwclock/hwclock.c:1223 diff -dru util-linux-2.11y/po/tr.po util-linux-2.11y.fjo/po/tr.po --- util-linux-2.11y/po/tr.po Mon Nov 25 00:47:23 2002 +++ util-linux-2.11y.fjo/po/tr.po Tue Feb 25 10:10:56 2003 @@ -5648,7 +5648,7 @@ " --date specifies the time to which to set the hardware clock\n" " --epoch=year specifies the year which is the beginning of the \n" " hardware clock's epoch value\n" -" --noadjfile do not access /etc/adjtime. Requires the use of\n" +" --noadjfile do not access /var/lib/hwclock/adjtime. Requires the use of\n" " either --utc or --localtime\n" msgstr "" "hwclock - Donanım saatini (RTC) ayarlamak ve sorgulamak için kullanılır.\n" @@ -5676,7 +5676,7 @@ " --date donanım saatinin ayarlanacağı deÄŸer belirtilir\n" " --epoch=YIL donanım saatinin dönemsellik baÅŸlangıç deÄŸeri olan\n" " YIL belirtilir\n" -" --noadjfile /etc/adjtime okunmaz. Ya --utc ya da --localtime kullanmak\n" +" --noadjfile /var/lib/hwclock/adjtime okunmaz. Ya --utc ya da --localtime kullanmak\n" " gerekir.\n" #: hwclock/hwclock.c:1223 diff -dru util-linux-2.11y/text-utils/column.c util-linux-2.11y.fjo/text-utils/column.c --- util-linux-2.11y/text-utils/column.c Thu Jul 4 14:53:43 2002 +++ util-linux-2.11y.fjo/text-utils/column.c Tue Feb 25 10:21:58 2003 @@ -79,6 +79,13 @@ wchar_t default_separator[] = { '\t', ' ', 0 }; wchar_t *separator = default_separator; /* field separator for table option */ +struct winsize { + unsigned short ws_row; + unsigned short ws_col; + unsigned short ws_xpixel; + unsigned short ws_ypixel; +}; + int main(int argc, char **argv) { diff -dru util-linux-2.11y/text-utils/display.c util-linux-2.11y.fjo/text-utils/display.c --- util-linux-2.11y/text-utils/display.c Sat Mar 9 00:05:39 2002 +++ util-linux-2.11y.fjo/text-utils/display.c Tue Feb 25 10:10:56 2003 @@ -31,6 +31,9 @@ * SUCH DAMAGE. */ +typedef long long int quad_t; +typedef unsigned long long int u_quad_t; + #include #include #include diff -dru util-linux-2.11y/text-utils/more.c util-linux-2.11y.fjo/text-utils/more.c --- util-linux-2.11y/text-utils/more.c Mon Nov 25 00:43:03 2002 +++ util-linux-2.11y.fjo/text-utils/more.c Tue Feb 25 10:10:56 2003 @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include "xstrncpy.h" #include "nls.h" @@ -1595,11 +1595,13 @@ register int lncount; int saveln, rv; char *s; + regex_t reg; + regmatch_t match[1024]; context.line = saveln = Currline; context.chrctr = startline; lncount = 0; - if ((s = re_comp (buf)) != 0) + if ((s = regcomp(®, buf, 0))) error (s); while (!feof (file)) { line3 = line2; @@ -1607,7 +1609,7 @@ line1 = Ftell (file); rdline (file); lncount++; - if ((rv = re_exec (Line)) == 1) { + if ((rv = regexec (®, Line, 1024, match, 0)) == 1) { if (--n == 0) { if (lncount > 3 || (lncount > 1 && no_intty)) { @@ -1646,6 +1648,7 @@ } else if (rv == -1) error (_("Regular expression botch")); } + regfree(®); if (feof (file)) { if (!no_intty) { #ifndef __linux__ diff -dru util-linux-2.11y/text-utils/pg.c util-linux-2.11y.fjo/text-utils/pg.c --- util-linux-2.11y/text-utils/pg.c Mon Nov 25 01:43:32 2002 +++ util-linux-2.11y.fjo/text-utils/pg.c Tue Feb 25 10:10:56 2003 @@ -46,7 +46,7 @@ #ifndef TIOCGWINSZ #include #endif -#include +#include #include #include #include @@ -59,7 +59,6 @@ #include #include #include -#include #include #if NCH #include