diff options
| author | Erik Andersen <andersen@codepoet.org> | 2000-02-08 19:58:47 +0000 |
|---|---|---|
| committer | Erik Andersen <andersen@codepoet.org> | 2000-02-08 19:58:47 +0000 |
| commit | e49d5ecbbe51718fa925b6890a735e5937cc2aa2 (patch) | |
| tree | c90bda10731ad9333ce3b404f993354c9fc104b8 | |
| parent | c0bf817bbc5c7867fbe8fb76d5c39f8ee802692f (diff) | |
Some formatting updates (ran the code through indent)
-Erik
| -rw-r--r-- | applets/busybox.c | 456 | ||||
| -rw-r--r-- | archival/gunzip.c | 2520 | ||||
| -rw-r--r-- | archival/gzip.c | 3132 | ||||
| -rw-r--r-- | archival/tar.c | 1857 | ||||
| -rw-r--r-- | busybox.c | 456 | ||||
| -rw-r--r-- | busybox.def.h | 1 | ||||
| -rw-r--r-- | cat.c | 54 | ||||
| -rw-r--r-- | chmod_chown_chgrp.c | 238 | ||||
| -rw-r--r-- | chroot.c | 57 | ||||
| -rw-r--r-- | chvt.c | 36 | ||||
| -rw-r--r-- | clear.c | 6 | ||||
| -rw-r--r-- | console-tools/chvt.c | 36 | ||||
| -rw-r--r-- | console-tools/clear.c | 6 | ||||
| -rw-r--r-- | console-tools/deallocvt.c | 62 | ||||
| -rw-r--r-- | console-tools/loadacm.c | 664 | ||||
| -rw-r--r-- | console-tools/loadfont.c | 196 | ||||
| -rw-r--r-- | console-tools/loadkmap.c | 103 | ||||
| -rw-r--r-- | coreutils/cat.c | 54 | ||||
| -rw-r--r-- | coreutils/chroot.c | 57 | ||||
| -rw-r--r-- | coreutils/date.c | 451 | ||||
| -rw-r--r-- | coreutils/dd.c | 284 | ||||
| -rw-r--r-- | coreutils/df.c | 119 | ||||
| -rw-r--r-- | coreutils/du.c | 185 | ||||
| -rw-r--r-- | coreutils/head.c | 134 | ||||
| -rw-r--r-- | coreutils/hostid.c | 8 | ||||
| -rw-r--r-- | coreutils/length.c | 14 | ||||
| -rw-r--r-- | coreutils/ln.c | 150 | ||||
| -rw-r--r-- | coreutils/logname.c | 22 | ||||
| -rw-r--r-- | coreutils/ls.c | 297 | ||||
| -rw-r--r-- | coreutils/mkdir.c | 133 | ||||
| -rw-r--r-- | coreutils/mkfifo.c | 64 | ||||
| -rw-r--r-- | coreutils/mknod.c | 39 | ||||
| -rw-r--r-- | coreutils/printf.c | 632 | ||||
| -rw-r--r-- | coreutils/pwd.c | 12 | ||||
| -rw-r--r-- | coreutils/rm.c | 102 | ||||
| -rw-r--r-- | coreutils/rmdir.c | 20 | ||||
| -rw-r--r-- | coreutils/sleep.c | 19 | ||||
| -rw-r--r-- | coreutils/sort.c | 385 | ||||
| -rw-r--r-- | coreutils/sync.c | 13 | ||||
| -rw-r--r-- | coreutils/tail.c | 1789 | ||||
| -rw-r--r-- | coreutils/tee.c | 129 | ||||
| -rw-r--r-- | coreutils/touch.c | 79 | ||||
| -rw-r--r-- | coreutils/tty.c | 25 | ||||
| -rw-r--r-- | coreutils/uname.c | 139 | ||||
| -rw-r--r-- | coreutils/uniq.c | 225 | ||||
| -rw-r--r-- | coreutils/wc.c | 127 | ||||
| -rw-r--r-- | coreutils/whoami.c | 27 | ||||
| -rw-r--r-- | coreutils/yes.c | 14 | ||||
| -rw-r--r-- | cp_mv.c | 359 | ||||
| -rw-r--r-- | date.c | 451 | ||||
| -rw-r--r-- | dd.c | 284 | ||||
| -rw-r--r-- | deallocvt.c | 62 | ||||
| -rw-r--r-- | df.c | 119 | ||||
| -rw-r--r-- | dmesg.c | 160 | ||||
| -rw-r--r-- | du.c | 185 | ||||
| -rw-r--r-- | dutmp.c | 62 | ||||
| -rw-r--r-- | editors/sed.c | 522 | ||||
| -rw-r--r-- | fbset.c | 360 | ||||
| -rw-r--r-- | fdflush.c | 36 | ||||
| -rw-r--r-- | find.c | 142 | ||||
| -rw-r--r-- | findutils/find.c | 142 | ||||
| -rw-r--r-- | findutils/grep.c | 182 | ||||
| -rw-r--r-- | free.c | 6 | ||||
| -rw-r--r-- | fsck_minix.c | 716 | ||||
| -rw-r--r-- | grep.c | 182 | ||||
| -rw-r--r-- | gunzip.c | 2520 | ||||
| -rw-r--r-- | gzip.c | 3132 | ||||
| -rw-r--r-- | halt.c | 9 | ||||
| -rw-r--r-- | head.c | 134 | ||||
| -rw-r--r-- | hostid.c | 8 | ||||
| -rw-r--r-- | hostname.c | 193 | ||||
| -rw-r--r-- | init.c | 1335 | ||||
| -rw-r--r-- | init/halt.c | 9 | ||||
| -rw-r--r-- | init/init.c | 1335 | ||||
| -rw-r--r-- | init/poweroff.c | 8 | ||||
| -rw-r--r-- | init/reboot.c | 8 | ||||
| -rw-r--r-- | insmod.c | 240 | ||||
| -rw-r--r-- | internal.h | 4 | ||||
| -rw-r--r-- | kill.c | 299 | ||||
| -rw-r--r-- | length.c | 14 | ||||
| -rw-r--r-- | ln.c | 150 | ||||
| -rw-r--r-- | loadacm.c | 664 | ||||
| -rw-r--r-- | loadfont.c | 196 | ||||
| -rw-r--r-- | loadkmap.c | 103 | ||||
| -rw-r--r-- | logger.c | 191 | ||||
| -rw-r--r-- | logname.c | 22 | ||||
| -rw-r--r-- | ls.c | 297 | ||||
| -rw-r--r-- | lsmod.c | 6 | ||||
| -rw-r--r-- | makedevs.c | 83 | ||||
| -rw-r--r-- | math.c | 106 | ||||
| -rw-r--r-- | messages.c | 19 | ||||
| -rw-r--r-- | miscutils/dutmp.c | 62 | ||||
| -rw-r--r-- | miscutils/makedevs.c | 83 | ||||
| -rw-r--r-- | miscutils/mt.c | 122 | ||||
| -rw-r--r-- | miscutils/update.c | 18 | ||||
| -rw-r--r-- | mkdir.c | 133 | ||||
| -rw-r--r-- | mkfifo.c | 64 | ||||
| -rw-r--r-- | mkfs_minix.c | 499 | ||||
| -rw-r--r-- | mknod.c | 39 | ||||
| -rw-r--r-- | mkswap.c | 197 | ||||
| -rw-r--r-- | mnc.c | 118 | ||||
| -rw-r--r-- | modutils/insmod.c | 240 | ||||
| -rw-r--r-- | modutils/lsmod.c | 6 | ||||
| -rw-r--r-- | modutils/rmmod.c | 55 | ||||
| -rw-r--r-- | more.c | 199 | ||||
| -rw-r--r-- | mount.c | 581 | ||||
| -rw-r--r-- | mt.c | 122 | ||||
| -rw-r--r-- | mtab.c | 98 | ||||
| -rw-r--r-- | networking/hostname.c | 193 | ||||
| -rw-r--r-- | networking/nslookup.c | 185 | ||||
| -rw-r--r-- | networking/ping.c | 618 | ||||
| -rw-r--r-- | nfsmount.c | 933 | ||||
| -rw-r--r-- | nfsmount.h | 1 | ||||
| -rw-r--r-- | nslookup.c | 185 | ||||
| -rw-r--r-- | ping.c | 618 | ||||
| -rw-r--r-- | poweroff.c | 8 | ||||
| -rw-r--r-- | printf.c | 632 | ||||
| -rw-r--r-- | procps/free.c | 6 | ||||
| -rw-r--r-- | procps/kill.c | 299 | ||||
| -rw-r--r-- | procps/ps.c | 206 | ||||
| -rw-r--r-- | ps.c | 206 | ||||
| -rw-r--r-- | pwd.c | 12 | ||||
| -rw-r--r-- | reboot.c | 8 | ||||
| -rw-r--r-- | regexp.c | 602 | ||||
| -rw-r--r-- | regexp.h | 1 | ||||
| -rw-r--r-- | rm.c | 102 | ||||
| -rw-r--r-- | rmdir.c | 20 | ||||
| -rw-r--r-- | rmmod.c | 55 | ||||
| -rw-r--r-- | sed.c | 522 | ||||
| -rw-r--r-- | sfdisk.c | 4426 | ||||
| -rw-r--r-- | sleep.c | 19 | ||||
| -rw-r--r-- | sort.c | 385 | ||||
| -rw-r--r-- | swaponoff.c | 131 | ||||
| -rw-r--r-- | sync.c | 13 | ||||
| -rw-r--r-- | sysklogd/logger.c | 191 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 552 | ||||
| -rw-r--r-- | syslogd.c | 552 | ||||
| -rw-r--r-- | tail.c | 1789 | ||||
| -rw-r--r-- | tar.c | 1857 | ||||
| -rw-r--r-- | tee.c | 129 | ||||
| -rw-r--r-- | touch.c | 79 | ||||
| -rw-r--r-- | true_false.c | 12 | ||||
| -rw-r--r-- | tty.c | 25 | ||||
| -rw-r--r-- | umount.c | 291 | ||||
| -rw-r--r-- | uname.c | 139 | ||||
| -rw-r--r-- | uniq.c | 225 | ||||
| -rw-r--r-- | update.c | 18 | ||||
| -rw-r--r-- | util-linux/dmesg.c | 160 | ||||
| -rw-r--r-- | util-linux/fbset.c | 360 | ||||
| -rw-r--r-- | util-linux/fdflush.c | 36 | ||||
| -rw-r--r-- | util-linux/fsck_minix.c | 716 | ||||
| -rw-r--r-- | util-linux/mkfs_minix.c | 499 | ||||
| -rw-r--r-- | util-linux/mkswap.c | 197 | ||||
| -rw-r--r-- | util-linux/more.c | 199 | ||||
| -rw-r--r-- | util-linux/mount.c | 581 | ||||
| -rw-r--r-- | util-linux/nfsmount.c | 933 | ||||
| -rw-r--r-- | util-linux/nfsmount.h | 1 | ||||
| -rw-r--r-- | util-linux/swaponoff.c | 131 | ||||
| -rw-r--r-- | util-linux/umount.c | 291 | ||||
| -rw-r--r-- | utility.c | 1394 | ||||
| -rw-r--r-- | wc.c | 127 | ||||
| -rw-r--r-- | whoami.c | 27 | ||||
| -rw-r--r-- | yes.c | 14 |
163 files changed, 27866 insertions, 27364 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index e2c2e0393..8bbe6a22e 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" #include <stdio.h> #include <string.h> @@ -16,329 +17,342 @@ static int been_there_done_that = 0; * replacement may be in order */ #if 0 -void exit (int status) __attribute__ ((noreturn)); -void exit (int status) { _exit(status); }; -void abort (void) __attribute__ ((__noreturn__)); -void abort (void) { _exit(0); }; -int atexit (void (*__func) (void)) { _exit(0); }; +void exit(int status) __attribute__ ((noreturn)); +void exit(int status) +{ + _exit(status); +}; +void abort(void) __attribute__ ((__noreturn__)); +void abort(void) +{ + _exit(0); +}; +int atexit(void (*__func) (void)) +{ + _exit(0); +}; void *__libc_stack_end; #endif static const struct Applet applets[] = { -#ifdef BB_BUSYBOX //bin - {"busybox", busybox_main}, +#ifdef BB_BUSYBOX //bin + {"busybox", busybox_main}, +#endif +#ifdef BB_BLOCK_DEVICE //sbin + {"block_device", block_device_main}, #endif -#ifdef BB_BLOCK_DEVICE //sbin - {"block_device", block_device_main}, +#ifdef BB_CAT //bin + {"cat", cat_main}, #endif -#ifdef BB_CAT //bin - {"cat", cat_main}, +#ifdef BB_CHMOD_CHOWN_CHGRP //bin + {"chmod", chmod_chown_chgrp_main}, + {"chown", chmod_chown_chgrp_main}, + {"chgrp", chmod_chown_chgrp_main}, #endif -#ifdef BB_CHMOD_CHOWN_CHGRP //bin - {"chmod", chmod_chown_chgrp_main}, - {"chown", chmod_chown_chgrp_main}, - {"chgrp", chmod_chown_chgrp_main}, +#ifdef BB_CHROOT //sbin + {"chroot", chroot_main}, #endif -#ifdef BB_CHROOT //sbin - {"chroot", chroot_main}, +#ifdef BB_CLEAR //usr/bin + {"clear", clear_main}, #endif -#ifdef BB_CLEAR //usr/bin - {"clear", clear_main}, +#ifdef BB_CHVT //usr/bin + {"chvt", chvt_main}, #endif -#ifdef BB_CHVT //usr/bin - {"chvt", chvt_main}, +#ifdef BB_CP_MV //bin + {"cp", cp_mv_main}, + {"mv", cp_mv_main}, #endif -#ifdef BB_CP_MV //bin - {"cp", cp_mv_main}, - {"mv", cp_mv_main}, +#ifdef BB_DATE //bin + {"date", date_main}, #endif -#ifdef BB_DATE //bin - {"date", date_main}, +#ifdef BB_DD //bin + {"dd", dd_main}, #endif -#ifdef BB_DD //bin - {"dd", dd_main}, +#ifdef BB_DF //bin + {"df", df_main}, #endif -#ifdef BB_DF //bin - {"df", df_main}, +#ifdef BB_DMESG //bin + {"dmesg", dmesg_main}, #endif -#ifdef BB_DMESG //bin - {"dmesg", dmesg_main}, +#ifdef BB_DU //bin + {"du", du_main}, #endif -#ifdef BB_DU //bin - {"du", du_main}, +#ifdef BB_DUTMP //usr/sbin + {"dutmp", dutmp_main}, #endif -#ifdef BB_DUTMP //usr/sbin - {"dutmp", dutmp_main}, +#ifdef BB_FBSET //usr/sbin + {"fbset", fbset_main}, #endif -#ifdef BB_FBSET //usr/sbin - {"fbset", fbset_main}, +#ifdef BB_FDFLUSH //bin + {"fdflush", fdflush_main}, #endif -#ifdef BB_FDFLUSH //bin - {"fdflush", fdflush_main}, +#ifdef BB_FIND //usr/bin + {"find", find_main}, #endif -#ifdef BB_FIND //usr/bin - {"find", find_main}, +#ifdef BB_FREE //usr/bin + {"free", free_main}, #endif -#ifdef BB_FREE //usr/bin - {"free", free_main}, +#ifdef BB_DEALLOCVT //usr/bin + {"deallocvt", deallocvt_main}, #endif -#ifdef BB_DEALLOCVT //usr/bin - {"deallocvt", deallocvt_main}, +#ifdef BB_FSCK_MINIX //sbin + {"fsck.minix", fsck_minix_main}, #endif -#ifdef BB_FSCK_MINIX //sbin - {"fsck.minix", fsck_minix_main}, +#ifdef BB_MKFS_MINIX //sbin + {"mkfs.minix", mkfs_minix_main}, #endif -#ifdef BB_MKFS_MINIX //sbin - {"mkfs.minix", mkfs_minix_main}, +#ifdef BB_GREP //bin + {"grep", grep_main}, #endif -#ifdef BB_GREP //bin - {"grep", grep_main}, +#ifdef BB_HALT //sbin + {"halt", halt_main}, #endif -#ifdef BB_HALT //sbin - {"halt", halt_main}, +#ifdef BB_HEAD //bin + {"head", head_main}, #endif -#ifdef BB_HEAD //bin - {"head", head_main}, +#ifdef BB_HOSTID //usr/bin + {"hostid", hostid_main}, #endif -#ifdef BB_HOSTID //usr/bin - {"hostid", hostid_main}, +#ifdef BB_HOSTNAME //bin + {"hostname", hostname_main}, #endif -#ifdef BB_HOSTNAME //bin - {"hostname", hostname_main}, +#ifdef BB_INIT //sbin + {"init", init_main}, #endif -#ifdef BB_INIT //sbin - {"init", init_main}, +#ifdef BB_INSMOD //sbin + {"insmod", insmod_main}, #endif -#ifdef BB_INSMOD //sbin - {"insmod", insmod_main}, +#ifdef BB_FEATURE_LINUXRC // + {"linuxrc", init_main}, #endif -#ifdef BB_FEATURE_LINUXRC // - {"linuxrc", init_main}, +#ifdef BB_KILL //bin + {"kill", kill_main}, #endif -#ifdef BB_KILL //bin - {"kill", kill_main}, +#ifdef BB_LENGTH //usr/bin + {"length", length_main}, #endif -#ifdef BB_LENGTH //usr/bin - {"length", length_main}, +#ifdef BB_LN //bin + {"ln", ln_main}, #endif -#ifdef BB_LN //bin - {"ln", ln_main}, +#ifdef BB_LOADACM //usr/bin + {"loadacm", loadacm_main}, #endif -#ifdef BB_LOADACM //usr/bin - {"loadacm", loadacm_main}, -#endif -#ifdef BB_LOADFONT //usr/bin - {"loadfont", loadfont_main}, +#ifdef BB_LOADFONT //usr/bin + {"loadfont", loadfont_main}, #endif -#ifdef BB_LOADKMAP //sbin - {"loadkmap", loadkmap_main}, +#ifdef BB_LOADKMAP //sbin + {"loadkmap", loadkmap_main}, #endif -#ifdef BB_LS //bin - {"ls", ls_main}, +#ifdef BB_LS //bin + {"ls", ls_main}, #endif -#ifdef BB_LSMOD //sbin - {"lsmod", lsmod_main}, +#ifdef BB_LSMOD //sbin + {"lsmod", lsmod_main}, #endif -#ifdef BB_MAKEDEVS //sbin - {"makedevs", makedevs_main}, +#ifdef BB_MAKEDEVS //sbin + {"makedevs", makedevs_main}, #endif -#ifdef BB_MATH //usr/bin - {"math", math_main}, +#ifdef BB_MATH //usr/bin + {"math", math_main}, #endif -#ifdef BB_MKDIR //bin - {"mkdir", mkdir_main}, +#ifdef BB_MKDIR //bin + {"mkdir", mkdir_main}, #endif -#ifdef BB_MKFIFO //usr/bin - {"mkfifo", mkfifo_main}, +#ifdef BB_MKFIFO //usr/bin + {"mkfifo", mkfifo_main}, #endif -#ifdef BB_MKNOD //bin - {"mknod", mknod_main}, +#ifdef BB_MKNOD //bin + {"mknod", mknod_main}, #endif -#ifdef BB_MKSWAP //sbin - {"mkswap", mkswap_main}, +#ifdef BB_MKSWAP //sbin + {"mkswap", mkswap_main}, #endif -#ifdef BB_MNC //usr/bin - {"mnc", mnc_main}, +#ifdef BB_MNC //usr/bin + {"mnc", mnc_main}, #endif -#ifdef BB_MORE //bin - {"more", more_main}, +#ifdef BB_MORE //bin + {"more", more_main}, #endif -#ifdef BB_MOUNT //bin - {"mount", mount_main}, +#ifdef BB_MOUNT //bin + {"mount", mount_main}, #endif -#ifdef BB_MT //bin - {"mt", mt_main}, +#ifdef BB_MT //bin + {"mt", mt_main}, #endif -#ifdef BB_NSLOOKUP //usr/bin - {"nslookup", nslookup_main}, +#ifdef BB_NSLOOKUP //usr/bin + {"nslookup", nslookup_main}, #endif -#ifdef BB_PING //bin - {"ping", ping_main}, +#ifdef BB_PING //bin + {"ping", ping_main}, #endif -#ifdef BB_POWEROFF //sbin - {"poweroff", poweroff_main}, +#ifdef BB_POWEROFF //sbin + {"poweroff", poweroff_main}, #endif -#ifdef BB_PRINTF //usr/bin - {"printf", printf_main}, +#ifdef BB_PRINTF //usr/bin + {"printf", printf_main}, #endif -#ifdef BB_PS //bin - {"ps", ps_main}, +#ifdef BB_PS //bin + {"ps", ps_main}, #endif -#ifdef BB_PWD //bin - {"pwd", pwd_main}, +#ifdef BB_PWD //bin + {"pwd", pwd_main}, #endif -#ifdef BB_REBOOT //sbin - {"reboot", reboot_main}, +#ifdef BB_REBOOT //sbin + {"reboot", reboot_main}, #endif -#ifdef BB_RM //bin - {"rm", rm_main}, +#ifdef BB_RM //bin + {"rm", rm_main}, #endif -#ifdef BB_RMDIR //bin - {"rmdir", rmdir_main}, +#ifdef BB_RMDIR //bin + {"rmdir", rmdir_main}, #endif -#ifdef BB_RMMOD //sbin - {"rmmod", rmmod_main}, +#ifdef BB_RMMOD //sbin + {"rmmod", rmmod_main}, #endif -#ifdef BB_SFDISK //sbin - {"fdisk", sfdisk_main}, - {"sfdisk", sfdisk_main}, +#ifdef BB_SFDISK //sbin + {"fdisk", sfdisk_main}, + {"sfdisk", sfdisk_main}, #endif -#ifdef BB_SED //bin - {"sed", sed_main}, +#ifdef BB_SED //bin + {"sed", sed_main}, #endif -#ifdef BB_SLEEP //bin - {"sleep", sleep_main}, +#ifdef BB_SLEEP //bin + {"sleep", sleep_main}, #endif -#ifdef BB_SORT //bin - {"sort", sort_main}, +#ifdef BB_SORT //bin + {"sort", sort_main}, #endif -#ifdef BB_SYNC //bin - {"sync", sync_main}, +#ifdef BB_SYNC //bin + {"sync", sync_main}, #endif -#ifdef BB_SYSLOGD //sbin - {"syslogd", syslogd_main}, +#ifdef BB_SYSLOGD //sbin + {"syslogd", syslogd_main}, #endif -#ifdef BB_LOGGER //usr/bin - {"logger", logger_main}, +#ifdef BB_LOGGER //usr/bin + {"logger", logger_main}, #endif -#ifdef BB_LOGNAME //usr/bin - {"logname", logname_main}, +#ifdef BB_LOGNAME //usr/bin + {"logname", logname_main}, #endif -#ifdef BB_SWAPONOFF //sbin - {"swapon", swap_on_off_main}, - {"swapoff", swap_on_off_main}, +#ifdef BB_SWAPONOFF //sbin + {"swapon", swap_on_off_main}, + {"swapoff", swap_on_off_main}, #endif -#ifdef BB_TAIL //usr/bin - {"tail", tail_main}, +#ifdef BB_TAIL //usr/bin + {"tail", tail_main}, #endif -#ifdef BB_TAR //bin - {"tar", tar_main}, +#ifdef BB_TAR //bin + {"tar", tar_main}, #endif -#ifdef BB_TEE //bin - {"tee", tee_main}, +#ifdef BB_TEE //bin + {"tee", tee_main}, #endif -#ifdef BB_TOUCH //usr/bin - {"touch", touch_main}, +#ifdef BB_TOUCH //usr/bin + {"touch", touch_main}, #endif -#ifdef BB_TRUE_FALSE //bin - {"true", true_main}, - {"false", false_main}, +#ifdef BB_TRUE_FALSE //bin + {"true", true_main}, + {"false", false_main}, #endif -#ifdef BB_TTY //usr/bin - {"tty", tty_main}, +#ifdef BB_TTY //usr/bin + {"tty", tty_main}, #endif -#ifdef BB_UNAME //bin - {"uname", uname_main}, +#ifdef BB_UNAME //bin + {"uname", uname_main}, #endif -#ifdef BB_UMOUNT //bin - {"umount", umount_main}, +#ifdef BB_UMOUNT //bin + {"umount", umount_main}, #endif -#ifdef BB_UNIQ //bin - {"uniq", uniq_main}, +#ifdef BB_UNIQ //bin + {"uniq", uniq_main}, #endif -#ifdef BB_UPDATE //sbin - {"update", update_main}, +#ifdef BB_UPDATE //sbin + {"update", update_main}, #endif -#ifdef BB_WC //usr/bin - {"wc", wc_main}, +#ifdef BB_WC //usr/bin + {"wc", wc_main}, #endif -#ifdef BB_WHOAMI //usr/bin - {"whoami", whoami_main}, +#ifdef BB_WHOAMI //usr/bin + {"whoami", whoami_main}, #endif -#ifdef BB_YES //usr/bin - {"yes", yes_main}, +#ifdef BB_YES //usr/bin + {"yes", yes_main}, #endif -#ifdef BB_GUNZIP //bin - {"zcat", gunzip_main}, - {"gunzip", gunzip_main}, +#ifdef BB_GUNZIP //bin + {"zcat", gunzip_main}, + {"gunzip", gunzip_main}, #endif -#ifdef BB_GZIP //bin - {"gzip", gzip_main}, +#ifdef BB_GZIP //bin + {"gzip", gzip_main}, #endif - {0} + {0} }; int main(int argc, char **argv) { - char *s = argv[0]; - char *name = argv[0]; - const struct Applet *a = applets; + char *s = argv[0]; + char *name = argv[0]; + const struct Applet *a = applets; - while (*s != '\0') { - if (*s++ == '/') - name = s; - } + while (*s != '\0') { + if (*s++ == '/') + name = s; + } - while (a->name != 0) { - if (strcmp(name, a->name) == 0) { - int status; + while (a->name != 0) { + if (strcmp(name, a->name) == 0) { + int status; - status = ((*(a->main)) (argc, argv)); - if (status < 0) { - fprintf(stderr, "%s: %s\n", a->name, strerror(errno)); - } - fprintf(stderr, "\n"); - exit(status); + status = ((*(a->main)) (argc, argv)); + if (status < 0) { + fprintf(stderr, "%s: %s\n", a->name, strerror(errno)); + } + fprintf(stderr, "\n"); + exit(status); + } + a++; } - a++; - } - exit (busybox_main(argc, argv)); + exit(busybox_main(argc, argv)); } int busybox_main(int argc, char **argv) { - int col=0; - argc--; - argv++; + int col = 0; - if (been_there_done_that == 1 || argc < 1) { - const struct Applet *a = applets; - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", - BB_VER, BB_BT); - fprintf(stderr, "Usage: busybox [function] [arguments]...\n"); - fprintf(stderr, " or: [function] [arguments]...\n\n"); - fprintf(stderr, - "\tMost people will create a symlink to busybox for each\n" - "\tfunction name, and busybox will act like whatever you invoke it as.\n"); - fprintf(stderr, "\nCurrently defined functions:\n"); + argc--; + argv++; - while (a->name != 0) { - col+=fprintf(stderr, "%s%s", ((col==0)? "\t":", "), (a++)->name); - if (col>60 && a->name != 0) { - fprintf(stderr, ",\n"); - col=0; - } + if (been_there_done_that == 1 || argc < 1) { + const struct Applet *a = applets; + + fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", + BB_VER, BB_BT); + fprintf(stderr, "Usage: busybox [function] [arguments]...\n"); + fprintf(stderr, " or: [function] [arguments]...\n\n"); + fprintf(stderr, + "\tMost people will create a symlink to busybox for each\n" + "\tfunction name, and busybox will act like whatever you invoke it as.\n"); + fprintf(stderr, "\nCurrently defined functions:\n"); + + while (a->name != 0) { + col += + fprintf(stderr, "%s%s", ((col == 0) ? "\t" : ", "), + (a++)->name); + if (col > 60 && a->name != 0) { + fprintf(stderr, ",\n"); + col = 0; + } + } + fprintf(stderr, "\n\n"); + exit(-1); + } else { + /* If we've already been here once, exit now */ + been_there_done_that = 1; + return (main(argc, argv)); } - fprintf(stderr, "\n\n"); - exit(-1); - } else { - /* If we've already been here once, exit now */ - been_there_done_that = 1; - return (main(argc, argv)); - } } diff --git a/archival/gunzip.c b/archival/gunzip.c index db7fa1dfe..2bc490e3e 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* zcat : stripped version based on gzip sources Sven Rudolph <sr1@inf.tu-dresden.de> */ @@ -8,11 +9,12 @@ #include "messages.c" static const char gunzip_usage[] = - "gunzip [OPTION]... FILE\n\n" - "Uncompress FILE (or standard input if FILE is '-').\n\n" - "Options:\n" - "\t-c\tWrite output to standard output\n" - "\t-t\tTest compressed file integrity\n"; + "gunzip [OPTION]... FILE\n\n" + "Uncompress FILE (or standard input if FILE is '-').\n\n" + "Options:\n" + + "\t-c\tWrite output to standard output\n" + "\t-t\tTest compressed file integrity\n"; /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface * Copyright (C) 1992-1993 Jean-loup Gailly @@ -26,22 +28,23 @@ static const char gunzip_usage[] = */ #if 0 -static char *license_msg[] = { -" Copyright (C) 1992-1993 Jean-loup Gailly", -" 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", -" the Free Software Foundation; either version 2, or (at your option)", -" any later version.", -"", -" This program is distributed in the hope that it will be useful,", -" but WITHOUT ANY WARRANTY; without even the implied warranty of", -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the", -" GNU General Public License for more details.", -"", -" You should have received a copy of the GNU General Public License", -" along with this program; if not, write to the Free Software", -" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.", -0}; +static char *license_msg[] = { + " Copyright (C) 1992-1993 Jean-loup Gailly", + " 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", + " the Free Software Foundation; either version 2, or (at your option)", + " any later version.", + "", + " This program is distributed in the hope that it will be useful,", + " but WITHOUT ANY WARRANTY; without even the implied warranty of", + " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the", + " GNU General Public License for more details.", + "", + " You should have received a copy of the GNU General Public License", + " along with this program; if not, write to the Free Software", + " Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.", + 0 +}; #endif /* Compress files with zip algorithm and 'compress' interface. @@ -67,7 +70,7 @@ static char *license_msg[] = { #include <signal.h> #include <sys/stat.h> #include <errno.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ /* #include "tailor.h" */ @@ -101,9 +104,9 @@ static char *license_msg[] = { #endif #ifdef __STDC__ - typedef void *voidp; +typedef void *voidp; #else - typedef char *voidp; +typedef char *voidp; #endif /* I don't like nested includes, but the string and io functions are used @@ -118,10 +121,10 @@ static char *license_msg[] = { # define memzero(s, n) memset ((voidp)(s), 0, (n)) #else # include <strings.h> -# define strchr index +# define strchr index # define strrchr rindex -# define memcpy(d, s, n) bcopy((s), (d), (n)) -# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) +# define memcpy(d, s, n) bcopy((s), (d), (n)) +# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) # define memzero(s, n) bzero((s), (n)) #endif @@ -131,9 +134,9 @@ static char *license_msg[] = { #define local static -typedef unsigned char uch; +typedef unsigned char uch; typedef unsigned short ush; -typedef unsigned long ulg; +typedef unsigned long ulg; /* Return codes from gzip */ #define OK 0 @@ -143,7 +146,7 @@ typedef unsigned long ulg; /* Compression methods (see algorithm.doc) */ #define DEFLATED 8 -extern int method; /* compression method */ +extern int method; /* compression method */ /* To save memory for 16 bit systems, some arrays are overlaid between * the various modules: @@ -158,29 +161,29 @@ extern int method; /* compression method */ #ifndef INBUFSIZ # ifdef SMALL_MEM -# define INBUFSIZ 0x2000 /* input buffer size */ +# define INBUFSIZ 0x2000 /* input buffer size */ # else -# define INBUFSIZ 0x8000 /* input buffer size */ +# define INBUFSIZ 0x8000 /* input buffer size */ # endif #endif -#define INBUF_EXTRA 64 /* required by unlzw() */ +#define INBUF_EXTRA 64 /* required by unlzw() */ #ifndef OUTBUFSIZ # ifdef SMALL_MEM -# define OUTBUFSIZ 8192 /* output buffer size */ +# define OUTBUFSIZ 8192 /* output buffer size */ # else -# define OUTBUFSIZ 16384 /* output buffer size */ +# define OUTBUFSIZ 16384 /* output buffer size */ # endif #endif -#define OUTBUF_EXTRA 2048 /* required by unlzw() */ +#define OUTBUF_EXTRA 2048 /* required by unlzw() */ #define SMALL_MEM #ifndef DIST_BUFSIZE # ifdef SMALL_MEM -# define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */ +# define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */ # else -# define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */ +# define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */ # endif #endif @@ -201,50 +204,51 @@ extern int method; /* compression method */ # define FREE(array) #endif -EXTERN(uch, inbuf); /* input buffer */ -EXTERN(uch, outbuf); /* output buffer */ -EXTERN(ush, d_buf); /* buffer for distances, see trees.c */ -EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ +EXTERN(uch, inbuf); /* input buffer */ +EXTERN(uch, outbuf); /* output buffer */ +EXTERN(ush, d_buf); /* buffer for distances, see trees.c */ +EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ #define tab_suffix window #ifndef MAXSEG_64K -# define tab_prefix prev /* hash link (see deflate.c) */ -# define head (prev+WSIZE) /* hash head (see deflate.c) */ - EXTERN(ush, tab_prefix); /* prefix code (see unlzw.c) */ +# define tab_prefix prev /* hash link (see deflate.c) */ +# define head (prev+WSIZE) /* hash head (see deflate.c) */ +EXTERN(ush, tab_prefix); /* prefix code (see unlzw.c) */ #else # define tab_prefix0 prev # define head tab_prefix1 - EXTERN(ush, tab_prefix0); /* prefix for even codes */ - EXTERN(ush, tab_prefix1); /* prefix for odd codes */ +EXTERN(ush, tab_prefix0); /* prefix for even codes */ +EXTERN(ush, tab_prefix1); /* prefix for odd codes */ #endif -extern unsigned insize; /* valid bytes in inbuf */ -extern unsigned inptr; /* index of next byte to be processed in inbuf */ -extern unsigned outcnt; /* bytes in output buffer */ +extern unsigned insize; /* valid bytes in inbuf */ +extern unsigned inptr; /* index of next byte to be processed in inbuf */ +extern unsigned outcnt; /* bytes in output buffer */ + +extern long bytes_in; /* number of input bytes */ +extern long bytes_out; /* number of output bytes */ +extern long header_bytes; /* number of bytes in gzip header */ -extern long bytes_in; /* number of input bytes */ -extern long bytes_out; /* number of output bytes */ -extern long header_bytes;/* number of bytes in gzip header */ +extern long ifile_size; /* input file size, -1 for devices (debug only) */ -extern long ifile_size; /* input file size, -1 for devices (debug only) */ +typedef int file_t; /* Do not use stdio */ -typedef int file_t; /* Do not use stdio */ -#define NO_FILE (-1) /* in memory compression */ +#define NO_FILE (-1) /* in memory compression */ -#define GZIP_MAGIC "\037\213" /* Magic header for gzip files, 1F 8B */ +#define GZIP_MAGIC "\037\213" /* Magic header for gzip files, 1F 8B */ /* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ -#define RESERVED 0xC0 /* bit 6,7: reserved */ +#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ +#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ +#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ +#define COMMENT 0x10 /* bit 4 set: file comment present */ +#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ +#define RESERVED 0xC0 /* bit 6,7: reserved */ #ifndef WSIZE -# define WSIZE 0x8000 /* window size--must be a power of two, and */ -#endif /* at least 32K for zip's deflate method */ +# define WSIZE 0x8000 /* window size--must be a power of two, and */ +#endif /* at least 32K for zip's deflate method */ #define MIN_MATCH 3 #define MAX_MATCH 258 @@ -260,11 +264,11 @@ typedef int file_t; /* Do not use stdio */ * distances are limited to MAX_DIST instead of WSIZE. */ -extern int exit_code; /* program exit code */ -extern int verbose; /* be verbose (-v) */ -extern int level; /* compression level */ -extern int test; /* check .z file integrity */ -extern int save_orig_name; /* set if original name must be saved */ +extern int exit_code; /* program exit code */ +extern int verbose; /* be verbose (-v) */ +extern int level; /* compression level */ +extern int test; /* check .z file integrity */ +extern int save_orig_name; /* set if original name must be saved */ #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) @@ -296,10 +300,10 @@ extern int save_orig_name; /* set if original name must be saved */ put_short(((ulg)(n)) >> 16); \ } -#define seekable() 0 /* force sequential output */ -#define translate_eol 0 /* no option -a yet */ +#define seekable() 0 /* force sequential output */ +#define translate_eol 0 /* no option -a yet */ -#define tolow(c) (isupper(c) ? (c)-'A'+'a' : (c)) /* force to lower case */ +#define tolow(c) (isupper(c) ? (c)-'A'+'a' : (c)) /* force to lower case */ /* Macros for getting two-byte and four-byte header values */ #define SH(p) ((ush)(uch)((p)[0]) | ((ush)(uch)((p)[1]) << 8)) @@ -329,43 +333,44 @@ extern int save_orig_name; /* set if original name must be saved */ /* in unzip.c */ -extern int unzip OF((int in, int out)); +extern int unzip OF((int in, int out)); /* in gzip.c */ RETSIGTYPE abort_gzip OF((void)); - /* in deflate.c */ -void lm_init OF((int pack_level, ush *flags)); -ulg deflate OF((void)); + /* in deflate.c */ +void lm_init OF((int pack_level, ush * flags)); +ulg deflate OF((void)); - /* in trees.c */ -void ct_init OF((ush *attr, int *method)); -int ct_tally OF((int dist, int lc)); -ulg flush_block OF((char *buf, ulg stored_len, int eof)); + /* in trees.c */ +void ct_init OF((ush * attr, int *method)); +int ct_tally OF((int dist, int lc)); +ulg flush_block OF((char *buf, ulg stored_len, int eof)); - /* in bits.c */ -void bi_init OF((file_t zipfile)); -void send_bits OF((int value, int length)); + /* in bits.c */ +void bi_init OF((file_t zipfile)); +void send_bits OF((int value, int length)); unsigned bi_reverse OF((unsigned value, int length)); -void bi_windup OF((void)); -void copy_block OF((char *buf, unsigned len, int header)); -extern int (*read_buf) OF((char *buf, unsigned size)); +void bi_windup OF((void)); +void copy_block OF((char *buf, unsigned len, int header)); +extern int (*read_buf) OF((char *buf, unsigned size)); /* in util.c: */ -extern int copy OF((int in, int out)); -extern ulg updcrc OF((uch *s, unsigned n)); -extern void clear_bufs OF((void)); -extern int fill_inbuf OF((int eof_ok)); -extern void flush_outbuf OF((void)); -extern void flush_window OF((void)); -extern void write_buf OF((int fd, voidp buf, unsigned cnt)); +extern int copy OF((int in, int out)); +extern ulg updcrc OF((uch * s, unsigned n)); +extern void clear_bufs OF((void)); +extern int fill_inbuf OF((int eof_ok)); +extern void flush_outbuf OF((void)); +extern void flush_window OF((void)); +extern void write_buf OF((int fd, voidp buf, unsigned cnt)); + #ifndef __linux__ -extern char *basename OF((char *fname)); -#endif /* not __linux__ */ -extern void error OF((char *m)); -extern void warn OF((char *a, char *b)); -extern void read_error OF((void)); -extern void write_error OF((void)); +extern char *basename OF((char *fname)); +#endif /* not __linux__ */ +extern void error OF((char *m)); +extern void warn OF((char *a, char *b)); +extern void read_error OF((void)); +extern void write_error OF((void)); /* in inflate.c */ extern int inflate OF((void)); @@ -385,11 +390,11 @@ extern int inflate OF((void)); #ifndef BITS # define BITS 16 #endif -#define INIT_BITS 9 /* Initial number of bits per code */ +#define INIT_BITS 9 /* Initial number of bits per code */ -#define LZW_MAGIC "\037\235" /* Magic header for lzw files, 1F 9D */ +#define LZW_MAGIC "\037\235" /* Magic header for lzw files, 1F 9D */ -#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ +#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ /* Mask 0x20 is reserved to mean a fourth header byte, and 0x40 is free. * It's a pity that old uncompress does not check bit 0x20. That makes * extension of the format actually undesirable because old compress @@ -404,16 +409,16 @@ extern int inflate OF((void)); * clear the dictionary. */ -#define LZW_RESERVED 0x60 /* reserved bits */ +#define LZW_RESERVED 0x60 /* reserved bits */ -#define CLEAR 256 /* flush the dictionary */ -#define FIRST (CLEAR+1) /* first free entry */ +#define CLEAR 256 /* flush the dictionary */ +#define FIRST (CLEAR+1) /* first free entry */ -extern int maxbits; /* max bits per code for LZW */ -extern int block_mode; /* block compress mode -C compatible with 2.0 */ +extern int maxbits; /* max bits per code for LZW */ +extern int block_mode; /* block compress mode -C compatible with 2.0 */ -extern int lzw OF((int in, int out)); -extern int unlzw OF((int in, int out)); +extern int lzw OF((int in, int out)); +extern int unlzw OF((int in, int out)); /* #include "revision.h" */ @@ -458,14 +463,12 @@ extern int unlzw OF((int in, int out)); #ifdef __cplusplus extern "C" { #endif - /* For communication from `getopt' to the caller. When `getopt' finds an option that takes an argument, the argument value is returned here. Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ - -extern char *optarg; + extern char *optarg; /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller @@ -479,16 +482,16 @@ extern char *optarg; Otherwise, `optind' communicates from one call to the next how much of ARGV has been scanned so far. */ -extern int optind; + extern int optind; /* Callers store zero here to inhibit the error message `getopt' prints for unrecognized options. */ -extern int opterr; + extern int opterr; /* Set to an option character which was unrecognized. */ -extern int optopt; + extern int optopt; /* Describe the long-named options requested by the application. The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector @@ -511,19 +514,18 @@ extern int optopt; one). For long options that have a zero `flag' field, `getopt' returns the contents of the `val' field. */ -struct option -{ + struct option { #if __STDC__ - const char *name; + const char *name; #else - char *name; + char *name; #endif - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; + }; /* Names for the values of the `has_arg' field of `struct option'. */ @@ -536,60 +538,61 @@ struct option /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ -extern int getopt (int argc, char *const *argv, const char *shortopts); -#endif /* not __GNU_LIBRARY__ */ -extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); -extern int getopt_long_only (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind); + extern int getopt(int argc, char *const *argv, const char *shortopts); +#endif /* not __GNU_LIBRARY__ */ + extern int getopt_long(int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, int *longind); + extern int getopt_long_only(int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, + int *longind); /* Internal only. Users should not call this directly. */ -extern int _getopt_internal (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind, - int long_only); -#else /* not __STDC__ */ -extern int getopt (); -extern int getopt_long (); -extern int getopt_long_only (); - -extern int _getopt_internal (); -#endif /* not __STDC__ */ + extern int _getopt_internal(int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, + int *longind, int long_only); +#else /* not __STDC__ */ + extern int getopt(); + extern int getopt_long(); + extern int getopt_long_only(); + + extern int _getopt_internal(); +#endif /* not __STDC__ */ #ifdef __cplusplus } #endif - -#endif /* _GETOPT_H */ - - +#endif /* _GETOPT_H */ #include <time.h> #include <fcntl.h> #include <unistd.h> - #include <stdlib.h> - #if defined(DIRENT) # include <dirent.h> - typedef struct dirent dir_type; +typedef struct dirent dir_type; + # define NLENGTH(dirent) ((int)strlen((dirent)->d_name)) # define DIR_OPT "DIRENT" #else # define NLENGTH(dirent) ((dirent)->d_namlen) # ifdef SYSDIR # include <sys/dir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "SYSDIR" # else # ifdef SYSNDIR # include <sys/ndir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "SYSNDIR" # else # ifdef NDIR # include <ndir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "NDIR" # else # define NO_DIR @@ -598,18 +601,16 @@ extern int _getopt_internal (); # endif # endif #endif - #if !defined(S_ISDIR) && defined(S_IFDIR) # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif #if !defined(S_ISREG) && defined(S_IFREG) # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif - -typedef RETSIGTYPE (*sig_type) OF((int)); +typedef RETSIGTYPE(*sig_type) OF((int)); #ifndef O_BINARY -# define O_BINARY 0 /* creation mode for open() */ +# define O_BINARY 0 /* creation mode for open() */ #endif #ifndef O_CREAT @@ -629,9 +630,9 @@ typedef RETSIGTYPE (*sig_type) OF((int)); #ifndef S_IWUSR # define S_IWUSR 0200 #endif -#define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ +#define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ -#ifndef MAX_PATH_LEN /* max pathname length */ +#ifndef MAX_PATH_LEN /* max pathname length */ # ifdef PATH_MAX # define MAX_PATH_LEN PATH_MAX # else @@ -644,224 +645,224 @@ typedef RETSIGTYPE (*sig_type) OF((int)); #endif #ifdef NO_OFF_T - typedef long off_t; - off_t lseek OF((int fd, off_t offset, int whence)); +typedef long off_t; +off_t lseek OF((int fd, off_t offset, int whence)); #endif /* global buffers */ -DECLARE(uch, inbuf, INBUFSIZ +INBUF_EXTRA); -DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); -DECLARE(ush, d_buf, DIST_BUFSIZE); -DECLARE(uch, window, 2L*WSIZE); +DECLARE(uch, inbuf, INBUFSIZ + INBUF_EXTRA); +DECLARE(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); +DECLARE(ush, d_buf, DIST_BUFSIZE); +DECLARE(uch, window, 2L * WSIZE); #ifndef MAXSEG_64K - DECLARE(ush, tab_prefix, 1L<<BITS); +DECLARE(ush, tab_prefix, 1L << BITS); #else - DECLARE(ush, tab_prefix0, 1L<<(BITS-1)); - DECLARE(ush, tab_prefix1, 1L<<(BITS-1)); +DECLARE(ush, tab_prefix0, 1L << (BITS - 1)); +DECLARE(ush, tab_prefix1, 1L << (BITS - 1)); #endif /* local variables */ -int test_mode = 0; /* check file integrity option */ -int foreground; /* set if program run in foreground */ -int maxbits = BITS; /* max bits per code for LZW */ -int method = DEFLATED;/* compression method */ -int exit_code = OK; /* program exit code */ -int last_member; /* set for .zip and .Z files */ -int part_nb; /* number of parts in .gz file */ -long ifile_size; /* input file size, -1 for devices (debug only) */ - -long bytes_in; /* number of input bytes */ -long bytes_out; /* number of output bytes */ -long total_in = 0; /* input bytes for all files */ -long total_out = 0; /* output bytes for all files */ -struct stat istat; /* status for input file */ -int ifd; /* input file descriptor */ -int ofd; /* output file descriptor */ -unsigned insize; /* valid bytes in inbuf */ -unsigned inptr; /* index of next byte to be processed in inbuf */ -unsigned outcnt; /* bytes in output buffer */ - -long header_bytes; /* number of bytes in gzip header */ +int test_mode = 0; /* check file integrity option */ +int foreground; /* set if program run in foreground */ +int maxbits = BITS; /* max bits per code for LZW */ +int method = DEFLATED; /* compression method */ +int exit_code = OK; /* program exit code */ +int last_member; /* set for .zip and .Z files */ +int part_nb; /* number of parts in .gz file */ +long ifile_size; /* input file size, -1 for devices (debug only) */ + +long bytes_in; /* number of input bytes */ +long bytes_out; /* number of output bytes */ +long total_in = 0; /* input bytes for all files */ +long total_out = 0; /* output bytes for all files */ +struct stat istat; /* status for input file */ +int ifd; /* input file descriptor */ +int ofd; /* output file descriptor */ +unsigned insize; /* valid bytes in inbuf */ +unsigned inptr; /* index of next byte to be processed in inbuf */ +unsigned outcnt; /* bytes in output buffer */ + +long header_bytes; /* number of bytes in gzip header */ /* local functions */ -local int get_method OF((int in)); +local int get_method OF((int in)); #define strequ(s1, s2) (strcmp((s1),(s2)) == 0) /* ======================================================================== */ -int gunzip_main (int argc, char** argv) +int gunzip_main(int argc, char **argv) { - int file_count; /* number of files to precess */ - int to_stdout = 0; - int fromstdin = 0; - int result; - int inFileNum; - int outFileNum; - int delInputFile=0; - struct stat statBuf; - char* delFileName; - char ifname[MAX_PATH_LEN + 1]; /* input file name */ - char ofname[MAX_PATH_LEN + 1]; /* output file name */ - - if (argc==1) - usage(gunzip_usage); - - if (strcmp(*argv, "zcat")==0) - to_stdout = 1; - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv)+1) == '\0') { - fromstdin = 1; - to_stdout = 1; - } - while (*(++(*argv))) { - switch (**argv) { - case 'c': + int file_count; /* number of files to precess */ + int to_stdout = 0; + int fromstdin = 0; + int result; + int inFileNum; + int outFileNum; + int delInputFile = 0; + struct stat statBuf; + char *delFileName; + char ifname[MAX_PATH_LEN + 1]; /* input file name */ + char ofname[MAX_PATH_LEN + 1]; /* output file name */ + + if (argc == 1) + usage(gunzip_usage); + + if (strcmp(*argv, "zcat") == 0) to_stdout = 1; - break; - case 't': - test_mode = 1; - break; - default: - usage(gunzip_usage); - } + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + if (*((*argv) + 1) == '\0') { + fromstdin = 1; + to_stdout = 1; + } + while (*(++(*argv))) { + switch (**argv) { + case 'c': + to_stdout = 1; + break; + case 't': + test_mode = 1; + break; + + default: + usage(gunzip_usage); + } + } } - } - foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; - if (foreground) { - (void) signal (SIGINT, (sig_type)abort_gzip); - } + foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; + if (foreground) { + (void) signal(SIGINT, (sig_type) abort_gzip); + } #ifdef SIGTERM - if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { - (void) signal(SIGTERM, (sig_type)abort_gzip); - } + if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { + (void) signal(SIGTERM, (sig_type) abort_gzip); + } #endif #ifdef SIGHUP - if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { - (void) signal(SIGHUP, (sig_type)abort_gzip); - } + if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { + (void) signal(SIGHUP, (sig_type) abort_gzip); + } #endif - file_count = argc - optind; + file_count = argc - optind; - /* Allocate all global buffers (for DYN_ALLOC option) */ - ALLOC(uch, inbuf, INBUFSIZ +INBUF_EXTRA); - ALLOC(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); - ALLOC(ush, d_buf, DIST_BUFSIZE); - ALLOC(uch, window, 2L*WSIZE); + /* Allocate all global buffers (for DYN_ALLOC option) */ + ALLOC(uch, inbuf, INBUFSIZ + INBUF_EXTRA); + ALLOC(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); + ALLOC(ush, d_buf, DIST_BUFSIZE); + ALLOC(uch, window, 2L * WSIZE); #ifndef MAXSEG_64K - ALLOC(ush, tab_prefix, 1L<<BITS); + ALLOC(ush, tab_prefix, 1L << BITS); #else - ALLOC(ush, tab_prefix0, 1L<<(BITS-1)); - ALLOC(ush, tab_prefix1, 1L<<(BITS-1)); + ALLOC(ush, tab_prefix0, 1L << (BITS - 1)); + ALLOC(ush, tab_prefix1, 1L << (BITS - 1)); #endif - if (fromstdin==1) { - strcpy(ofname, "stdin"); - - inFileNum=fileno(stdin); - ifile_size = -1L; /* convention for unknown size */ - } else { - /* Open up the input file */ - if (*argv=='\0') - usage(gunzip_usage); - if (strlen(*argv) > MAX_PATH_LEN) { - fprintf(stderr, name_too_long, "gunzip"); - do_exit(WARNING); - } - strcpy(ifname, *argv); + if (fromstdin == 1) { + strcpy(ofname, "stdin"); - /* Open input fille */ - inFileNum=open( ifname, O_RDONLY); - if (inFileNum < 0) { - perror(ifname); - do_exit(WARNING); - } - /* Get the time stamp on the input file. */ - result = stat(ifname, &statBuf); - if (result < 0) { - perror(ifname); - do_exit(WARNING); - } - ifile_size = statBuf.st_size; - } - - if (to_stdout==1) { - /* And get to work */ - strcpy(ofname, "stdout"); - outFileNum=fileno(stdout); - - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; - - /* Actually do the compression/decompression. */ - unzip(inFileNum, outFileNum); - - } else if (test_mode) { - /* Actually do the compression/decompression. */ - unzip(inFileNum, 2); - } else { - char* pos; - - /* And get to work */ - if (strlen(ifname) > MAX_PATH_LEN - 4) { - fprintf(stderr, name_too_long, "gunzip"); - do_exit(WARNING); - } - strcpy(ofname, ifname); - pos=strstr(ofname, ".gz"); - if (pos != NULL) { - *pos='\0'; - delInputFile=1; + inFileNum = fileno(stdin); + ifile_size = -1L; /* convention for unknown size */ } else { - pos=strstr(ofname, ".tgz"); - if (pos != NULL) { - *pos='\0'; - strcat( pos, ".tar"); - delInputFile=1; - } + /* Open up the input file */ + if (*argv == '\0') + usage(gunzip_usage); + if (strlen(*argv) > MAX_PATH_LEN) { + fprintf(stderr, name_too_long, "gunzip"); + do_exit(WARNING); + } + strcpy(ifname, *argv); + + /* Open input fille */ + inFileNum = open(ifname, O_RDONLY); + if (inFileNum < 0) { + perror(ifname); + do_exit(WARNING); + } + /* Get the time stamp on the input file. */ + result = stat(ifname, &statBuf); + if (result < 0) { + perror(ifname); + do_exit(WARNING); + } + ifile_size = statBuf.st_size; } - /* Open output fille */ + if (to_stdout == 1) { + /* And get to work */ + strcpy(ofname, "stdout"); + outFileNum = fileno(stdout); + + clear_bufs(); /* clear input and output buffers */ + part_nb = 0; + + /* Actually do the compression/decompression. */ + unzip(inFileNum, outFileNum); + + } else if (test_mode) { + /* Actually do the compression/decompression. */ + unzip(inFileNum, 2); + } else { + char *pos; + + /* And get to work */ + if (strlen(ifname) > MAX_PATH_LEN - 4) { + fprintf(stderr, name_too_long, "gunzip"); + do_exit(WARNING); + } + strcpy(ofname, ifname); + pos = strstr(ofname, ".gz"); + if (pos != NULL) { + *pos = '\0'; + delInputFile = 1; + } else { + pos = strstr(ofname, ".tgz"); + if (pos != NULL) { + *pos = '\0'; + strcat(pos, ".tar"); + delInputFile = 1; + } + } + + /* Open output fille */ #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW); + outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW); #else - outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL); + outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL); #endif - if (outFileNum < 0) { - perror(ofname); - do_exit(WARNING); - } - /* Set permissions on the file */ - fchmod(outFileNum, statBuf.st_mode); - - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; - - /* Actually do the compression/decompression. */ - result=unzip(inFileNum, outFileNum); - - close( outFileNum); - close( inFileNum); - /* Delete the original file */ - if (result == OK) - delFileName=ifname; - else - delFileName=ofname; - - if (delInputFile == 1 && unlink (delFileName) < 0) { - perror (delFileName); - exit( FALSE); + if (outFileNum < 0) { + perror(ofname); + do_exit(WARNING); + } + /* Set permissions on the file */ + fchmod(outFileNum, statBuf.st_mode); + + clear_bufs(); /* clear input and output buffers */ + part_nb = 0; + + /* Actually do the compression/decompression. */ + result = unzip(inFileNum, outFileNum); + + close(outFileNum); + close(inFileNum); + /* Delete the original file */ + if (result == OK) + delFileName = ifname; + else + delFileName = ofname; + + if (delInputFile == 1 && unlink(delFileName) < 0) { + perror(delFileName); + exit(FALSE); + } } - } - do_exit(exit_code); + do_exit(exit_code); } @@ -877,71 +878,76 @@ int gunzip_main (int argc, char** argv) * If the member is a zip file, it must be the only one. */ local int get_method(in) - int in; /* input file descriptor */ +int in; /* input file descriptor */ { - uch flags; /* compression flags */ - char magic[2]; /* magic header */ - - magic[0] = (char)get_byte(); - magic[1] = (char)get_byte(); - method = -1; /* unknown yet */ - part_nb++; /* number of parts in gzip file */ - header_bytes = 0; - last_member = RECORD_IO; - /* assume multiple members in gzip file except for record oriented I/O */ - - if (memcmp(magic, GZIP_MAGIC, 2) == 0) { - - method = (int)get_byte(); - if (method != DEFLATED) { - fprintf(stderr, - "unknown method %d -- get newer version of gzip\n", - method); - exit_code = ERROR; - return -1; - } - flags = (uch)get_byte(); - - (ulg)get_byte(); /* Ignore time stamp */ - (ulg)get_byte(); - (ulg)get_byte(); - (ulg)get_byte(); + uch flags; /* compression flags */ + char magic[2]; /* magic header */ + + magic[0] = (char) get_byte(); + magic[1] = (char) get_byte(); + method = -1; /* unknown yet */ + part_nb++; /* number of parts in gzip file */ + header_bytes = 0; + last_member = RECORD_IO; + /* assume multiple members in gzip file except for record oriented I/O */ + + if (memcmp(magic, GZIP_MAGIC, 2) == 0) { + + method = (int) get_byte(); + if (method != DEFLATED) { + fprintf(stderr, + "unknown method %d -- get newer version of gzip\n", + method); + exit_code = ERROR; + return -1; + } + flags = (uch) get_byte(); + + (ulg) get_byte(); /* Ignore time stamp */ + (ulg) get_byte(); + (ulg) get_byte(); + (ulg) get_byte(); + + (void) get_byte(); /* Ignore extra flags for the moment */ + (void) get_byte(); /* Ignore OS type for the moment */ + + if ((flags & EXTRA_FIELD) != 0) { + unsigned len = (unsigned) get_byte(); + + len |= ((unsigned) get_byte()) << 8; + + while (len--) + (void) get_byte(); + } + + /* Discard original name if any */ + if ((flags & ORIG_NAME) != 0) { + while (get_char() != 0) /* null */ + ; + } + + /* Discard file comment if any */ + if ((flags & COMMENT) != 0) { + while (get_char() != 0) /* null */ + ; + } + if (part_nb == 1) { + header_bytes = inptr + 2 * sizeof(long); /* include crc and size */ + } - (void)get_byte(); /* Ignore extra flags for the moment */ - (void)get_byte(); /* Ignore OS type for the moment */ - - if ((flags & EXTRA_FIELD) != 0) { - unsigned len = (unsigned)get_byte(); - len |= ((unsigned)get_byte())<<8; - - while (len--) (void)get_byte(); } - /* Discard original name if any */ - if ((flags & ORIG_NAME) != 0) { - while (get_char() != 0) /* null */ ; - } + if (method >= 0) + return method; - /* Discard file comment if any */ - if ((flags & COMMENT) != 0) { - while (get_char() != 0) /* null */ ; - } if (part_nb == 1) { - header_bytes = inptr + 2*sizeof(long); /* include crc and size */ + fprintf(stderr, "\nnot in gzip format\n"); + exit_code = ERROR; + return -1; + } else { + WARN((stderr, "\ndecompression OK, trailing garbage ignored\n")); + return -2; } - - } - - if (method >= 0) return method; - - if (part_nb == 1) { - fprintf(stderr, "\nnot in gzip format\n"); - exit_code = ERROR; - return -1; - } else { - WARN((stderr, "\ndecompression OK, trailing garbage ignored\n")); - return -2; - } } /* ======================================================================== @@ -949,8 +955,9 @@ local int get_method(in) */ RETSIGTYPE abort_gzip() { - do_exit(ERROR); + do_exit(ERROR); } + /* unzip.c -- decompress files in gzip or pkzip format. * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the @@ -973,35 +980,35 @@ RETSIGTYPE abort_gzip() */ #ifdef CRYPT -# undef CRYPT /* dummy version */ +# undef CRYPT /* dummy version */ #endif -#define RAND_HEAD_LEN 12 /* length of encryption random header */ +#define RAND_HEAD_LEN 12 /* length of encryption random header */ #define zencode #define zdecode /* PKZIP header definitions */ -#define LOCSIG 0x04034b50L /* four-byte lead-in (lsb first) */ -#define LOCFLG 6 /* offset of bit flag */ -#define CRPFLG 1 /* bit for encrypted entry */ -#define EXTFLG 8 /* bit for extended local header */ -#define LOCHOW 8 /* offset of compression method */ -#define LOCTIM 10 /* file mod time (for decryption) */ -#define LOCCRC 14 /* offset of crc */ -#define LOCSIZ 18 /* offset of compressed size */ -#define LOCLEN 22 /* offset of uncompressed length */ -#define LOCFIL 26 /* offset of file name field length */ -#define LOCEXT 28 /* offset of extra field length */ -#define LOCHDR 30 /* size of local header, including sig */ -#define EXTHDR 16 /* size of extended local header, inc sig */ +#define LOCSIG 0x04034b50L /* four-byte lead-in (lsb first) */ +#define LOCFLG 6 /* offset of bit flag */ +#define CRPFLG 1 /* bit for encrypted entry */ +#define EXTFLG 8 /* bit for extended local header */ +#define LOCHOW 8 /* offset of compression method */ +#define LOCTIM 10 /* file mod time (for decryption) */ +#define LOCCRC 14 /* offset of crc */ +#define LOCSIZ 18 /* offset of compressed size */ +#define LOCLEN 22 /* offset of uncompressed length */ +#define LOCFIL 26 /* offset of file name field length */ +#define LOCEXT 28 /* offset of extra field length */ +#define LOCHDR 30 /* size of local header, including sig */ +#define EXTHDR 16 /* size of extended local header, inc sig */ /* Globals */ -char *key; /* not used--needed to link crypt.c */ -int pkzip = 0; /* set for a pkzip file */ -int ext_header = 0; /* set if extended local header */ +char *key; /* not used--needed to link crypt.c */ +int pkzip = 0; /* set for a pkzip file */ +int ext_header = 0; /* set if extended local header */ /* =========================================================================== * Unzip in to out. This routine works on both gzip and pkzip files. @@ -1011,81 +1018,82 @@ int ext_header = 0; /* set if extended local header */ * The magic header has already been checked. The output buffer is cleared. */ int unzip(in, out) - int in, out; /* input and output file descriptors */ +int in, out; /* input and output file descriptors */ { - ulg orig_crc = 0; /* original crc */ - ulg orig_len = 0; /* original uncompressed length */ - int n; - uch buf[EXTHDR]; /* extended local header */ - - ifd = in; - ofd = out; - method = get_method(ifd); - if (method < 0) { - do_exit(exit_code); /* error message already emitted */ - } - - updcrc(NULL, 0); /* initialize crc */ - - if (pkzip && !ext_header) { /* crc and length at the end otherwise */ - orig_crc = LG(inbuf + LOCCRC); - orig_len = LG(inbuf + LOCLEN); - } - - /* Decompress */ - if (method == DEFLATED) { - - int res = inflate(); - - if (res == 3) { - error("out of memory"); - } else if (res != 0) { - error("invalid compressed data--format violated"); + ulg orig_crc = 0; /* original crc */ + ulg orig_len = 0; /* original uncompressed length */ + int n; + uch buf[EXTHDR]; /* extended local header */ + + ifd = in; + ofd = out; + method = get_method(ifd); + if (method < 0) { + do_exit(exit_code); /* error message already emitted */ } - } else { - error("internal error, invalid method"); - } - - /* Get the crc and original length */ - if (!pkzip) { - /* crc32 (see algorithm.doc) - * uncompressed input size modulo 2^32 - */ - for (n = 0; n < 8; n++) { - buf[n] = (uch)get_byte(); /* may cause an error if EOF */ + updcrc(NULL, 0); /* initialize crc */ + + if (pkzip && !ext_header) { /* crc and length at the end otherwise */ + orig_crc = LG(inbuf + LOCCRC); + orig_len = LG(inbuf + LOCLEN); } - orig_crc = LG(buf); - orig_len = LG(buf+4); - - } else if (ext_header) { /* If extended header, check it */ - /* signature - 4bytes: 0x50 0x4b 0x07 0x08 - * CRC-32 value - * compressed size 4-bytes - * uncompressed size 4-bytes - */ - for (n = 0; n < EXTHDR; n++) { - buf[n] = (uch)get_byte(); /* may cause an error if EOF */ + + /* Decompress */ + if (method == DEFLATED) { + + int res = inflate(); + + if (res == 3) { + error("out of memory"); + } else if (res != 0) { + error("invalid compressed data--format violated"); + } + + } else { + error("internal error, invalid method"); + } + + /* Get the crc and original length */ + if (!pkzip) { + /* crc32 (see algorithm.doc) + * uncompressed input size modulo 2^32 + */ + for (n = 0; n < 8; n++) { + buf[n] = (uch) get_byte(); /* may cause an error if EOF */ + } + orig_crc = LG(buf); + orig_len = LG(buf + 4); + + } else if (ext_header) { /* If extended header, check it */ + /* signature - 4bytes: 0x50 0x4b 0x07 0x08 + * CRC-32 value + * compressed size 4-bytes + * uncompressed size 4-bytes + */ + for (n = 0; n < EXTHDR; n++) { + buf[n] = (uch) get_byte(); /* may cause an error if EOF */ + } + orig_crc = LG(buf + 4); + orig_len = LG(buf + 12); + } + + /* Validate decompression */ + if (orig_crc != updcrc(outbuf, 0)) { + error("invalid compressed data--crc error"); } - orig_crc = LG(buf+4); - orig_len = LG(buf+12); - } - - /* Validate decompression */ - if (orig_crc != updcrc(outbuf, 0)) { - error("invalid compressed data--crc error"); - } - if (orig_len != (ulg)bytes_out) { - error("invalid compressed data--length error"); - } - - /* Check if there are more entries in a pkzip file */ - if (pkzip && inptr + 4 < insize && LG(inbuf+inptr) == LOCSIG) { - WARN((stderr,"has more than one entry--rest ignored\n")); - } - ext_header = pkzip = 0; /* for next file */ - return OK; + if (orig_len != (ulg) bytes_out) { + error("invalid compressed data--length error"); + } + + /* Check if there are more entries in a pkzip file */ + if (pkzip && inptr + 4 < insize && LG(inbuf + inptr) == LOCSIG) { + WARN((stderr, "has more than one entry--rest ignored\n")); + } + ext_header = pkzip = 0; /* for next file */ + return OK; } + /* util.c -- utility functions for gzip support * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the @@ -1106,10 +1114,10 @@ int unzip(in, out) #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) # include <stdlib.h> #else - extern int errno; +extern int errno; #endif -static const ulg crc_32_tab[]; /* crc table, defined below */ +static const ulg crc_32_tab[]; /* crc table, defined below */ /* =========================================================================== * Run a set of bytes through the crc shift register. If s is a NULL @@ -1117,23 +1125,24 @@ static const ulg crc_32_tab[]; /* crc table, defined below */ * Return the current crc in either case. */ ulg updcrc(s, n) - uch *s; /* pointer to bytes to pump through */ - unsigned n; /* number of bytes in s[] */ +uch *s; /* pointer to bytes to pump through */ +unsigned n; /* number of bytes in s[] */ { - register ulg c; /* temporary variable */ - - static ulg crc = (ulg)0xffffffffL; /* shift register contents */ - - if (s == NULL) { - c = 0xffffffffL; - } else { - c = crc; - if (n) do { - c = crc_32_tab[((int)c ^ (*s++)) & 0xff] ^ (c >> 8); - } while (--n); - } - crc = c; - return c ^ 0xffffffffL; /* (instead of ~c for 64-bit machines) */ + register ulg c; /* temporary variable */ + + static ulg crc = (ulg) 0xffffffffL; /* shift register contents */ + + if (s == NULL) { + c = 0xffffffffL; + } else { + c = crc; + if (n) + do { + c = crc_32_tab[((int) c ^ (*s++)) & 0xff] ^ (c >> 8); + } while (--n); + } + crc = c; + return c ^ 0xffffffffL; /* (instead of ~c for 64-bit machines) */ } /* =========================================================================== @@ -1141,35 +1150,37 @@ ulg updcrc(s, n) */ void clear_bufs() { - outcnt = 0; - insize = inptr = 0; - bytes_in = bytes_out = 0L; + outcnt = 0; + insize = inptr = 0; + bytes_in = bytes_out = 0L; } /* =========================================================================== * Fill the input buffer. This is called only when the buffer is empty. */ int fill_inbuf(eof_ok) - int eof_ok; /* set if EOF acceptable as a result */ +int eof_ok; /* set if EOF acceptable as a result */ { - int len; - - /* Read as much as possible */ - insize = 0; - errno = 0; - do { - len = read(ifd, (char*)inbuf+insize, INBUFSIZ-insize); - if (len == 0 || len == EOF) break; - insize += len; - } while (insize < INBUFSIZ); - - if (insize == 0) { - if (eof_ok) return EOF; - read_error(); - } - bytes_in += (ulg)insize; - inptr = 1; - return inbuf[0]; + int len; + + /* Read as much as possible */ + insize = 0; + errno = 0; + do { + len = read(ifd, (char *) inbuf + insize, INBUFSIZ - insize); + if (len == 0 || len == EOF) + break; + insize += len; + } while (insize < INBUFSIZ); + + if (insize == 0) { + if (eof_ok) + return EOF; + read_error(); + } + bytes_in += (ulg) insize; + inptr = 1; + return inbuf[0]; } /* =========================================================================== @@ -1178,12 +1189,13 @@ int fill_inbuf(eof_ok) */ void flush_outbuf() { - if (outcnt == 0) return; + if (outcnt == 0) + return; - if (!test_mode) - write_buf(ofd, (char *)outbuf, outcnt); - bytes_out += (ulg)outcnt; - outcnt = 0; + if (!test_mode) + write_buf(ofd, (char *) outbuf, outcnt); + bytes_out += (ulg) outcnt; + outcnt = 0; } /* =========================================================================== @@ -1192,13 +1204,14 @@ void flush_outbuf() */ void flush_window() { - if (outcnt == 0) return; - updcrc(window, outcnt); - - if (!test_mode) - write_buf(ofd, (char *)window, outcnt); - bytes_out += (ulg)outcnt; - outcnt = 0; + if (outcnt == 0) + return; + updcrc(window, outcnt); + + if (!test_mode) + write_buf(ofd, (char *) window, outcnt); + bytes_out += (ulg) outcnt; + outcnt = 0; } /* =========================================================================== @@ -1206,19 +1219,19 @@ void flush_window() * for error return. */ void write_buf(fd, buf, cnt) - int fd; - voidp buf; - unsigned cnt; +int fd; +voidp buf; +unsigned cnt; { - unsigned n; - - while ((n = write(fd, buf, cnt)) != cnt) { - if (n == (unsigned)(-1)) { - write_error(); + unsigned n; + + while ((n = write(fd, buf, cnt)) != cnt) { + if (n == (unsigned) (-1)) { + write_error(); + } + cnt -= n; + buf = (voidp) ((char *) buf + n); } - cnt -= n; - buf = (voidp)((char*)buf+n); - } } #if defined(NO_STRING_H) && !defined(STDC_HEADERS) @@ -1229,7 +1242,7 @@ void write_buf(fd, buf, cnt) # define const # endif -int strspn OF((const char *s, const char *accept)); +int strspn OF((const char *s, const char *accept)); int strcspn OF((const char *s, const char *reject)); /* ======================================================================== @@ -1237,21 +1250,23 @@ int strcspn OF((const char *s, const char *reject)); * of s which contains only characters in accept. */ int strspn(s, accept) - const char *s; - const char *accept; +const char *s; +const char *accept; { - register const char *p; - register const char *a; - register int count = 0; - - for (p = s; *p != '\0'; ++p) { - for (a = accept; *a != '\0'; ++a) { - if (*p == *a) break; + register const char *p; + register const char *a; + register int count = 0; + + for (p = s; *p != '\0'; ++p) { + for (a = accept; *a != '\0'; ++a) { + if (*p == *a) + break; + } + if (*a == '\0') + return count; + ++count; } - if (*a == '\0') return count; - ++count; - } - return count; + return count; } /* ======================================================================== @@ -1259,46 +1274,47 @@ int strspn(s, accept) * which contains no characters from reject. */ int strcspn(s, reject) - const char *s; - const char *reject; +const char *s; +const char *reject; { - register int count = 0; + register int count = 0; - while (*s != '\0') { - if (strchr(reject, *s++) != NULL) return count; - ++count; - } - return count; + while (*s != '\0') { + if (strchr(reject, *s++) != NULL) + return count; + ++count; + } + return count; } -#endif /* NO_STRING_H */ +#endif /* NO_STRING_H */ /* ======================================================================== * Error handlers. */ void warn(a, b) - char *a, *b; /* message strings juxtaposed in output */ +char *a, *b; /* message strings juxtaposed in output */ { - WARN((stderr, "warning: %s%s\n", a, b)); + WARN((stderr, "warning: %s%s\n", a, b)); } void read_error() { - fprintf(stderr, "\n"); - if (errno != 0) { - perror(""); - } else { - fprintf(stderr, "unexpected end of file\n"); - } - abort_gzip(); + fprintf(stderr, "\n"); + if (errno != 0) { + perror(""); + } else { + fprintf(stderr, "unexpected end of file\n"); + } + abort_gzip(); } void write_error() { - fprintf(stderr, "\n"); - perror(""); - abort_gzip(); + fprintf(stderr, "\n"); + perror(""); + abort_gzip(); } @@ -1306,59 +1322,60 @@ void write_error() * Table of CRC-32's of all single-byte values (made by makecrc.c) */ static const ulg crc_32_tab[] = { - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, - 0x2d02ef8dL + 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, + 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, + 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, + 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, + 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, + 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, + 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, + 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, + 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, + 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, + 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, + 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, + 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, + 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, + 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, + 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, + 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, + 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, + 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, + 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, + 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, + 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, + 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, + 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, + 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, + 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, + 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, + 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, + 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, + 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, + 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, + 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, + 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, + 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, + 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, + 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, + 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, + 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, + 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, + 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, + 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, + 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, + 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, + 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, + 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, + 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, + 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, + 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, + 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, + 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, + 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, + 0x2d02ef8dL }; + /* inflate.c -- Not copyrighted 1992 by Mark Adler version c10p1, 10 January 1993 */ @@ -1474,18 +1491,18 @@ static const ulg crc_32_tab[] = { an unused code. If a code with e == 99 is looked up, this implies an error in the data. */ struct huft { - uch e; /* number of extra bits or operation */ - uch b; /* number of bits in this code or subcode */ - union { - ush n; /* literal, length base, or distance base */ - struct huft *t; /* pointer to next level of table */ - } v; + uch e; /* number of extra bits or operation */ + uch b; /* number of bits in this code or subcode */ + union { + ush n; /* literal, length base, or distance base */ + struct huft *t; /* pointer to next level of table */ + } v; }; /* Function prototypes */ int huft_build OF((unsigned *, unsigned, unsigned, ush *, ush *, - struct huft **, int *)); + struct huft **, int *)); int huft_free OF((struct huft *)); int inflate_codes OF((struct huft *, struct huft *, int, int)); int inflate_stored OF((void)); @@ -1508,23 +1525,29 @@ int inflate OF((void)); #define flush_output(w) (wp=(w),flush_window()) /* Tables for deflate from PKZIP's appnote.txt. */ -static unsigned border[] = { /* Order of the bit length code lengths */ - 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; -static ush cplens[] = { /* Copy lengths for literal codes 257..285 */ - 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, - 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; - /* note: see note #13 above about the 258 in this list. */ -static ush cplext[] = { /* Extra bits for literal codes 257..285 */ - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, - 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99}; /* 99==invalid */ -static ush cpdist[] = { /* Copy offsets for distance codes 0..29 */ - 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, - 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, - 8193, 12289, 16385, 24577}; -static ush cpdext[] = { /* Extra bits for distance codes */ - 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, - 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, - 12, 12, 13, 13}; +static unsigned border[] = { /* Order of the bit length code lengths */ + 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 +}; +static ush cplens[] = { /* Copy lengths for literal codes 257..285 */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 +}; + + /* note: see note #13 above about the 258 in this list. */ +static ush cplext[] = { /* Extra bits for literal codes 257..285 */ + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, + 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99 +}; /* 99==invalid */ +static ush cpdist[] = { /* Copy offsets for distance codes 0..29 */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577 +}; +static ush cpdext[] = { /* Extra bits for distance codes */ + 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, + 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, + 12, 12, 13, 13 +}; @@ -1558,17 +1581,18 @@ static ush cpdext[] = { /* Extra bits for distance codes */ the stream. */ -ulg bb; /* bit buffer */ -unsigned bk; /* bits in bit buffer */ +ulg bb; /* bit buffer */ +unsigned bk; /* bits in bit buffer */ ush mask_bits[] = { - 0x0000, - 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, - 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff + 0x0000, + 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, + 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff }; #ifdef CRYPT - uch cc; +uch cc; + # define NEXTBYTE() (cc = get_byte(), zdecode(cc), cc) #else # define NEXTBYTE() (uch)get_byte() @@ -1610,342 +1634,342 @@ ush mask_bits[] = { */ -int lbits = 9; /* bits in base literal/length lookup table */ -int dbits = 6; /* bits in base distance lookup table */ +int lbits = 9; /* bits in base literal/length lookup table */ +int dbits = 6; /* bits in base distance lookup table */ /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ -#define BMAX 16 /* maximum bit length of any code (16 for explode) */ -#define N_MAX 288 /* maximum number of codes in any set */ +#define BMAX 16 /* maximum bit length of any code (16 for explode) */ +#define N_MAX 288 /* maximum number of codes in any set */ -unsigned hufts; /* track memory usage */ +unsigned hufts; /* track memory usage */ int huft_build(b, n, s, d, e, t, m) -unsigned *b; /* code lengths in bits (all assumed <= BMAX) */ -unsigned n; /* number of codes (assumed <= N_MAX) */ -unsigned s; /* number of simple-valued codes (0..s-1) */ -ush *d; /* list of base values for non-simple codes */ -ush *e; /* list of extra bits for non-simple codes */ -struct huft **t; /* result: starting table */ -int *m; /* maximum lookup bits, returns actual */ +unsigned *b; /* code lengths in bits (all assumed <= BMAX) */ +unsigned n; /* number of codes (assumed <= N_MAX) */ +unsigned s; /* number of simple-valued codes (0..s-1) */ +ush *d; /* list of base values for non-simple codes */ +ush *e; /* list of extra bits for non-simple codes */ +struct huft **t; /* result: starting table */ +int *m; /* maximum lookup bits, returns actual */ + /* Given a list of code lengths and a maximum table size, make a set of tables to decode that set of codes. Return zero on success, one if the given code set is incomplete (the tables are still built in this case), two if the input is invalid (all zero length codes or an oversubscribed set of lengths), and three if not enough memory. */ { - unsigned a; /* counter for codes of length k */ - unsigned c[BMAX+1]; /* bit length count table */ - unsigned f; /* i repeats in table every f entries */ - int g; /* maximum code length */ - int h; /* table level */ - register unsigned i; /* counter, current code */ - register unsigned j; /* counter */ - register int k; /* number of bits in current code */ - int l; /* bits per table (returned in m) */ - register unsigned *p; /* pointer into c[], b[], or v[] */ - register struct huft *q; /* points to current table */ - struct huft r; /* table entry for structure assignment */ - struct huft *u[BMAX]; /* table stack */ - unsigned v[N_MAX]; /* values in order of bit length */ - register int w; /* bits before this table == (l * h) */ - unsigned x[BMAX+1]; /* bit offsets, then code stack */ - unsigned *xp; /* pointer into x */ - int y; /* number of dummy codes added */ - unsigned z; /* number of entries in current table */ - - - /* Generate counts for each bit length */ - memzero(c, sizeof(c)); - p = b; i = n; - do { - Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"), - n-i, *p)); - c[*p]++; /* assume all entries <= BMAX */ - p++; /* Can't combine with above line (Solaris bug) */ - } while (--i); - if (c[0] == n) /* null input--all zero length codes */ - { - *t = (struct huft *)NULL; - *m = 0; - return 0; - } - - - /* Find minimum and maximum length, bound *m by those */ - l = *m; - for (j = 1; j <= BMAX; j++) - if (c[j]) - break; - k = j; /* minimum code length */ - if ((unsigned)l < j) - l = j; - for (i = BMAX; i; i--) - if (c[i]) - break; - g = i; /* maximum code length */ - if ((unsigned)l > i) - l = i; - *m = l; - - - /* Adjust last length count to fill out codes, if needed */ - for (y = 1 << j; j < i; j++, y <<= 1) - if ((y -= c[j]) < 0) - return 2; /* bad input: more codes than bits */ - if ((y -= c[i]) < 0) - return 2; - c[i] += y; - - - /* Generate starting offsets into the value table for each length */ - x[1] = j = 0; - p = c + 1; xp = x + 2; - while (--i) { /* note that i == g from above */ - *xp++ = (j += *p++); - } - - - /* Make a table of values in order of bit lengths */ - p = b; i = 0; - do { - if ((j = *p++) != 0) - v[x[j]++] = i; - } while (++i < n); - - - /* Generate the Huffman codes and for each, make the table entries */ - x[0] = i = 0; /* first Huffman code is zero */ - p = v; /* grab values in bit order */ - h = -1; /* no tables yet--level -1 */ - w = -l; /* bits decoded == (l * h) */ - u[0] = (struct huft *)NULL; /* just to keep compilers happy */ - q = (struct huft *)NULL; /* ditto */ - z = 0; /* ditto */ - - /* go through the bit lengths (k already is bits in shortest code) */ - for (; k <= g; k++) - { - a = c[k]; - while (a--) - { - /* here i is the Huffman code of length k bits for value *p */ - /* make tables up to required level */ - while (k > w + l) - { - h++; - w += l; /* previous table always l bits */ - - /* compute minimum size table less than or equal to l bits */ - z = (z = g - w) > (unsigned)l ? l : z; /* upper limit on table size */ - if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ - { /* too few codes for k-w bit table */ - f -= a + 1; /* deduct codes from patterns left */ - xp = c + k; - while (++j < z) /* try smaller tables up to z bits */ - { - if ((f <<= 1) <= *++xp) - break; /* enough codes to use up j bits */ - f -= *xp; /* else deduct codes from patterns */ - } - } - z = 1 << j; /* table entries for j-bit table */ - - /* allocate and link in new table */ - if ((q = (struct huft *)malloc((z + 1)*sizeof(struct huft))) == - (struct huft *)NULL) - { - if (h) - huft_free(u[0]); - return 3; /* not enough memory */ - } - hufts += z + 1; /* track memory usage */ - *t = q + 1; /* link to list for huft_free() */ - *(t = &(q->v.t)) = (struct huft *)NULL; - u[h] = ++q; /* table starts after link */ - - /* connect to last table, if there is one */ - if (h) - { - x[h] = i; /* save pattern for backing up */ - r.b = (uch)l; /* bits to dump before this table */ - r.e = (uch)(16 + j); /* bits in this table */ - r.v.t = q; /* pointer to this table */ - j = i >> (w - l); /* (get around Turbo C bug) */ - u[h-1][j] = r; /* connect to last table */ - } - } - - /* set up table entry in r */ - r.b = (uch)(k - w); - if (p >= v + n) - r.e = 99; /* out of values--invalid code */ - else if (*p < s) - { - r.e = (uch)(*p < 256 ? 16 : 15); /* 256 is end-of-block code */ - r.v.n = (ush)(*p); /* simple code is just the value */ - p++; /* one compiler does not like *p++ */ - } - else - { - r.e = (uch)e[*p - s]; /* non-simple--look up in lists */ - r.v.n = d[*p++ - s]; - } - - /* fill code-like entries with r */ - f = 1 << (k - w); - for (j = i >> w; j < z; j += f) - q[j] = r; - - /* backwards increment the k-bit code i */ - for (j = 1 << (k - 1); i & j; j >>= 1) - i ^= j; - i ^= j; - - /* backup over finished tables */ - while ((i & ((1 << w) - 1)) != x[h]) - { - h--; /* don't need to update q */ - w -= l; - } - } - } - - - /* Return true (1) if we were given an incomplete table */ - return y != 0 && g != 1; + unsigned a; /* counter for codes of length k */ + unsigned c[BMAX + 1]; /* bit length count table */ + unsigned f; /* i repeats in table every f entries */ + int g; /* maximum code length */ + int h; /* table level */ + register unsigned i; /* counter, current code */ + register unsigned j; /* counter */ + register int k; /* number of bits in current code */ + int l; /* bits per table (returned in m) */ + register unsigned *p; /* pointer into c[], b[], or v[] */ + register struct huft *q; /* points to current table */ + struct huft r; /* table entry for structure assignment */ + struct huft *u[BMAX]; /* table stack */ + unsigned v[N_MAX]; /* values in order of bit length */ + register int w; /* bits before this table == (l * h) */ + unsigned x[BMAX + 1]; /* bit offsets, then code stack */ + unsigned *xp; /* pointer into x */ + int y; /* number of dummy codes added */ + unsigned z; /* number of entries in current table */ + + + /* Generate counts for each bit length */ + memzero(c, sizeof(c)); + p = b; + i = n; + do { + Tracecv(*p, + (stderr, + (n - i >= ' ' + && n - i <= '~' ? "%c %d\n" : "0x%x %d\n"), n - i, *p)); + c[*p]++; /* assume all entries <= BMAX */ + p++; /* Can't combine with above line (Solaris bug) */ + } while (--i); + if (c[0] == n) { /* null input--all zero length codes */ + *t = (struct huft *) NULL; + *m = 0; + return 0; + } + + + /* Find minimum and maximum length, bound *m by those */ + l = *m; + for (j = 1; j <= BMAX; j++) + if (c[j]) + break; + k = j; /* minimum code length */ + if ((unsigned) l < j) + l = j; + for (i = BMAX; i; i--) + if (c[i]) + break; + g = i; /* maximum code length */ + if ((unsigned) l > i) + l = i; + *m = l; + + + /* Adjust last length count to fill out codes, if needed */ + for (y = 1 << j; j < i; j++, y <<= 1) + if ((y -= c[j]) < 0) + return 2; /* bad input: more codes than bits */ + if ((y -= c[i]) < 0) + return 2; + c[i] += y; + + + /* Generate starting offsets into the value table for each length */ + x[1] = j = 0; + p = c + 1; + xp = x + 2; + while (--i) { /* note that i == g from above */ + *xp++ = (j += *p++); + } + + + /* Make a table of values in order of bit lengths */ + p = b; + i = 0; + do { + if ((j = *p++) != 0) + v[x[j]++] = i; + } while (++i < n); + + + /* Generate the Huffman codes and for each, make the table entries */ + x[0] = i = 0; /* first Huffman code is zero */ + p = v; /* grab values in bit order */ + h = -1; /* no tables yet--level -1 */ + w = -l; /* bits decoded == (l * h) */ + u[0] = (struct huft *) NULL; /* just to keep compilers happy */ + q = (struct huft *) NULL; /* ditto */ + z = 0; /* ditto */ + + /* go through the bit lengths (k already is bits in shortest code) */ + for (; k <= g; k++) { + a = c[k]; + while (a--) { + /* here i is the Huffman code of length k bits for value *p */ + /* make tables up to required level */ + while (k > w + l) { + h++; + w += l; /* previous table always l bits */ + + /* compute minimum size table less than or equal to l bits */ + z = (z = g - w) > (unsigned) l ? l : z; /* upper limit on table size */ + if ((f = 1 << (j = k - w)) > a + 1) { /* try a k-w bit table *//* too few codes for k-w bit table */ + f -= a + 1; /* deduct codes from patterns left */ + xp = c + k; + while (++j < z) { /* try smaller tables up to z bits */ + if ((f <<= 1) <= *++xp) + break; /* enough codes to use up j bits */ + f -= *xp; /* else deduct codes from patterns */ + } + } + z = 1 << j; /* table entries for j-bit table */ + + /* allocate and link in new table */ + if ( + (q = + (struct huft *) malloc((z + 1) * + sizeof(struct huft))) == + (struct huft *) NULL) { + if (h) + huft_free(u[0]); + return 3; /* not enough memory */ + } + hufts += z + 1; /* track memory usage */ + *t = q + 1; /* link to list for huft_free() */ + *(t = &(q->v.t)) = (struct huft *) NULL; + u[h] = ++q; /* table starts after link */ + + /* connect to last table, if there is one */ + if (h) { + x[h] = i; /* save pattern for backing up */ + r.b = (uch) l; /* bits to dump before this table */ + r.e = (uch) (16 + j); /* bits in this table */ + r.v.t = q; /* pointer to this table */ + j = i >> (w - l); /* (get around Turbo C bug) */ + u[h - 1][j] = r; /* connect to last table */ + } + } + + /* set up table entry in r */ + r.b = (uch) (k - w); + if (p >= v + n) + r.e = 99; /* out of values--invalid code */ + else if (*p < s) { + r.e = (uch) (*p < 256 ? 16 : 15); /* 256 is end-of-block code */ + r.v.n = (ush) (*p); /* simple code is just the value */ + p++; /* one compiler does not like *p++ */ + } else { + r.e = (uch) e[*p - s]; /* non-simple--look up in lists */ + r.v.n = d[*p++ - s]; + } + + /* fill code-like entries with r */ + f = 1 << (k - w); + for (j = i >> w; j < z; j += f) + q[j] = r; + + /* backwards increment the k-bit code i */ + for (j = 1 << (k - 1); i & j; j >>= 1) + i ^= j; + i ^= j; + + /* backup over finished tables */ + while ((i & ((1 << w) - 1)) != x[h]) { + h--; /* don't need to update q */ + w -= l; + } + } + } + + + /* Return true (1) if we were given an incomplete table */ + return y != 0 && g != 1; } int huft_free(t) -struct huft *t; /* table to free */ +struct huft *t; /* table to free */ + /* Free the malloc'ed tables built by huft_build(), which makes a linked list of the tables it made, with the links in a dummy first entry of each table. */ { - register struct huft *p, *q; - - - /* Go through linked list, freeing from the malloced (t[-1]) address. */ - p = t; - while (p != (struct huft *)NULL) - { - q = (--p)->v.t; - free((char*)p); - p = q; - } - return 0; + register struct huft *p, *q; + + + /* Go through linked list, freeing from the malloced (t[-1]) address. */ + p = t; + while (p != (struct huft *) NULL) { + q = (--p)->v.t; + free((char *) p); + p = q; + } + return 0; } int inflate_codes(tl, td, bl, bd) -struct huft *tl, *td; /* literal/length and distance decoder tables */ -int bl, bd; /* number of bits decoded by tl[] and td[] */ +struct huft *tl, *td; /* literal/length and distance decoder tables */ +int bl, bd; /* number of bits decoded by tl[] and td[] */ + /* inflate (decompress) the codes in a deflated (compressed) block. Return an error code or zero if it all goes ok. */ { - register unsigned e; /* table entry flag/number of extra bits */ - unsigned n, d; /* length and index for copy */ - unsigned w; /* current window position */ - struct huft *t; /* pointer to table entry */ - unsigned ml, md; /* masks for bl and bd bits */ - register ulg b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ - - - /* make local copies of globals */ - b = bb; /* initialize bit buffer */ - k = bk; - w = wp; /* initialize window position */ - - /* inflate the coded data */ - ml = mask_bits[bl]; /* precompute masks for speed */ - md = mask_bits[bd]; - for (;;) /* do until end of block */ - { - NEEDBITS((unsigned)bl) - if ((e = (t = tl + ((unsigned)b & ml))->e) > 16) - do { - if (e == 99) - return 1; - DUMPBITS(t->b) - e -= 16; - NEEDBITS(e) - } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); - DUMPBITS(t->b) - if (e == 16) /* then it's a literal */ - { - slide[w++] = (uch)t->v.n; - Tracevv((stderr, "%c", slide[w-1])); - if (w == WSIZE) - { - flush_output(w); - w = 0; - } - } - else /* it's an EOB or a length */ - { - /* exit if end of block */ - if (e == 15) - break; - - /* get length of block to copy */ - NEEDBITS(e) - n = t->v.n + ((unsigned)b & mask_bits[e]); - DUMPBITS(e); - - /* decode distance of block to copy */ - NEEDBITS((unsigned)bd) - if ((e = (t = td + ((unsigned)b & md))->e) > 16) - do { - if (e == 99) - return 1; - DUMPBITS(t->b) - e -= 16; - NEEDBITS(e) - } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); - DUMPBITS(t->b) - NEEDBITS(e) - d = w - t->v.n - ((unsigned)b & mask_bits[e]); - DUMPBITS(e) - Tracevv((stderr,"\\[%d,%d]", w-d, n)); - - /* do the copy */ - do { - n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e); + register unsigned e; /* table entry flag/number of extra bits */ + unsigned n, d; /* length and index for copy */ + unsigned w; /* current window position */ + struct huft *t; /* pointer to table entry */ + unsigned ml, md; /* masks for bl and bd bits */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ + + + /* make local copies of globals */ + b = bb; /* initialize bit buffer */ + k = bk; + w = wp; /* initialize window position */ + + /* inflate the coded data */ + ml = mask_bits[bl]; /* precompute masks for speed */ + md = mask_bits[bd]; + for (;;) { /* do until end of block */ + NEEDBITS((unsigned) bl) + if ((e = (t = tl + ((unsigned) b & ml))->e) > 16) + do { + if (e == 99) + return 1; + DUMPBITS(t->b) + e -= 16; + NEEDBITS(e) + } while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) + > 16); + DUMPBITS(t->b) + if (e == 16) { /* then it's a literal */ + slide[w++] = (uch) t->v.n; + Tracevv((stderr, "%c", slide[w - 1])); + if (w == WSIZE) { + flush_output(w); + w = 0; + } + } else { /* it's an EOB or a length */ + + /* exit if end of block */ + if (e == 15) + break; + + /* get length of block to copy */ + NEEDBITS(e) + n = t->v.n + ((unsigned) b & mask_bits[e]); + DUMPBITS(e); + + /* decode distance of block to copy */ + NEEDBITS((unsigned) bd) + if ((e = (t = td + ((unsigned) b & md))->e) > 16) + do { + if (e == 99) + return 1; + DUMPBITS(t->b) + e -= 16; + NEEDBITS(e) + } + while ( + (e = + (t = + t->v.t + ((unsigned) b & mask_bits[e]))->e) > + 16); + DUMPBITS(t->b) + NEEDBITS(e) + d = w - t->v.n - ((unsigned) b & mask_bits[e]); + DUMPBITS(e) + Tracevv((stderr, "\\[%d,%d]", w - d, n)); + + /* do the copy */ + do { + n -= (e = + (e = + WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > + n ? n : e); #if !defined(NOMEMCPY) && !defined(DEBUG) - if (w - d >= e) /* (this test assumes unsigned comparison) */ - { - memcpy(slide + w, slide + d, e); - w += e; - d += e; - } - else /* do it slow to avoid memcpy() overlap */ -#endif /* !NOMEMCPY */ - do { - slide[w++] = slide[d++]; - Tracevv((stderr, "%c", slide[w-1])); - } while (--e); - if (w == WSIZE) - { - flush_output(w); - w = 0; - } - } while (n); - } - } - - - /* restore the globals from the locals */ - wp = w; /* restore global window pointer */ - bb = b; /* restore global bit buffer */ - bk = k; - - /* done */ - return 0; + if (w - d >= e) { /* (this test assumes unsigned comparison) */ + memcpy(slide + w, slide + d, e); + w += e; + d += e; + } else /* do it slow to avoid memcpy() overlap */ +#endif /* !NOMEMCPY */ + do { + slide[w++] = slide[d++]; + Tracevv((stderr, "%c", slide[w - 1])); + } while (--e); + if (w == WSIZE) { + flush_output(w); + w = 0; + } + } while (n); + } + } + + + /* restore the globals from the locals */ + wp = w; /* restore global window pointer */ + bb = b; /* restore global bit buffer */ + bk = k; + + /* done */ + return 0; } @@ -1953,52 +1977,50 @@ int bl, bd; /* number of bits decoded by tl[] and td[] */ int inflate_stored() /* "decompress" an inflated type 0 (stored) block. */ { - unsigned n; /* number of bytes in block */ - unsigned w; /* current window position */ - register ulg b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ - - - /* make local copies of globals */ - b = bb; /* initialize bit buffer */ - k = bk; - w = wp; /* initialize window position */ - - - /* go to byte boundary */ - n = k & 7; - DUMPBITS(n); - - - /* get the length and its complement */ - NEEDBITS(16) - n = ((unsigned)b & 0xffff); - DUMPBITS(16) - NEEDBITS(16) - if (n != (unsigned)((~b) & 0xffff)) - return 1; /* error in compressed data */ - DUMPBITS(16) - - - /* read and output the compressed data */ - while (n--) - { - NEEDBITS(8) - slide[w++] = (uch)b; - if (w == WSIZE) - { - flush_output(w); - w = 0; - } - DUMPBITS(8) - } - - - /* restore the globals from the locals */ - wp = w; /* restore global window pointer */ - bb = b; /* restore global bit buffer */ - bk = k; - return 0; + unsigned n; /* number of bytes in block */ + unsigned w; /* current window position */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ + + + /* make local copies of globals */ + b = bb; /* initialize bit buffer */ + k = bk; + w = wp; /* initialize window position */ + + + /* go to byte boundary */ + n = k & 7; + DUMPBITS(n); + + + /* get the length and its complement */ + NEEDBITS(16) + n = ((unsigned) b & 0xffff); + DUMPBITS(16) + NEEDBITS(16) + if (n != (unsigned) ((~b) & 0xffff)) + return 1; /* error in compressed data */ + DUMPBITS(16) + + + /* read and output the compressed data */ + while (n--) { + NEEDBITS(8) + slide[w++] = (uch) b; + if (w == WSIZE) { + flush_output(w); + w = 0; + } + DUMPBITS(8) + } + + + /* restore the globals from the locals */ + wp = w; /* restore global window pointer */ + bb = b; /* restore global bit buffer */ + bk = k; + return 0; } @@ -2008,48 +2030,47 @@ int inflate_fixed() either replace this with a custom decoder, or at least precompute the Huffman tables. */ { - int i; /* temporary variable */ - struct huft *tl; /* literal/length code table */ - struct huft *td; /* distance code table */ - int bl; /* lookup bits for tl */ - int bd; /* lookup bits for td */ - unsigned l[288]; /* length list for huft_build */ - - - /* set up literal table */ - for (i = 0; i < 144; i++) - l[i] = 8; - for (; i < 256; i++) - l[i] = 9; - for (; i < 280; i++) - l[i] = 7; - for (; i < 288; i++) /* make a complete, but wrong code set */ - l[i] = 8; - bl = 7; - if ((i = huft_build(l, 288, 257, cplens, cplext, &tl, &bl)) != 0) - return i; - - - /* set up distance table */ - for (i = 0; i < 30; i++) /* make an incomplete code set */ - l[i] = 5; - bd = 5; - if ((i = huft_build(l, 30, 0, cpdist, cpdext, &td, &bd)) > 1) - { - huft_free(tl); - return i; - } - - - /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) - return 1; - - - /* free the decoding tables, return */ - huft_free(tl); - huft_free(td); - return 0; + int i; /* temporary variable */ + struct huft *tl; /* literal/length code table */ + struct huft *td; /* distance code table */ + int bl; /* lookup bits for tl */ + int bd; /* lookup bits for td */ + unsigned l[288]; /* length list for huft_build */ + + + /* set up literal table */ + for (i = 0; i < 144; i++) + l[i] = 8; + for (; i < 256; i++) + l[i] = 9; + for (; i < 280; i++) + l[i] = 7; + for (; i < 288; i++) /* make a complete, but wrong code set */ + l[i] = 8; + bl = 7; + if ((i = huft_build(l, 288, 257, cplens, cplext, &tl, &bl)) != 0) + return i; + + + /* set up distance table */ + for (i = 0; i < 30; i++) /* make an incomplete code set */ + l[i] = 5; + bd = 5; + if ((i = huft_build(l, 30, 0, cpdist, cpdext, &td, &bd)) > 1) { + huft_free(tl); + return i; + } + + + /* decompress until an end-of-block code */ + if (inflate_codes(tl, td, bl, bd)) + return 1; + + + /* free the decoding tables, return */ + huft_free(tl); + huft_free(td); + return 0; } @@ -2057,209 +2078,202 @@ int inflate_fixed() int inflate_dynamic() /* decompress an inflated type 2 (dynamic Huffman codes) block. */ { - int i; /* temporary variables */ - unsigned j; - unsigned l; /* last length */ - unsigned m; /* mask for bit lengths table */ - unsigned n; /* number of lengths to get */ - struct huft *tl; /* literal/length code table */ - struct huft *td; /* distance code table */ - int bl; /* lookup bits for tl */ - int bd; /* lookup bits for td */ - unsigned nb; /* number of bit length codes */ - unsigned nl; /* number of literal/length codes */ - unsigned nd; /* number of distance codes */ + int i; /* temporary variables */ + unsigned j; + unsigned l; /* last length */ + unsigned m; /* mask for bit lengths table */ + unsigned n; /* number of lengths to get */ + struct huft *tl; /* literal/length code table */ + struct huft *td; /* distance code table */ + int bl; /* lookup bits for tl */ + int bd; /* lookup bits for td */ + unsigned nb; /* number of bit length codes */ + unsigned nl; /* number of literal/length codes */ + unsigned nd; /* number of distance codes */ + #ifdef PKZIP_BUG_WORKAROUND - unsigned ll[288+32]; /* literal/length and distance code lengths */ + unsigned ll[288 + 32]; /* literal/length and distance code lengths */ #else - unsigned ll[286+30]; /* literal/length and distance code lengths */ + unsigned ll[286 + 30]; /* literal/length and distance code lengths */ #endif - register ulg b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ - /* make local bit buffer */ - b = bb; - k = bk; + /* make local bit buffer */ + b = bb; + k = bk; - /* read in table lengths */ - NEEDBITS(5) - nl = 257 + ((unsigned)b & 0x1f); /* number of literal/length codes */ - DUMPBITS(5) - NEEDBITS(5) - nd = 1 + ((unsigned)b & 0x1f); /* number of distance codes */ - DUMPBITS(5) - NEEDBITS(4) - nb = 4 + ((unsigned)b & 0xf); /* number of bit length codes */ - DUMPBITS(4) + /* read in table lengths */ + NEEDBITS(5) + nl = 257 + ((unsigned) b & 0x1f); /* number of literal/length codes */ + DUMPBITS(5) + NEEDBITS(5) + nd = 1 + ((unsigned) b & 0x1f); /* number of distance codes */ + DUMPBITS(5) + NEEDBITS(4) + nb = 4 + ((unsigned) b & 0xf); /* number of bit length codes */ + DUMPBITS(4) #ifdef PKZIP_BUG_WORKAROUND - if (nl > 288 || nd > 32) + if (nl > 288 || nd > 32) #else - if (nl > 286 || nd > 30) + if (nl > 286 || nd > 30) #endif - return 1; /* bad lengths */ - - - /* read in bit-length-code lengths */ - for (j = 0; j < nb; j++) - { - NEEDBITS(3) - ll[border[j]] = (unsigned)b & 7; - DUMPBITS(3) - } - for (; j < 19; j++) - ll[border[j]] = 0; - - - /* build decoding table for trees--single level, 7 bit lookup */ - bl = 7; - if ((i = huft_build(ll, 19, 19, NULL, NULL, &tl, &bl)) != 0) - { - if (i == 1) - huft_free(tl); - return i; /* incomplete code set */ - } - - - /* read in literal and distance code lengths */ - n = nl + nd; - m = mask_bits[bl]; - i = l = 0; - while ((unsigned)i < n) - { - NEEDBITS((unsigned)bl) - j = (td = tl + ((unsigned)b & m))->b; - DUMPBITS(j) - j = td->v.n; - if (j < 16) /* length of code in bits (0..15) */ - ll[i++] = l = j; /* save last length in l */ - else if (j == 16) /* repeat last length 3 to 6 times */ - { - NEEDBITS(2) - j = 3 + ((unsigned)b & 3); - DUMPBITS(2) - if ((unsigned)i + j > n) - return 1; - while (j--) - ll[i++] = l; - } - else if (j == 17) /* 3 to 10 zero length codes */ - { - NEEDBITS(3) - j = 3 + ((unsigned)b & 7); - DUMPBITS(3) - if ((unsigned)i + j > n) - return 1; - while (j--) - ll[i++] = 0; - l = 0; - } - else /* j == 18: 11 to 138 zero length codes */ - { - NEEDBITS(7) - j = 11 + ((unsigned)b & 0x7f); - DUMPBITS(7) - if ((unsigned)i + j > n) - return 1; - while (j--) - ll[i++] = 0; - l = 0; - } - } - - - /* free decoding table for trees */ - huft_free(tl); - - - /* restore the global bit buffer */ - bb = b; - bk = k; - - - /* build the decoding tables for literal/length and distance codes */ - bl = lbits; - if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) - { - if (i == 1) { - fprintf(stderr, " incomplete literal tree\n"); - huft_free(tl); - } - return i; /* incomplete code set */ - } - bd = dbits; - if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0) - { - if (i == 1) { - fprintf(stderr, " incomplete distance tree\n"); + return 1; /* bad lengths */ + + + /* read in bit-length-code lengths */ + for (j = 0; j < nb; j++) { + NEEDBITS(3) + ll[border[j]] = (unsigned) b & 7; + DUMPBITS(3) + } + for (; j < 19; j++) + ll[border[j]] = 0; + + + /* build decoding table for trees--single level, 7 bit lookup */ + bl = 7; + if ((i = huft_build(ll, 19, 19, NULL, NULL, &tl, &bl)) != 0) { + if (i == 1) + huft_free(tl); + return i; /* incomplete code set */ + } + + + /* read in literal and distance code lengths */ + n = nl + nd; + m = mask_bits[bl]; + i = l = 0; + while ((unsigned) i < n) { + NEEDBITS((unsigned) bl) + j = (td = tl + ((unsigned) b & m))->b; + DUMPBITS(j) + j = td->v.n; + if (j < 16) /* length of code in bits (0..15) */ + ll[i++] = l = j; /* save last length in l */ + else if (j == 16) { /* repeat last length 3 to 6 times */ + NEEDBITS(2) + j = 3 + ((unsigned) b & 3); + DUMPBITS(2) + if ((unsigned) i + j > n) + return 1; + while (j--) + ll[i++] = l; + } else if (j == 17) { /* 3 to 10 zero length codes */ + NEEDBITS(3) + j = 3 + ((unsigned) b & 7); + DUMPBITS(3) + if ((unsigned) i + j > n) + return 1; + while (j--) + ll[i++] = 0; + l = 0; + } else { /* j == 18: 11 to 138 zero length codes */ + + NEEDBITS(7) + j = 11 + ((unsigned) b & 0x7f); + DUMPBITS(7) + if ((unsigned) i + j > n) + return 1; + while (j--) + ll[i++] = 0; + l = 0; + } + } + + + /* free decoding table for trees */ + huft_free(tl); + + + /* restore the global bit buffer */ + bb = b; + bk = k; + + + /* build the decoding tables for literal/length and distance codes */ + bl = lbits; + if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) { + if (i == 1) { + fprintf(stderr, " incomplete literal tree\n"); + huft_free(tl); + } + return i; /* incomplete code set */ + } + bd = dbits; + if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0) { + if (i == 1) { + fprintf(stderr, " incomplete distance tree\n"); #ifdef PKZIP_BUG_WORKAROUND - i = 0; - } + i = 0; + } #else - huft_free(td); - } - huft_free(tl); - return i; /* incomplete code set */ + huft_free(td); + } + huft_free(tl); + return i; /* incomplete code set */ #endif - } + } - /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) - return 1; + /* decompress until an end-of-block code */ + if (inflate_codes(tl, td, bl, bd)) + return 1; - /* free the decoding tables, return */ - huft_free(tl); - huft_free(td); - return 0; + /* free the decoding tables, return */ + huft_free(tl); + huft_free(td); + return 0; } int inflate_block(e) -int *e; /* last block flag */ +int *e; /* last block flag */ + /* decompress an inflated block */ { - unsigned t; /* block type */ - register ulg b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ + unsigned t; /* block type */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ - /* make local bit buffer */ - b = bb; - k = bk; + /* make local bit buffer */ + b = bb; + k = bk; - /* read in last block bit */ - NEEDBITS(1) - *e = (int)b & 1; - DUMPBITS(1) + /* read in last block bit */ + NEEDBITS(1) + * e = (int) b & 1; + DUMPBITS(1) - /* read in block type */ - NEEDBITS(2) - t = (unsigned)b & 3; - DUMPBITS(2) + /* read in block type */ + NEEDBITS(2) + t = (unsigned) b & 3; + DUMPBITS(2) - /* restore the global bit buffer */ - bb = b; - bk = k; + /* restore the global bit buffer */ + bb = b; + bk = k; - /* inflate that block type */ - if (t == 2) - return inflate_dynamic(); - if (t == 0) - return inflate_stored(); - if (t == 1) - return inflate_fixed(); + /* inflate that block type */ + if (t == 2) + return inflate_dynamic(); + if (t == 0) + return inflate_stored(); + if (t == 1) + return inflate_fixed(); - /* bad block type */ - return 2; + /* bad block type */ + return 2; } @@ -2267,42 +2281,42 @@ int *e; /* last block flag */ int inflate() /* decompress an inflated entry */ { - int e; /* last block flag */ - int r; /* result code */ - unsigned h; /* maximum struct huft's malloc'ed */ + int e; /* last block flag */ + int r; /* result code */ + unsigned h; /* maximum struct huft's malloc'ed */ - /* initialize window, bit buffer */ - wp = 0; - bk = 0; - bb = 0; + /* initialize window, bit buffer */ + wp = 0; + bk = 0; + bb = 0; - /* decompress until the last block */ - h = 0; - do { - hufts = 0; - if ((r = inflate_block(&e)) != 0) - return r; - if (hufts > h) - h = hufts; - } while (!e); + /* decompress until the last block */ + h = 0; + do { + hufts = 0; + if ((r = inflate_block(&e)) != 0) + return r; + if (hufts > h) + h = hufts; + } while (!e); - /* Undo too much lookahead. The next read will be byte aligned so we - * can discard unused bits in the last meaningful byte. - */ - while (bk >= 8) { - bk -= 8; - inptr--; - } + /* Undo too much lookahead. The next read will be byte aligned so we + * can discard unused bits in the last meaningful byte. + */ + while (bk >= 8) { + bk -= 8; + inptr--; + } - /* flush out slide */ - flush_output(wp); + /* flush out slide */ + flush_output(wp); - /* return success */ + /* return success */ #ifdef DEBUG - fprintf(stderr, "<%u> ", h); -#endif /* DEBUG */ - return 0; + fprintf(stderr, "<%u> ", h); +#endif /* DEBUG */ + return 0; } diff --git a/archival/gzip.c b/archival/gzip.c index 3438ee42f..f132679f7 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* gzip.c -- this is a stripped down version of gzip I put into busybox, it does * only standard in to standard out with -9 compression. It also requires the * zcat module for some important functions. @@ -12,11 +13,12 @@ //#endif static const char gzip_usage[] = - "gzip [OPTION]... FILE\n\n" - "Compress FILE with maximum compression.\n" - "When FILE is -, reads standard input. Implies -c.\n\n" - "Options:\n" - "\t-c\tWrite output to standard output instead of FILE.gz\n"; + "gzip [OPTION]... FILE\n\n" + "Compress FILE with maximum compression.\n" + "When FILE is -, reads standard input. Implies -c.\n\n" + + "Options:\n" + "\t-c\tWrite output to standard output instead of FILE.gz\n"; /* gzip.h -- common declarations for all gzip modules @@ -32,9 +34,9 @@ static const char gzip_usage[] = #endif #ifdef __STDC__ - typedef void *voidp; +typedef void *voidp; #else - typedef char *voidp; +typedef char *voidp; #endif /* I don't like nested includes, but the string and io functions are used @@ -49,10 +51,10 @@ static const char gzip_usage[] = # define memzero(s, n) memset ((voidp)(s), 0, (n)) #else # include <strings.h> -# define strchr index +# define strchr index # define strrchr rindex -# define memcpy(d, s, n) bcopy((s), (d), (n)) -# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) +# define memcpy(d, s, n) bcopy((s), (d), (n)) +# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) # define memzero(s, n) bzero((s), (n)) #endif @@ -62,9 +64,9 @@ static const char gzip_usage[] = #define local static -typedef unsigned char uch; +typedef unsigned char uch; typedef unsigned short ush; -typedef unsigned long ulg; +typedef unsigned long ulg; /* Return codes from gzip */ #define OK 0 @@ -79,7 +81,7 @@ typedef unsigned long ulg; /* methods 4 to 7 reserved */ #define DEFLATED 8 #define MAX_METHODS 9 -extern int method; /* compression method */ +extern int method; /* compression method */ /* To save memory for 16 bit systems, some arrays are overlaid between * the various modules: @@ -94,27 +96,27 @@ extern int method; /* compression method */ #ifndef INBUFSIZ # ifdef SMALL_MEM -# define INBUFSIZ 0x2000 /* input buffer size */ +# define INBUFSIZ 0x2000 /* input buffer size */ # else -# define INBUFSIZ 0x8000 /* input buffer size */ +# define INBUFSIZ 0x8000 /* input buffer size */ # endif #endif -#define INBUF_EXTRA 64 /* required by unlzw() */ +#define INBUF_EXTRA 64 /* required by unlzw() */ #ifndef OUTBUFSIZ # ifdef SMALL_MEM -# define OUTBUFSIZ 8192 /* output buffer size */ +# define OUTBUFSIZ 8192 /* output buffer size */ # else -# define OUTBUFSIZ 16384 /* output buffer size */ +# define OUTBUFSIZ 16384 /* output buffer size */ # endif #endif -#define OUTBUF_EXTRA 2048 /* required by unlzw() */ +#define OUTBUF_EXTRA 2048 /* required by unlzw() */ #ifndef DIST_BUFSIZE # ifdef SMALL_MEM -# define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */ +# define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */ # else -# define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */ +# define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */ # endif #endif @@ -133,60 +135,61 @@ extern int method; /* compression method */ # define FREE(array) #endif -EXTERN(uch, inbuf); /* input buffer */ -EXTERN(uch, outbuf); /* output buffer */ -EXTERN(ush, d_buf); /* buffer for distances, see trees.c */ -EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ +EXTERN(uch, inbuf); /* input buffer */ +EXTERN(uch, outbuf); /* output buffer */ +EXTERN(ush, d_buf); /* buffer for distances, see trees.c */ +EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ #define tab_suffix window #ifndef MAXSEG_64K -# define tab_prefix prev /* hash link (see deflate.c) */ -# define head (prev+WSIZE) /* hash head (see deflate.c) */ - EXTERN(ush, tab_prefix); /* prefix code (see unlzw.c) */ +# define tab_prefix prev /* hash link (see deflate.c) */ +# define head (prev+WSIZE) /* hash head (see deflate.c) */ +EXTERN(ush, tab_prefix); /* prefix code (see unlzw.c) */ #else # define tab_prefix0 prev # define head tab_prefix1 - EXTERN(ush, tab_prefix0); /* prefix for even codes */ - EXTERN(ush, tab_prefix1); /* prefix for odd codes */ +EXTERN(ush, tab_prefix0); /* prefix for even codes */ +EXTERN(ush, tab_prefix1); /* prefix for odd codes */ #endif -extern unsigned insize; /* valid bytes in inbuf */ -extern unsigned inptr; /* index of next byte to be processed in inbuf */ -extern unsigned outcnt; /* bytes in output buffer */ +extern unsigned insize; /* valid bytes in inbuf */ +extern unsigned inptr; /* index of next byte to be processed in inbuf */ +extern unsigned outcnt; /* bytes in output buffer */ -extern long bytes_in; /* number of input bytes */ -extern long bytes_out; /* number of output bytes */ -extern long header_bytes;/* number of bytes in gzip header */ +extern long bytes_in; /* number of input bytes */ +extern long bytes_out; /* number of output bytes */ +extern long header_bytes; /* number of bytes in gzip header */ #define isize bytes_in /* for compatibility with old zip sources (to be cleaned) */ -extern int ifd; /* input file descriptor */ -extern int ofd; /* output file descriptor */ -extern char ifname[]; /* input file name or "stdin" */ -extern char ofname[]; /* output file name or "stdout" */ -extern char *progname; /* program name */ +extern int ifd; /* input file descriptor */ +extern int ofd; /* output file descriptor */ +extern char ifname[]; /* input file name or "stdin" */ +extern char ofname[]; /* output file name or "stdout" */ +extern char *progname; /* program name */ + +extern long time_stamp; /* original time stamp (modification time) */ +extern long ifile_size; /* input file size, -1 for devices (debug only) */ -extern long time_stamp; /* original time stamp (modification time) */ -extern long ifile_size; /* input file size, -1 for devices (debug only) */ +typedef int file_t; /* Do not use stdio */ -typedef int file_t; /* Do not use stdio */ -#define NO_FILE (-1) /* in memory compression */ +#define NO_FILE (-1) /* in memory compression */ -#define PACK_MAGIC "\037\036" /* Magic header for packed files */ -#define GZIP_MAGIC "\037\213" /* Magic header for gzip files, 1F 8B */ -#define OLD_GZIP_MAGIC "\037\236" /* Magic header for gzip 0.5 = freeze 1.x */ -#define LZH_MAGIC "\037\240" /* Magic header for SCO LZH Compress files*/ -#define PKZIP_MAGIC "\120\113\003\004" /* Magic header for pkzip files */ +#define PACK_MAGIC "\037\036" /* Magic header for packed files */ +#define GZIP_MAGIC "\037\213" /* Magic header for gzip files, 1F 8B */ +#define OLD_GZIP_MAGIC "\037\236" /* Magic header for gzip 0.5 = freeze 1.x */ +#define LZH_MAGIC "\037\240" /* Magic header for SCO LZH Compress files */ +#define PKZIP_MAGIC "\120\113\003\004" /* Magic header for pkzip files */ /* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ -#define RESERVED 0xC0 /* bit 6,7: reserved */ +#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ +#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ +#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ +#define COMMENT 0x10 /* bit 4 set: file comment present */ +#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ +#define RESERVED 0xC0 /* bit 6,7: reserved */ /* internal file attribute */ #define UNKNOWN 0xffff @@ -194,8 +197,8 @@ typedef int file_t; /* Do not use stdio */ #define ASCII 1 #ifndef WSIZE -# define WSIZE 0x8000 /* window size--must be a power of two, and */ -#endif /* at least 32K for zip's deflate method */ +# define WSIZE 0x8000 /* window size--must be a power of two, and */ +#endif /* at least 32K for zip's deflate method */ #define MIN_MATCH 3 #define MAX_MATCH 258 @@ -211,12 +214,12 @@ typedef int file_t; /* Do not use stdio */ * distances are limited to MAX_DIST instead of WSIZE. */ -extern int decrypt; /* flag to turn on decryption */ -extern int exit_code; /* program exit code */ -extern int verbose; /* be verbose (-v) */ -extern int quiet; /* be quiet (-q) */ -extern int test; /* check .z file integrity */ -extern int save_orig_name; /* set if original name must be saved */ +extern int decrypt; /* flag to turn on decryption */ +extern int exit_code; /* program exit code */ +extern int verbose; /* be verbose (-v) */ +extern int quiet; /* be quiet (-q) */ +extern int test; /* check .z file integrity */ +extern int save_orig_name; /* set if original name must be saved */ #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) @@ -248,10 +251,10 @@ extern int save_orig_name; /* set if original name must be saved */ put_short(((ulg)(n)) >> 16); \ } -#define seekable() 0 /* force sequential output */ -#define translate_eol 0 /* no option -a yet */ +#define seekable() 0 /* force sequential output */ +#define translate_eol 0 /* no option -a yet */ -#define tolow(c) (isupper(c) ? (c)-'A'+'a' : (c)) /* force to lower case */ +#define tolow(c) (isupper(c) ? (c)-'A'+'a' : (c)) /* force to lower case */ /* Macros for getting two-byte and four-byte header values */ #define SH(p) ((ush)(uch)((p)[0]) | ((ush)(uch)((p)[1]) << 8)) @@ -281,57 +284,58 @@ extern int save_orig_name; /* set if original name must be saved */ /* in zip.c: */ -extern int zip OF((int in, int out)); -extern int file_read OF((char *buf, unsigned size)); +extern int zip OF((int in, int out)); +extern int file_read OF((char *buf, unsigned size)); /* in unzip.c */ -extern int unzip OF((int in, int out)); +extern int unzip OF((int in, int out)); extern int check_zipfile OF((int in)); /* in unpack.c */ -extern int unpack OF((int in, int out)); +extern int unpack OF((int in, int out)); /* in unlzh.c */ -extern int unlzh OF((int in, int out)); +extern int unlzh OF((int in, int out)); /* in gzip.c */ RETSIGTYPE abort_gzip OF((void)); - /* in deflate.c */ -void lm_init OF((ush *flags)); -ulg deflate OF((void)); + /* in deflate.c */ +void lm_init OF((ush * flags)); +ulg deflate OF((void)); - /* in trees.c */ -void ct_init OF((ush *attr, int *method)); -int ct_tally OF((int dist, int lc)); -ulg flush_block OF((char *buf, ulg stored_len, int eof)); + /* in trees.c */ +void ct_init OF((ush * attr, int *method)); +int ct_tally OF((int dist, int lc)); +ulg flush_block OF((char *buf, ulg stored_len, int eof)); - /* in bits.c */ -void bi_init OF((file_t zipfile)); -void send_bits OF((int value, int length)); + /* in bits.c */ +void bi_init OF((file_t zipfile)); +void send_bits OF((int value, int length)); unsigned bi_reverse OF((unsigned value, int length)); -void bi_windup OF((void)); -void copy_block OF((char *buf, unsigned len, int header)); -extern int (*read_buf) OF((char *buf, unsigned size)); +void bi_windup OF((void)); +void copy_block OF((char *buf, unsigned len, int header)); +extern int (*read_buf) OF((char *buf, unsigned size)); /* in util.c: */ -extern int copy OF((int in, int out)); -extern ulg updcrc OF((uch *s, unsigned n)); -extern void clear_bufs OF((void)); -extern int fill_inbuf OF((int eof_ok)); -extern void flush_outbuf OF((void)); -extern void flush_window OF((void)); -extern void write_buf OF((int fd, voidp buf, unsigned cnt)); -extern char *strlwr OF((char *s)); -extern char *add_envopt OF((int *argcp, char ***argvp, char *env)); -extern void error OF((char *m)); -extern void warn OF((char *a, char *b)); -extern void read_error OF((void)); -extern void write_error OF((void)); -extern void display_ratio OF((long num, long den, FILE *file)); +extern int copy OF((int in, int out)); +extern ulg updcrc OF((uch * s, unsigned n)); +extern void clear_bufs OF((void)); +extern int fill_inbuf OF((int eof_ok)); +extern void flush_outbuf OF((void)); +extern void flush_window OF((void)); +extern void write_buf OF((int fd, voidp buf, unsigned cnt)); +extern char *strlwr OF((char *s)); +extern char *add_envopt OF((int *argcp, char ***argvp, char *env)); +extern void error OF((char *m)); +extern void warn OF((char *a, char *b)); +extern void read_error OF((void)); +extern void write_error OF((void)); +extern void display_ratio OF((long num, long den, FILE * file)); /* in inflate.c */ extern int inflate OF((void)); + /* lzw.h -- define the lzw functions. * Copyright (C) 1992-1993 Jean-loup Gailly. * This is free software; you can redistribute it and/or modify it under the @@ -345,9 +349,9 @@ extern int inflate OF((void)); #ifndef BITS # define BITS 16 #endif -#define INIT_BITS 9 /* Initial number of bits per code */ +#define INIT_BITS 9 /* Initial number of bits per code */ -#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ +#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ /* Mask 0x20 is reserved to mean a fourth header byte, and 0x40 is free. * It's a pity that old uncompress does not check bit 0x20. That makes * extension of the format actually undesirable because old compress @@ -362,13 +366,13 @@ extern int inflate OF((void)); * clear the dictionary. */ -#define LZW_RESERVED 0x60 /* reserved bits */ +#define LZW_RESERVED 0x60 /* reserved bits */ -#define CLEAR 256 /* flush the dictionary */ -#define FIRST (CLEAR+1) /* first free entry */ +#define CLEAR 256 /* flush the dictionary */ +#define FIRST (CLEAR+1) /* first free entry */ -extern int maxbits; /* max bits per code for LZW */ -extern int block_mode; /* block compress mode -C compatible with 2.0 */ +extern int maxbits; /* max bits per code for LZW */ +extern int block_mode; /* block compress mode -C compatible with 2.0 */ /* revision.h -- define the version number * Copyright (C) 1992-1993 Jean-loup Gailly. @@ -404,18 +408,18 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # define OS2 #endif -#if defined(OS2) && defined(MSDOS) /* MS C under OS/2 */ +#if defined(OS2) && defined(MSDOS) /* MS C under OS/2 */ # undef MSDOS #endif #ifdef MSDOS # ifdef __GNUC__ - /* DJGPP version 1.09+ on MS-DOS. - * The DJGPP 1.09 stat() function must be upgraded before gzip will - * fully work. - * No need for DIRENT, since <unistd.h> defines POSIX_SOURCE which - * implies DIRENT. - */ + /* DJGPP version 1.09+ on MS-DOS. + * The DJGPP 1.09 stat() function must be upgraded before gzip will + * fully work. + * No need for DIRENT, since <unistd.h> defines POSIX_SOURCE which + * implies DIRENT. + */ # define near # else # define MAXSEG_64K @@ -426,7 +430,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # else # define NO_UTIME # endif -# else /* MSC */ +# else /* MSC */ # define HAVE_SYS_UTIME_H # define NO_UTIME_H # endif @@ -441,7 +445,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # define PROTO # define STDC_HEADERS # define NO_SIZE_CHECK -# define casemap(c) tolow(c) /* Force file names to lower case */ +# define casemap(c) tolow(c) /* Force file names to lower case */ # include <io.h> # define OS_CODE 0x00 # define SET_BINARY_MODE(fd) setmode(fd, O_BINARY) @@ -494,7 +498,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # endif #endif -#ifdef WIN32 /* Windows NT */ +#ifdef WIN32 /* Windows NT */ # define HAVE_SYS_UTIME_H # define NO_UTIME_H # define PATH_SEP2 '\\' @@ -510,7 +514,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # define NO_MULTIPLE_DOTS # define MAX_EXT_CHARS 3 # define Z_SUFFIX "z" -# define casemap(c) tolow(c) /* Force file names to lower case */ +# define casemap(c) tolow(c) /* Force file names to lower case */ # endif # define OS_CODE 0x0b #endif @@ -519,10 +523,10 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # ifdef __TURBOC__ # include <alloc.h> # define DYN_ALLOC - /* Turbo C 2.0 does not accept static allocations of large arrays */ - void * fcalloc (unsigned items, unsigned size); - void fcfree (void *ptr); -# else /* MSC */ + /* Turbo C 2.0 does not accept static allocations of large arrays */ +void *fcalloc(unsigned items, unsigned size); +void fcfree(void *ptr); +# else /* MSC */ # include <malloc.h> # define fcalloc(nitems,itemsize) halloc((long)(nitems),(itemsize)) # define fcfree(ptr) hfree(ptr) @@ -565,17 +569,18 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # ifdef __GNUC__ # define DIRENT # define HAVE_UNISTD_H -# else /* SASC */ +# else /* SASC */ # define NO_STDIN_FSTAT # define SYSDIR # define NO_SYMLINK # define NO_CHOWN # define NO_FCNTL_H -# include <fcntl.h> /* for read() and write() */ +# include <fcntl.h> /* for read() and write() */ # define direct dirent - extern void _expand_args(int *argc, char ***argv); +extern void _expand_args(int *argc, char ***argv); + # define EXPAND(argc,argv) _expand_args(&argc,&argv); -# undef O_BINARY /* disable useless --ascii option */ +# undef O_BINARY /* disable useless --ascii option */ # endif #endif @@ -595,7 +600,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # define MAX_EXT_CHARS 3 # define Z_SUFFIX "z" # define NO_CHOWN -# define casemap(c) tolow(c) /* Force file names to lower case */ +# define casemap(c) tolow(c) /* Force file names to lower case */ # define NO_SYMLINK # endif #endif @@ -615,28 +620,28 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # endif #endif -#ifdef __50SERIES /* Prime/PRIMOS */ +#ifdef __50SERIES /* Prime/PRIMOS */ # define PATH_SEP '>' # define STDC_HEADERS # define NO_MEMORY_H # define NO_UTIME_H # define NO_UTIME -# define NO_CHOWN -# define NO_STDIN_FSTAT -# define NO_SIZE_CHECK +# define NO_CHOWN +# define NO_STDIN_FSTAT +# define NO_SIZE_CHECK # define NO_SYMLINK # define RECORD_IO 1 -# define casemap(c) tolow(c) /* Force file names to lower case */ +# define casemap(c) tolow(c) /* Force file names to lower case */ # define put_char(c) put_byte((c) & 0x7F) # define get_char(c) ascii2pascii(get_byte()) -# define OS_CODE 0x0F /* temporary, subject to change */ +# define OS_CODE 0x0F /* temporary, subject to change */ # ifdef SIGTERM -# undef SIGTERM /* We don't want a signal handler for SIGTERM */ +# undef SIGTERM /* We don't want a signal handler for SIGTERM */ # endif #endif -#if defined(pyr) && !defined(NOMEMCPY) /* Pyramid */ -# define NOMEMCPY /* problem with overlapping copies */ +#if defined(pyr) && !defined(NOMEMCPY) /* Pyramid */ +# define NOMEMCPY /* problem with overlapping copies */ #endif #ifdef TOPS20 @@ -644,14 +649,14 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ #endif #ifndef unix -# define NO_ST_INO /* don't rely on inode numbers */ +# define NO_ST_INO /* don't rely on inode numbers */ #endif /* Common defaults */ #ifndef OS_CODE -# define OS_CODE 0x03 /* assume Unix */ +# define OS_CODE 0x03 /* assume Unix */ #endif #ifndef PATH_SEP @@ -773,9 +778,10 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ * Local data used by the "bit string" routines. */ -local file_t zfile; /* output gzip file */ +local file_t zfile; /* output gzip file */ local unsigned short bi_buf; + /* Output buffer. bits are inserted starting at the bottom (least significant * bits). */ @@ -786,36 +792,38 @@ local unsigned short bi_buf; */ local int bi_valid; + /* Number of valid bits in bi_buf. All bits above the last valid bit * are always zero. */ int (*read_buf) OF((char *buf, unsigned size)); + /* Current input function. Set to mem_read for in-memory compression */ #ifdef DEBUG - ulg bits_sent; /* bit length of the compressed data */ +ulg bits_sent; /* bit length of the compressed data */ #endif /* =========================================================================== * Initialize the bit string routines. */ -void bi_init (zipfile) - file_t zipfile; /* output zip file, NO_FILE for in-memory compression */ +void bi_init(zipfile) +file_t zipfile; /* output zip file, NO_FILE for in-memory compression */ { - zfile = zipfile; - bi_buf = 0; - bi_valid = 0; + zfile = zipfile; + bi_buf = 0; + bi_valid = 0; #ifdef DEBUG - bits_sent = 0L; + bits_sent = 0L; #endif - /* Set the defaults for file compression. They are set by memcompress - * for in-memory compression. - */ - if (zfile != NO_FILE) { - read_buf = file_read; - } + /* Set the defaults for file compression. They are set by memcompress + * for in-memory compression. + */ + if (zfile != NO_FILE) { + read_buf = file_read; + } } /* =========================================================================== @@ -823,27 +831,27 @@ void bi_init (zipfile) * IN assertion: length <= 16 and value fits in length bits. */ void send_bits(value, length) - int value; /* value to send */ - int length; /* number of bits */ +int value; /* value to send */ +int length; /* number of bits */ { #ifdef DEBUG - Tracev((stderr," l %2d v %4x ", length, value)); - Assert(length > 0 && length <= 15, "invalid length"); - bits_sent += (ulg)length; -#endif - /* If not enough room in bi_buf, use (valid) bits from bi_buf and - * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) - * unused bits in value. - */ - if (bi_valid > (int)Buf_size - length) { - bi_buf |= (value << bi_valid); - put_short(bi_buf); - bi_buf = (ush)value >> (Buf_size - bi_valid); - bi_valid += length - Buf_size; - } else { - bi_buf |= value << bi_valid; - bi_valid += length; - } + Tracev((stderr, " l %2d v %4x ", length, value)); + Assert(length > 0 && length <= 15, "invalid length"); + bits_sent += (ulg) length; +#endif + /* If not enough room in bi_buf, use (valid) bits from bi_buf and + * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) + * unused bits in value. + */ + if (bi_valid > (int) Buf_size - length) { + bi_buf |= (value << bi_valid); + put_short(bi_buf); + bi_buf = (ush) value >> (Buf_size - bi_valid); + bi_valid += length - Buf_size; + } else { + bi_buf |= value << bi_valid; + bi_valid += length; + } } /* =========================================================================== @@ -852,15 +860,16 @@ void send_bits(value, length) * IN assertion: 1 <= len <= 15 */ unsigned bi_reverse(code, len) - unsigned code; /* the value to invert */ - int len; /* its bit length */ +unsigned code; /* the value to invert */ +int len; /* its bit length */ { - register unsigned res = 0; - do { - res |= code & 1; - code >>= 1, res <<= 1; - } while (--len > 0); - return res >> 1; + register unsigned res = 0; + + do { + res |= code & 1; + code >>= 1, res <<= 1; + } while (--len > 0); + return res >> 1; } /* =========================================================================== @@ -868,15 +877,15 @@ unsigned bi_reverse(code, len) */ void bi_windup() { - if (bi_valid > 8) { - put_short(bi_buf); - } else if (bi_valid > 0) { - put_byte(bi_buf); - } - bi_buf = 0; - bi_valid = 0; + if (bi_valid > 8) { + put_short(bi_buf); + } else if (bi_valid > 0) { + put_byte(bi_buf); + } + bi_buf = 0; + bi_valid = 0; #ifdef DEBUG - bits_sent = (bits_sent+7) & ~7; + bits_sent = (bits_sent + 7) & ~7; #endif } @@ -885,30 +894,33 @@ void bi_windup() * one's complement if requested. */ void copy_block(buf, len, header) - char *buf; /* the input data */ - unsigned len; /* its length */ - int header; /* true if block header must be written */ +char *buf; /* the input data */ +unsigned len; /* its length */ +int header; /* true if block header must be written */ { - bi_windup(); /* align on byte boundary */ + bi_windup(); /* align on byte boundary */ - if (header) { - put_short((ush)len); - put_short((ush)~len); + if (header) { + put_short((ush) len); + put_short((ush) ~ len); #ifdef DEBUG - bits_sent += 2*16; + bits_sent += 2 * 16; #endif - } + } #ifdef DEBUG - bits_sent += (ulg)len<<3; + bits_sent += (ulg) len << 3; #endif - while (len--) { + while (len--) { #ifdef CRYPT - int t; - if (key) zencode(*buf, t); + int t; + + if (key) + zencode(*buf, t); #endif - put_byte(*buf++); - } + put_byte(*buf++); + } } + /* deflate.c -- compress data using the deflation algorithm * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the @@ -987,7 +999,7 @@ void copy_block(buf, len, header) */ #ifdef SMALL_MEM -# define HASH_BITS 13 /* Number of bits used to hash strings */ +# define HASH_BITS 13 /* Number of bits used to hash strings */ #endif #ifdef MEDIUM_MEM # define HASH_BITS 14 @@ -1001,35 +1013,30 @@ void copy_block(buf, len, header) * window with tab_suffix. Check that we can do this: */ #if (WSIZE<<1) > (1<<BITS) - error: cannot overlay window with tab_suffix and prev with tab_prefix0 +error:cannot overlay window with tab_suffix and prev with tab_prefix0 #endif #if HASH_BITS > BITS-1 - error: cannot overlay head with tab_prefix1 +error:cannot overlay head with tab_prefix1 #endif - #define HASH_SIZE (unsigned)(1<<HASH_BITS) #define HASH_MASK (HASH_SIZE-1) #define WMASK (WSIZE-1) /* HASH_SIZE and WSIZE must be powers of two */ - #define NIL 0 /* Tail of hash chains */ - #define FAST 4 #define SLOW 2 /* speed options for the general purpose bit flag */ - #ifndef TOO_FAR # define TOO_FAR 4096 #endif /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ - /* =========================================================================== * Local data used by the "longest match" routines. */ - typedef ush Pos; typedef unsigned IPos; + /* A Pos is an index in the character window. We use short instead of int to * save space in the various tables. IPos is used only for parameter passing. */ @@ -1054,17 +1061,19 @@ typedef unsigned IPos; /* DECLARE(Pos, head, 1<<HASH_BITS); */ /* Heads of the hash chains or NIL. */ -ulg window_size = (ulg)2*WSIZE; +ulg window_size = (ulg) 2 * WSIZE; + /* window size, 2*WSIZE except for MMAP or BIG_MEM, where it is the * input file length plus MIN_LOOKAHEAD. */ long block_start; + /* window position at the beginning of the current output block. Gets * negative when the window is moved backwards. */ -local unsigned ins_h; /* hash index of string to be inserted */ +local unsigned ins_h; /* hash index of string to be inserted */ #define H_SHIFT ((HASH_BITS+MIN_MATCH-1)/MIN_MATCH) /* Number of bits by which ins_h and del_h must be shifted at each @@ -1074,21 +1083,24 @@ local unsigned ins_h; /* hash index of string to be inserted */ */ unsigned int near prev_length; + /* Length of the best match at previous step. Matches not greater than this * are discarded. This is used in the lazy match evaluation. */ - unsigned near strstart; /* start of string to insert */ - unsigned near match_start; /* start of matching string */ -local int eofile; /* flag set at end of input file */ -local unsigned lookahead; /* number of valid bytes ahead in window */ +unsigned near strstart; /* start of string to insert */ +unsigned near match_start; /* start of matching string */ +local int eofile; /* flag set at end of input file */ +local unsigned lookahead; /* number of valid bytes ahead in window */ unsigned near max_chain_length; + /* To speed up deflation, hash chains are never searched beyond this length. * A higher limit improves compression ratio but degrades the speed. */ local unsigned int max_lazy_match; + /* Attempt to find a better match only when the current match is strictly * smaller than this value. This mechanism is used only for compression * levels >= 4. @@ -1100,6 +1112,7 @@ local unsigned int max_lazy_match; */ unsigned near good_match; + /* Use a faster search when the previous match is longer than this */ @@ -1110,20 +1123,21 @@ unsigned near good_match; */ typedef struct config { - ush good_length; /* reduce lazy search above this match length */ - ush max_lazy; /* do not perform lazy search above this match length */ - ush nice_length; /* quit search above this match length */ - ush max_chain; + ush good_length; /* reduce lazy search above this match length */ + ush max_lazy; /* do not perform lazy search above this match length */ + ush nice_length; /* quit search above this match length */ + ush max_chain; } config; #ifdef FULL_SEARCH # define nice_match MAX_MATCH #else - int near nice_match; /* Stop searching when current match exceeds this */ +int near nice_match; /* Stop searching when current match exceeds this */ #endif -local config configuration_table = -/* 9 */ {32, 258, 258, 4096}; /* maximum compression */ +local config configuration_table = + /* 9 */ { 32, 258, 258, 4096 }; + /* maximum compression */ /* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 * For deflate_fast() (levels <= 3) good is ignored and lazy has a different @@ -1136,15 +1150,16 @@ local config configuration_table = /* =========================================================================== * Prototypes for local functions. */ -local void fill_window OF((void)); +local void fill_window OF((void)); + +int longest_match OF((IPos cur_match)); - int longest_match OF((IPos cur_match)); #ifdef ASMV - void match_init OF((void)); /* asm code initialization */ +void match_init OF((void)); /* asm code initialization */ #endif #ifdef DEBUG -local void check_match OF((IPos start, IPos match, int length)); +local void check_match OF((IPos start, IPos match, int length)); #endif /* =========================================================================== @@ -1171,54 +1186,57 @@ local void check_match OF((IPos start, IPos match, int length)); /* =========================================================================== * Initialize the "longest match" routines for a new file */ -void lm_init (flags) - ush *flags; /* general purpose bit flag */ +void lm_init(flags) +ush *flags; /* general purpose bit flag */ { - register unsigned j; + register unsigned j; - /* Initialize the hash table. */ + /* Initialize the hash table. */ #if defined(MAXSEG_64K) && HASH_BITS == 15 - for (j = 0; j < HASH_SIZE; j++) head[j] = NIL; + for (j = 0; j < HASH_SIZE; j++) + head[j] = NIL; #else - memzero((char*)head, HASH_SIZE*sizeof(*head)); + memzero((char *) head, HASH_SIZE * sizeof(*head)); #endif - /* prev will be initialized on the fly */ + /* prev will be initialized on the fly */ - /* Set the default configuration parameters: - */ - max_lazy_match = configuration_table.max_lazy; - good_match = configuration_table.good_length; + /* Set the default configuration parameters: + */ + max_lazy_match = configuration_table.max_lazy; + good_match = configuration_table.good_length; #ifndef FULL_SEARCH - nice_match = configuration_table.nice_length; + nice_match = configuration_table.nice_length; #endif - max_chain_length = configuration_table.max_chain; - *flags |= SLOW; - /* ??? reduce max_chain_length for binary files */ + max_chain_length = configuration_table.max_chain; + *flags |= SLOW; + /* ??? reduce max_chain_length for binary files */ - strstart = 0; - block_start = 0L; + strstart = 0; + block_start = 0L; #ifdef ASMV - match_init(); /* initialize the asm code */ -#endif - - lookahead = read_buf((char*)window, - sizeof(int) <= 2 ? (unsigned)WSIZE : 2*WSIZE); - - if (lookahead == 0 || lookahead == (unsigned)EOF) { - eofile = 1, lookahead = 0; - return; - } - eofile = 0; - /* Make sure that we always have enough lookahead. This is important - * if input comes from a device such as a tty. - */ - while (lookahead < MIN_LOOKAHEAD && !eofile) fill_window(); - - ins_h = 0; - for (j=0; j<MIN_MATCH-1; j++) UPDATE_HASH(ins_h, window[j]); - /* If lookahead < MIN_MATCH, ins_h is garbage, but this is - * not important since only literal bytes will be emitted. - */ + match_init(); /* initialize the asm code */ +#endif + + lookahead = read_buf((char *) window, + sizeof(int) <= 2 ? (unsigned) WSIZE : 2 * WSIZE); + + if (lookahead == 0 || lookahead == (unsigned) EOF) { + eofile = 1, lookahead = 0; + return; + } + eofile = 0; + /* Make sure that we always have enough lookahead. This is important + * if input comes from a device such as a tty. + */ + while (lookahead < MIN_LOOKAHEAD && !eofile) + fill_window(); + + ins_h = 0; + for (j = 0; j < MIN_MATCH - 1; j++) + UPDATE_HASH(ins_h, window[j]); + /* If lookahead < MIN_MATCH, ins_h is garbage, but this is + * not important since only literal bytes will be emitted. + */ } /* =========================================================================== @@ -1235,151 +1253,157 @@ void lm_init (flags) * if desired. */ int longest_match(cur_match) - IPos cur_match; /* current match */ +IPos cur_match; /* current match */ { - unsigned chain_length = max_chain_length; /* max hash chain length */ - register uch *scan = window + strstart; /* current string */ - register uch *match; /* matched string */ - register int len; /* length of current match */ - int best_len = prev_length; /* best match length so far */ - IPos limit = strstart > (IPos)MAX_DIST ? strstart - (IPos)MAX_DIST : NIL; - /* Stop when cur_match becomes <= limit. To simplify the code, - * we prevent matches with the string of window index 0. - */ + unsigned chain_length = max_chain_length; /* max hash chain length */ + register uch *scan = window + strstart; /* current string */ + register uch *match; /* matched string */ + register int len; /* length of current match */ + int best_len = prev_length; /* best match length so far */ + IPos limit = + + strstart > (IPos) MAX_DIST ? strstart - (IPos) MAX_DIST : NIL; + /* Stop when cur_match becomes <= limit. To simplify the code, + * we prevent matches with the string of window index 0. + */ /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. * It is easy to get rid of this optimization if necessary. */ #if HASH_BITS < 8 || MAX_MATCH != 258 - error: Code too clever + error:Code too clever #endif - #ifdef UNALIGNED_OK - /* Compare two bytes at a time. Note: this is not always beneficial. - * Try with and without -DUNALIGNED_OK to check. - */ - register uch *strend = window + strstart + MAX_MATCH - 1; - register ush scan_start = *(ush*)scan; - register ush scan_end = *(ush*)(scan+best_len-1); + /* Compare two bytes at a time. Note: this is not always beneficial. + * Try with and without -DUNALIGNED_OK to check. + */ + register uch *strend = window + strstart + MAX_MATCH - 1; + register ush scan_start = *(ush *) scan; + register ush scan_end = *(ush *) (scan + best_len - 1); #else - register uch *strend = window + strstart + MAX_MATCH; - register uch scan_end1 = scan[best_len-1]; - register uch scan_end = scan[best_len]; + register uch *strend = window + strstart + MAX_MATCH; + register uch scan_end1 = scan[best_len - 1]; + register uch scan_end = scan[best_len]; #endif - /* Do not waste too much time if we already have a good match: */ - if (prev_length >= good_match) { - chain_length >>= 2; - } - Assert(strstart <= window_size-MIN_LOOKAHEAD, "insufficient lookahead"); + /* Do not waste too much time if we already have a good match: */ + if (prev_length >= good_match) { + chain_length >>= 2; + } + Assert(strstart <= window_size - MIN_LOOKAHEAD, + "insufficient lookahead"); - do { - Assert(cur_match < strstart, "no future"); - match = window + cur_match; + do { + Assert(cur_match < strstart, "no future"); + match = window + cur_match; - /* Skip to next match if the match length cannot increase - * or if the match length is less than 2: - */ + /* Skip to next match if the match length cannot increase + * or if the match length is less than 2: + */ #if (defined(UNALIGNED_OK) && MAX_MATCH == 258) - /* This code assumes sizeof(unsigned short) == 2. Do not use - * UNALIGNED_OK if your compiler uses a different size. - */ - if (*(ush*)(match+best_len-1) != scan_end || - *(ush*)match != scan_start) continue; - - /* It is not necessary to compare scan[2] and match[2] since they are - * always equal when the other bytes match, given that the hash keys - * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at - * strstart+3, +5, ... up to strstart+257. We check for insufficient - * lookahead only every 4th comparison; the 128th check will be made - * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is - * necessary to put more guard bytes at the end of the window, or - * to check more often for insufficient lookahead. - */ - scan++, match++; - do { - } while (*(ush*)(scan+=2) == *(ush*)(match+=2) && - *(ush*)(scan+=2) == *(ush*)(match+=2) && - *(ush*)(scan+=2) == *(ush*)(match+=2) && - *(ush*)(scan+=2) == *(ush*)(match+=2) && - scan < strend); - /* The funny "do {}" generates better code on most compilers */ - - /* Here, scan <= window+strstart+257 */ - Assert(scan <= window+(unsigned)(window_size-1), "wild scan"); - if (*scan == *match) scan++; - - len = (MAX_MATCH - 1) - (int)(strend-scan); - scan = strend - (MAX_MATCH-1); - -#else /* UNALIGNED_OK */ - - if (match[best_len] != scan_end || - match[best_len-1] != scan_end1 || - *match != *scan || - *++match != scan[1]) continue; - - /* The check at best_len-1 can be removed because it will be made - * again later. (This heuristic is not always a win.) - * It is not necessary to compare scan[2] and match[2] since they - * are always equal when the other bytes match, given that - * the hash keys are equal and that HASH_BITS >= 8. - */ - scan += 2, match++; - - /* We check for insufficient lookahead only every 8th comparison; - * the 256th check will be made at strstart+258. - */ - do { - } while (*++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); - - len = MAX_MATCH - (int)(strend - scan); - scan = strend - MAX_MATCH; - -#endif /* UNALIGNED_OK */ - - if (len > best_len) { - match_start = cur_match; - best_len = len; - if (len >= nice_match) break; + /* This code assumes sizeof(unsigned short) == 2. Do not use + * UNALIGNED_OK if your compiler uses a different size. + */ + if (*(ush *) (match + best_len - 1) != scan_end || + *(ush *) match != scan_start) + continue; + + /* It is not necessary to compare scan[2] and match[2] since they are + * always equal when the other bytes match, given that the hash keys + * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at + * strstart+3, +5, ... up to strstart+257. We check for insufficient + * lookahead only every 4th comparison; the 128th check will be made + * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is + * necessary to put more guard bytes at the end of the window, or + * to check more often for insufficient lookahead. + */ + scan++, match++; + do { + } while (*(ush *) (scan += 2) == *(ush *) (match += 2) && + *(ush *) (scan += 2) == *(ush *) (match += 2) && + *(ush *) (scan += 2) == *(ush *) (match += 2) && + *(ush *) (scan += 2) == *(ush *) (match += 2) && + scan < strend); + /* The funny "do {}" generates better code on most compilers */ + + /* Here, scan <= window+strstart+257 */ + Assert(scan <= window + (unsigned) (window_size - 1), "wild scan"); + if (*scan == *match) + scan++; + + len = (MAX_MATCH - 1) - (int) (strend - scan); + scan = strend - (MAX_MATCH - 1); + +#else /* UNALIGNED_OK */ + + if (match[best_len] != scan_end || + match[best_len - 1] != scan_end1 || + *match != *scan || *++match != scan[1]) + continue; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match++; + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + len = MAX_MATCH - (int) (strend - scan); + scan = strend - MAX_MATCH; + +#endif /* UNALIGNED_OK */ + + if (len > best_len) { + match_start = cur_match; + best_len = len; + if (len >= nice_match) + break; #ifdef UNALIGNED_OK - scan_end = *(ush*)(scan+best_len-1); + scan_end = *(ush *) (scan + best_len - 1); #else - scan_end1 = scan[best_len-1]; - scan_end = scan[best_len]; + scan_end1 = scan[best_len - 1]; + scan_end = scan[best_len]; #endif - } - } while ((cur_match = prev[cur_match & WMASK]) > limit - && --chain_length != 0); + } + } while ((cur_match = prev[cur_match & WMASK]) > limit + && --chain_length != 0); - return best_len; + return best_len; } -#endif /* ASMV */ +#endif /* ASMV */ #ifdef DEBUG /* =========================================================================== * Check that the match at match_start is indeed a match. */ local void check_match(start, match, length) - IPos start, match; - int length; +IPos start, match; +int length; { - /* check that the match is indeed a match */ - if (memcmp((char*)window + match, - (char*)window + start, length) != EQUAL) { - fprintf(stderr, - " start %d, match %d, length %d\n", - start, match, length); - error("invalid match"); - } - if (verbose > 1) { - fprintf(stderr,"\\[%d,%d]", start-match, length); - do { putc(window[start++], stderr); } while (--length != 0); - } + /* check that the match is indeed a match */ + if (memcmp((char *) window + match, + (char *) window + start, length) != EQUAL) { + fprintf(stderr, + " start %d, match %d, length %d\n", start, match, length); + error("invalid match"); + } + if (verbose > 1) { + fprintf(stderr, "\\[%d,%d]", start - match, length); + do { + putc(window[start++], stderr); + } while (--length != 0); + } } #else # define check_match(start, match, length) @@ -1395,52 +1419,54 @@ local void check_match(start, match, length) */ local void fill_window() { - register unsigned n, m; - unsigned more = (unsigned)(window_size - (ulg)lookahead - (ulg)strstart); - /* Amount of free space at the end of the window. */ - - /* If the window is almost full and there is insufficient lookahead, - * move the upper half to the lower one to make room in the upper half. - */ - if (more == (unsigned)EOF) { - /* Very unlikely, but possible on 16 bit machine if strstart == 0 - * and lookahead == 1 (input done one byte at time) - */ - more--; - } else if (strstart >= WSIZE+MAX_DIST) { - /* By the IN assertion, the window is not empty so we can't confuse - * more == 0 with more == 64K on a 16 bit machine. - */ - Assert(window_size == (ulg)2*WSIZE, "no sliding with BIG_MEM"); - - memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); - match_start -= WSIZE; - strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ - - block_start -= (long) WSIZE; - - for (n = 0; n < HASH_SIZE; n++) { - m = head[n]; - head[n] = (Pos)(m >= WSIZE ? m-WSIZE : NIL); - } - for (n = 0; n < WSIZE; n++) { - m = prev[n]; - prev[n] = (Pos)(m >= WSIZE ? m-WSIZE : NIL); - /* If n is not on any hash chain, prev[n] is garbage but - * its value will never be used. - */ - } - more += WSIZE; - } - /* At this point, more >= 2 */ - if (!eofile) { - n = read_buf((char*)window+strstart+lookahead, more); - if (n == 0 || n == (unsigned)EOF) { - eofile = 1; - } else { - lookahead += n; - } - } + register unsigned n, m; + unsigned more = + + (unsigned) (window_size - (ulg) lookahead - (ulg) strstart); + /* Amount of free space at the end of the window. */ + + /* If the window is almost full and there is insufficient lookahead, + * move the upper half to the lower one to make room in the upper half. + */ + if (more == (unsigned) EOF) { + /* Very unlikely, but possible on 16 bit machine if strstart == 0 + * and lookahead == 1 (input done one byte at time) + */ + more--; + } else if (strstart >= WSIZE + MAX_DIST) { + /* By the IN assertion, the window is not empty so we can't confuse + * more == 0 with more == 64K on a 16 bit machine. + */ + Assert(window_size == (ulg) 2 * WSIZE, "no sliding with BIG_MEM"); + + memcpy((char *) window, (char *) window + WSIZE, (unsigned) WSIZE); + match_start -= WSIZE; + strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ + + block_start -= (long) WSIZE; + + for (n = 0; n < HASH_SIZE; n++) { + m = head[n]; + head[n] = (Pos) (m >= WSIZE ? m - WSIZE : NIL); + } + for (n = 0; n < WSIZE; n++) { + m = prev[n]; + prev[n] = (Pos) (m >= WSIZE ? m - WSIZE : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } + more += WSIZE; + } + /* At this point, more >= 2 */ + if (!eofile) { + n = read_buf((char *) window + strstart + lookahead, more); + if (n == 0 || n == (unsigned) EOF) { + eofile = 1; + } else { + lookahead += n; + } + } } /* =========================================================================== @@ -1458,105 +1484,114 @@ local void fill_window() */ ulg deflate() { - IPos hash_head; /* head of hash chain */ - IPos prev_match; /* previous match */ - int flush; /* set if current block must be flushed */ - int match_available = 0; /* set if previous match exists */ - register unsigned match_length = MIN_MATCH-1; /* length of best match */ + IPos hash_head; /* head of hash chain */ + IPos prev_match; /* previous match */ + int flush; /* set if current block must be flushed */ + int match_available = 0; /* set if previous match exists */ + register unsigned match_length = MIN_MATCH - 1; /* length of best match */ + #ifdef DEBUG - extern long isize; /* byte length of input file, for debug only */ -#endif - - /* Process the input block. */ - while (lookahead != 0) { - /* Insert the string window[strstart .. strstart+2] in the - * dictionary, and set hash_head to the head of the hash chain: - */ - INSERT_STRING(strstart, hash_head); - - /* Find the longest match, discarding those <= prev_length. - */ - prev_length = match_length, prev_match = match_start; - match_length = MIN_MATCH-1; - - if (hash_head != NIL && prev_length < max_lazy_match && - strstart - hash_head <= MAX_DIST) { - /* To simplify the code, we prevent matches with the string - * of window index 0 (in particular we have to avoid a match - * of the string with itself at the start of the input file). - */ - match_length = longest_match (hash_head); - /* longest_match() sets match_start */ - if (match_length > lookahead) match_length = lookahead; - - /* Ignore a length 3 match if it is too distant: */ - if (match_length == MIN_MATCH && strstart-match_start > TOO_FAR){ - /* If prev_match is also MIN_MATCH, match_start is garbage - * but we will ignore the current match anyway. - */ - match_length--; - } - } - /* If there was a match at the previous step and the current - * match is not better, output the previous match: - */ - if (prev_length >= MIN_MATCH && match_length <= prev_length) { - - check_match(strstart-1, prev_match, prev_length); - - flush = ct_tally(strstart-1-prev_match, prev_length - MIN_MATCH); - - /* Insert in hash table all strings up to the end of the match. - * strstart-1 and strstart are already inserted. - */ - lookahead -= prev_length-1; - prev_length -= 2; - do { - strstart++; - INSERT_STRING(strstart, hash_head); - /* strstart never exceeds WSIZE-MAX_MATCH, so there are - * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH - * these bytes are garbage, but it does not matter since the - * next lookahead bytes will always be emitted as literals. - */ - } while (--prev_length != 0); - match_available = 0; - match_length = MIN_MATCH-1; - strstart++; - if (flush) FLUSH_BLOCK(0), block_start = strstart; - - } else if (match_available) { - /* If there was no match at the previous position, output a - * single literal. If there was a match but the current match - * is longer, truncate the previous match to a single literal. - */ - Tracevv((stderr,"%c",window[strstart-1])); - if (ct_tally (0, window[strstart-1])) { - FLUSH_BLOCK(0), block_start = strstart; - } - strstart++; - lookahead--; - } else { - /* There is no previous match to compare with, wait for - * the next step to decide. - */ - match_available = 1; - strstart++; - lookahead--; - } - Assert (strstart <= isize && lookahead <= isize, "a bit too far"); - - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the next match, plus MIN_MATCH bytes to insert the - * string following the next match. - */ - while (lookahead < MIN_LOOKAHEAD && !eofile) fill_window(); - } - if (match_available) ct_tally (0, window[strstart-1]); - - return FLUSH_BLOCK(1); /* eof */ + extern long isize; /* byte length of input file, for debug only */ +#endif + + /* Process the input block. */ + while (lookahead != 0) { + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + INSERT_STRING(strstart, hash_head); + + /* Find the longest match, discarding those <= prev_length. + */ + prev_length = match_length, prev_match = match_start; + match_length = MIN_MATCH - 1; + + if (hash_head != NIL && prev_length < max_lazy_match && + strstart - hash_head <= MAX_DIST) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ + match_length = longest_match(hash_head); + /* longest_match() sets match_start */ + if (match_length > lookahead) + match_length = lookahead; + + /* Ignore a length 3 match if it is too distant: */ + if (match_length == MIN_MATCH + && strstart - match_start > TOO_FAR) { + /* If prev_match is also MIN_MATCH, match_start is garbage + * but we will ignore the current match anyway. + */ + match_length--; + } + } + /* If there was a match at the previous step and the current + * match is not better, output the previous match: + */ + if (prev_length >= MIN_MATCH && match_length <= prev_length) { + + check_match(strstart - 1, prev_match, prev_length); + + flush = + ct_tally(strstart - 1 - prev_match, + prev_length - MIN_MATCH); + + /* Insert in hash table all strings up to the end of the match. + * strstart-1 and strstart are already inserted. + */ + lookahead -= prev_length - 1; + prev_length -= 2; + do { + strstart++; + INSERT_STRING(strstart, hash_head); + /* strstart never exceeds WSIZE-MAX_MATCH, so there are + * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH + * these bytes are garbage, but it does not matter since the + * next lookahead bytes will always be emitted as literals. + */ + } while (--prev_length != 0); + match_available = 0; + match_length = MIN_MATCH - 1; + strstart++; + if (flush) + FLUSH_BLOCK(0), block_start = strstart; + + } else if (match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr, "%c", window[strstart - 1])); + if (ct_tally(0, window[strstart - 1])) { + FLUSH_BLOCK(0), block_start = strstart; + } + strstart++; + lookahead--; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ + match_available = 1; + strstart++; + lookahead--; + } + Assert(strstart <= isize && lookahead <= isize, "a bit too far"); + + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + while (lookahead < MIN_LOOKAHEAD && !eofile) + fill_window(); + } + if (match_available) + ct_tally(0, window[strstart - 1]); + + return FLUSH_BLOCK(1); /* eof */ } + /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface * Copyright (C) 1992-1993 Jean-loup Gailly * The unzip code was written and put in the public domain by Mark Adler. @@ -1611,29 +1646,33 @@ ulg deflate() #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) # include <stdlib.h> #else - extern int errno; +extern int errno; #endif #if defined(DIRENT) # include <dirent.h> - typedef struct dirent dir_type; +typedef struct dirent dir_type; + # define NLENGTH(dirent) ((int)strlen((dirent)->d_name)) # define DIR_OPT "DIRENT" #else # define NLENGTH(dirent) ((dirent)->d_namlen) # ifdef SYSDIR # include <sys/dir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "SYSDIR" # else # ifdef SYSNDIR # include <sys/ndir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "SYSNDIR" # else # ifdef NDIR # include <ndir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "NDIR" # else # define NO_DIR @@ -1652,10 +1691,11 @@ ulg deflate() # include <sys/utime.h> # define TIME_OPT "SYS_UTIME" # else - struct utimbuf { - time_t actime; - time_t modtime; - }; +struct utimbuf { + time_t actime; + time_t modtime; +}; + # define TIME_OPT "" # endif # endif @@ -1670,10 +1710,10 @@ ulg deflate() # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif -typedef RETSIGTYPE (*sig_type) OF((int)); +typedef RETSIGTYPE(*sig_type) OF((int)); #ifndef O_BINARY -# define O_BINARY 0 /* creation mode for open() */ +# define O_BINARY 0 /* creation mode for open() */ #endif #ifndef O_CREAT @@ -1693,10 +1733,10 @@ typedef RETSIGTYPE (*sig_type) OF((int)); #ifndef S_IWUSR # define S_IWUSR 0200 #endif -#define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ +#define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ #ifndef MAX_PATH_LEN -# define MAX_PATH_LEN 1024 /* max pathname length */ +# define MAX_PATH_LEN 1024 /* max pathname length */ #endif #ifndef SEEK_END @@ -1704,8 +1744,8 @@ typedef RETSIGTYPE (*sig_type) OF((int)); #endif #ifdef NO_OFF_T - typedef long off_t; - off_t lseek OF((int fd, off_t offset, int whence)); +typedef long off_t; +off_t lseek OF((int fd, off_t offset, int whence)); #endif /* Separator for file name parts (see shorten_name()) */ @@ -1717,48 +1757,48 @@ typedef RETSIGTYPE (*sig_type) OF((int)); /* global buffers */ -DECLARE(uch, inbuf, INBUFSIZ +INBUF_EXTRA); -DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); -DECLARE(ush, d_buf, DIST_BUFSIZE); -DECLARE(uch, window, 2L*WSIZE); +DECLARE(uch, inbuf, INBUFSIZ + INBUF_EXTRA); +DECLARE(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); +DECLARE(ush, d_buf, DIST_BUFSIZE); +DECLARE(uch, window, 2L * WSIZE); #ifndef MAXSEG_64K - DECLARE(ush, tab_prefix, 1L<<BITS); +DECLARE(ush, tab_prefix, 1L << BITS); #else - DECLARE(ush, tab_prefix0, 1L<<(BITS-1)); - DECLARE(ush, tab_prefix1, 1L<<(BITS-1)); +DECLARE(ush, tab_prefix0, 1L << (BITS - 1)); +DECLARE(ush, tab_prefix1, 1L << (BITS - 1)); #endif /* local variables */ -int ascii = 0; /* convert end-of-lines to local OS conventions */ -int decompress = 0; /* decompress (-d) */ -int no_name = -1; /* don't save or restore the original file name */ -int no_time = -1; /* don't save or restore the original file time */ -int foreground; /* set if program run in foreground */ -char *progname; /* program name */ -static int method = DEFLATED;/* compression method */ -static int exit_code = OK; /* program exit code */ -int save_orig_name; /* set if original name must be saved */ -int last_member; /* set for .zip and .Z files */ -int part_nb; /* number of parts in .gz file */ -long time_stamp; /* original time stamp (modification time) */ -long ifile_size; /* input file size, -1 for devices (debug only) */ -char *env; /* contents of GZIP env variable */ -char **args = NULL; /* argv pointer if GZIP env variable defined */ -char z_suffix[MAX_SUFFIX+1]; /* default suffix (can be set with --suffix) */ -int z_len; /* strlen(z_suffix) */ - -long bytes_in; /* number of input bytes */ -long bytes_out; /* number of output bytes */ -char ifname[MAX_PATH_LEN]; /* input file name */ -char ofname[MAX_PATH_LEN]; /* output file name */ -int remove_ofname = 0; /* remove output file on error */ -struct stat istat; /* status for input file */ -int ifd; /* input file descriptor */ -int ofd; /* output file descriptor */ -unsigned insize; /* valid bytes in inbuf */ -unsigned inptr; /* index of next byte to be processed in inbuf */ -unsigned outcnt; /* bytes in output buffer */ +int ascii = 0; /* convert end-of-lines to local OS conventions */ +int decompress = 0; /* decompress (-d) */ +int no_name = -1; /* don't save or restore the original file name */ +int no_time = -1; /* don't save or restore the original file time */ +int foreground; /* set if program run in foreground */ +char *progname; /* program name */ +static int method = DEFLATED; /* compression method */ +static int exit_code = OK; /* program exit code */ +int save_orig_name; /* set if original name must be saved */ +int last_member; /* set for .zip and .Z files */ +int part_nb; /* number of parts in .gz file */ +long time_stamp; /* original time stamp (modification time) */ +long ifile_size; /* input file size, -1 for devices (debug only) */ +char *env; /* contents of GZIP env variable */ +char **args = NULL; /* argv pointer if GZIP env variable defined */ +char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */ +int z_len; /* strlen(z_suffix) */ + +long bytes_in; /* number of input bytes */ +long bytes_out; /* number of output bytes */ +char ifname[MAX_PATH_LEN]; /* input file name */ +char ofname[MAX_PATH_LEN]; /* output file name */ +int remove_ofname = 0; /* remove output file on error */ +struct stat istat; /* status for input file */ +int ifd; /* input file descriptor */ +int ofd; /* output file descriptor */ +unsigned insize; /* valid bytes in inbuf */ +unsigned inptr; /* index of next byte to be processed in inbuf */ +unsigned outcnt; /* bytes in output buffer */ /* local functions */ @@ -1768,148 +1808,148 @@ unsigned outcnt; /* bytes in output buffer */ // int main (argc, argv) // int argc; // char **argv; -int gzip_main(int argc, char ** argv) +int gzip_main(int argc, char **argv) { - int result; - int inFileNum; - int outFileNum; - struct stat statBuf; - char* delFileName; - int tostdout = 0; - int fromstdin = 0; - - if (argc==1) - usage(gzip_usage); - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv)+1) == '\0') { - fromstdin = 1; - tostdout = 1; - } - while (*(++(*argv))) { - switch (**argv) { - case 'c': - tostdout = 1; - break; - default: + int result; + int inFileNum; + int outFileNum; + struct stat statBuf; + char *delFileName; + int tostdout = 0; + int fromstdin = 0; + + if (argc == 1) usage(gzip_usage); - } + + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + if (*((*argv) + 1) == '\0') { + fromstdin = 1; + tostdout = 1; + } + while (*(++(*argv))) { + switch (**argv) { + case 'c': + tostdout = 1; + break; + default: + usage(gzip_usage); + } + } } - } - foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; - if (foreground) { - (void) signal (SIGINT, (sig_type)abort_gzip); - } + foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; + if (foreground) { + (void) signal(SIGINT, (sig_type) abort_gzip); + } #ifdef SIGTERM - if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { - (void) signal(SIGTERM, (sig_type)abort_gzip); - } + if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { + (void) signal(SIGTERM, (sig_type) abort_gzip); + } #endif #ifdef SIGHUP - if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { - (void) signal(SIGHUP, (sig_type)abort_gzip); - } + if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { + (void) signal(SIGHUP, (sig_type) abort_gzip); + } #endif - strncpy(z_suffix, Z_SUFFIX, sizeof(z_suffix)-1); - z_len = strlen(z_suffix); + strncpy(z_suffix, Z_SUFFIX, sizeof(z_suffix) - 1); + z_len = strlen(z_suffix); - /* Allocate all global buffers (for DYN_ALLOC option) */ - ALLOC(uch, inbuf, INBUFSIZ +INBUF_EXTRA); - ALLOC(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); - ALLOC(ush, d_buf, DIST_BUFSIZE); - ALLOC(uch, window, 2L*WSIZE); + /* Allocate all global buffers (for DYN_ALLOC option) */ + ALLOC(uch, inbuf, INBUFSIZ + INBUF_EXTRA); + ALLOC(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); + ALLOC(ush, d_buf, DIST_BUFSIZE); + ALLOC(uch, window, 2L * WSIZE); #ifndef MAXSEG_64K - ALLOC(ush, tab_prefix, 1L<<BITS); + ALLOC(ush, tab_prefix, 1L << BITS); #else - ALLOC(ush, tab_prefix0, 1L<<(BITS-1)); - ALLOC(ush, tab_prefix1, 1L<<(BITS-1)); -#endif - - if (fromstdin==1) { - strcpy(ofname, "stdin"); - - inFileNum=fileno(stdin); - time_stamp = 0; /* time unknown by default */ - ifile_size = -1L; /* convention for unknown size */ - } else { - /* Open up the input file */ - if (*argv=='\0') - usage(gzip_usage); - strncpy(ifname, *argv, MAX_PATH_LEN); - - /* Open input fille */ - inFileNum=open( ifname, O_RDONLY); - if (inFileNum < 0) { - perror(ifname); - do_exit(WARNING); - } - /* Get the time stamp on the input file. */ - result = stat(ifname, &statBuf); - if (result < 0) { - perror(ifname); - do_exit(WARNING); + ALLOC(ush, tab_prefix0, 1L << (BITS - 1)); + ALLOC(ush, tab_prefix1, 1L << (BITS - 1)); +#endif + + if (fromstdin == 1) { + strcpy(ofname, "stdin"); + + inFileNum = fileno(stdin); + time_stamp = 0; /* time unknown by default */ + ifile_size = -1L; /* convention for unknown size */ + } else { + /* Open up the input file */ + if (*argv == '\0') + usage(gzip_usage); + strncpy(ifname, *argv, MAX_PATH_LEN); + + /* Open input fille */ + inFileNum = open(ifname, O_RDONLY); + if (inFileNum < 0) { + perror(ifname); + do_exit(WARNING); + } + /* Get the time stamp on the input file. */ + result = stat(ifname, &statBuf); + if (result < 0) { + perror(ifname); + do_exit(WARNING); + } + time_stamp = statBuf.st_ctime; + ifile_size = statBuf.st_size; } - time_stamp = statBuf.st_ctime; - ifile_size = statBuf.st_size; - } - if (tostdout==1) { - /* And get to work */ - strcpy(ofname, "stdout"); - outFileNum=fileno(stdout); - SET_BINARY_MODE(fileno(stdout)); + if (tostdout == 1) { + /* And get to work */ + strcpy(ofname, "stdout"); + outFileNum = fileno(stdout); + SET_BINARY_MODE(fileno(stdout)); - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; + clear_bufs(); /* clear input and output buffers */ + part_nb = 0; - /* Actually do the compression/decompression. */ - zip(inFileNum, outFileNum); + /* Actually do the compression/decompression. */ + zip(inFileNum, outFileNum); - } else { + } else { - /* And get to work */ - strncpy(ofname, ifname, MAX_PATH_LEN-4); - strcat(ofname, ".gz"); + /* And get to work */ + strncpy(ofname, ifname, MAX_PATH_LEN - 4); + strcat(ofname, ".gz"); - /* Open output fille */ + /* Open output fille */ #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW); + outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW); #else - outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL); -#endif - if (outFileNum < 0) { - perror(ofname); - do_exit(WARNING); - } - SET_BINARY_MODE(outFileNum); - /* Set permissions on the file */ - fchmod(outFileNum, statBuf.st_mode); - - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; - - /* Actually do the compression/decompression. */ - result=zip(inFileNum, outFileNum); - close( outFileNum); - close( inFileNum); - /* Delete the original file */ - if (result == OK) - delFileName=ifname; - else - delFileName=ofname; - - if (unlink (delFileName) < 0) { - perror (delFileName); - exit( FALSE); + outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL); +#endif + if (outFileNum < 0) { + perror(ofname); + do_exit(WARNING); + } + SET_BINARY_MODE(outFileNum); + /* Set permissions on the file */ + fchmod(outFileNum, statBuf.st_mode); + + clear_bufs(); /* clear input and output buffers */ + part_nb = 0; + + /* Actually do the compression/decompression. */ + result = zip(inFileNum, outFileNum); + close(outFileNum); + close(inFileNum); + /* Delete the original file */ + if (result == OK) + delFileName = ifname; + else + delFileName = ofname; + + if (unlink(delFileName) < 0) { + perror(delFileName); + exit(FALSE); + } } - } - do_exit(exit_code); + do_exit(exit_code); } /* trees.c -- output deflated data using Huffman coding @@ -1998,14 +2038,16 @@ int gzip_main(int argc, char ** argv) /* number of codes used to transfer the bit lengths */ -local int near extra_lbits[LENGTH_CODES] /* extra bits for each length code */ - = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; +local int near extra_lbits[LENGTH_CODES] /* extra bits for each length code */ + = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, + 4, 4, 5, 5, 5, 5, 0 }; -local int near extra_dbits[D_CODES] /* extra bits for each distance code */ - = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; +local int near extra_dbits[D_CODES] /* extra bits for each distance code */ + = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, + 10, 10, 11, 11, 12, 12, 13, 13 }; -local int near extra_blbits[BL_CODES]/* extra bits for each bit length code */ - = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; +local int near extra_blbits[BL_CODES] /* extra bits for each bit length code */ += { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7 }; #define STORED_BLOCK 0 #define STATIC_TREES 1 @@ -2047,32 +2089,24 @@ local int near extra_blbits[BL_CODES]/* extra bits for each bit length code */ * if we rely on DIST_BUFSIZE == LIT_BUFSIZE. */ #if LIT_BUFSIZE > INBUFSIZ - error cannot overlay l_buf and inbuf +error cannot overlay l_buf and inbuf #endif - #define REP_3_6 16 /* repeat previous bit length 3-6 times (2 bits of repeat count) */ - #define REPZ_3_10 17 /* repeat a zero length 3-10 times (3 bits of repeat count) */ - #define REPZ_11_138 18 -/* repeat a zero length 11-138 times (7 bits of repeat count) */ - -/* =========================================================================== +/* repeat a zero length 11-138 times (7 bits of repeat count) *//* =========================================================================== * Local data - */ - -/* Data structure describing a single value and its code string. */ -typedef struct ct_data { - union { - ush freq; /* frequency count */ - ush code; /* bit string */ - } fc; - union { - ush dad; /* father node in Huffman tree */ - ush len; /* length of bit string */ - } dl; + *//* Data structure describing a single value and its code string. */ typedef struct ct_data { + union { + ush freq; /* frequency count */ + ush code; /* bit string */ + } fc; + union { + ush dad; /* father node in Huffman tree */ + ush len; /* length of bit string */ + } dl; } ct_data; #define Freq fc.freq @@ -2083,10 +2117,11 @@ typedef struct ct_data { #define HEAP_SIZE (2*L_CODES+1) /* maximum heap size */ -local ct_data near dyn_ltree[HEAP_SIZE]; /* literal and length tree */ -local ct_data near dyn_dtree[2*D_CODES+1]; /* distance tree */ +local ct_data near dyn_ltree[HEAP_SIZE]; /* literal and length tree */ +local ct_data near dyn_dtree[2 * D_CODES + 1]; /* distance tree */ + +local ct_data near static_ltree[L_CODES + 2]; -local ct_data near static_ltree[L_CODES+2]; /* The static literal tree. Since the bit lengths are imposed, there is no * need for the L_CODES extra codes used during heap construction. However * The codes 286 and 287 are needed to build a canonical tree (see ct_init @@ -2094,65 +2129,77 @@ local ct_data near static_ltree[L_CODES+2]; */ local ct_data near static_dtree[D_CODES]; + /* The static distance tree. (Actually a trivial tree since all codes use * 5 bits.) */ -local ct_data near bl_tree[2*BL_CODES+1]; +local ct_data near bl_tree[2 * BL_CODES + 1]; + /* Huffman tree for the bit lengths */ typedef struct tree_desc { - ct_data near *dyn_tree; /* the dynamic tree */ - ct_data near *static_tree; /* corresponding static tree or NULL */ - int near *extra_bits; /* extra bits for each code or NULL */ - int extra_base; /* base index for extra_bits */ - int elems; /* max number of elements in the tree */ - int max_length; /* max bit length for the codes */ - int max_code; /* largest code with non zero frequency */ + ct_data near *dyn_tree; /* the dynamic tree */ + ct_data near *static_tree; /* corresponding static tree or NULL */ + int near *extra_bits; /* extra bits for each code or NULL */ + int extra_base; /* base index for extra_bits */ + int elems; /* max number of elements in the tree */ + int max_length; /* max bit length for the codes */ + int max_code; /* largest code with non zero frequency */ } tree_desc; local tree_desc near l_desc = -{dyn_ltree, static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS, 0}; + { dyn_ltree, static_ltree, extra_lbits, LITERALS + 1, L_CODES, + MAX_BITS, 0 }; local tree_desc near d_desc = -{dyn_dtree, static_dtree, extra_dbits, 0, D_CODES, MAX_BITS, 0}; + { dyn_dtree, static_dtree, extra_dbits, 0, D_CODES, MAX_BITS, 0 }; local tree_desc near bl_desc = -{bl_tree, (ct_data near *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS, 0}; + { bl_tree, (ct_data near *) 0, extra_blbits, 0, BL_CODES, MAX_BL_BITS, + 0 }; -local ush near bl_count[MAX_BITS+1]; +local ush near bl_count[MAX_BITS + 1]; + /* number of codes at each bit length for an optimal tree */ local uch near bl_order[BL_CODES] - = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; += { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; + /* The lengths of the bit length codes are sent in order of decreasing * probability, to avoid transmitting the lengths for unused bit length codes. */ -local int near heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ -local int heap_len; /* number of elements in the heap */ -local int heap_max; /* element of largest frequency */ +local int near heap[2 * L_CODES + 1]; /* heap used to build the Huffman trees */ +local int heap_len; /* number of elements in the heap */ +local int heap_max; /* element of largest frequency */ + /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. * The same heap array is used to build all trees. */ -local uch near depth[2*L_CODES+1]; +local uch near depth[2 * L_CODES + 1]; + /* Depth of each subtree used as tie breaker for trees of equal frequency */ -local uch length_code[MAX_MATCH-MIN_MATCH+1]; +local uch length_code[MAX_MATCH - MIN_MATCH + 1]; + /* length code for each normalized match length (0 == MIN_MATCH) */ local uch dist_code[512]; + /* distance codes. The first 256 values correspond to the distances * 3 .. 258, the last 256 values correspond to the top 8 bits of * the 15 bit distances. */ local int near base_length[LENGTH_CODES]; + /* First normalized length for each code (0 = MIN_MATCH) */ local int near base_dist[D_CODES]; + /* First normalized distance for each code (0 = distance of 1) */ #define l_buf inbuf @@ -2160,62 +2207,65 @@ local int near base_dist[D_CODES]; /* DECLARE(ush, d_buf, DIST_BUFSIZE); buffer for distances */ -local uch near flag_buf[(LIT_BUFSIZE/8)]; +local uch near flag_buf[(LIT_BUFSIZE / 8)]; + /* flag_buf is a bit array distinguishing literals from lengths in * l_buf, thus indicating the presence or absence of a distance. */ -local unsigned last_lit; /* running index in l_buf */ -local unsigned last_dist; /* running index in d_buf */ -local unsigned last_flags; /* running index in flag_buf */ -local uch flags; /* current flags not yet saved in flag_buf */ -local uch flag_bit; /* current bit used in flags */ +local unsigned last_lit; /* running index in l_buf */ +local unsigned last_dist; /* running index in d_buf */ +local unsigned last_flags; /* running index in flag_buf */ +local uch flags; /* current flags not yet saved in flag_buf */ +local uch flag_bit; /* current bit used in flags */ + /* bits are filled in flags starting at bit 0 (least significant). * Note: these flags are overkill in the current code since we don't * take advantage of DIST_BUFSIZE == LIT_BUFSIZE. */ -local ulg opt_len; /* bit length of current block with optimal trees */ -local ulg static_len; /* bit length of current block with static trees */ +local ulg opt_len; /* bit length of current block with optimal trees */ +local ulg static_len; /* bit length of current block with static trees */ + +local ulg compressed_len; /* total bit length of compressed file */ -local ulg compressed_len; /* total bit length of compressed file */ +local ulg input_len; /* total byte length of input file */ -local ulg input_len; /* total byte length of input file */ /* input_len is for debugging only since we can get it by other means. */ -ush *file_type; /* pointer to UNKNOWN, BINARY or ASCII */ -int *file_method; /* pointer to DEFLATE or STORE */ +ush *file_type; /* pointer to UNKNOWN, BINARY or ASCII */ +int *file_method; /* pointer to DEFLATE or STORE */ #ifdef DEBUG -extern ulg bits_sent; /* bit length of the compressed data */ -extern long isize; /* byte length of input file */ +extern ulg bits_sent; /* bit length of the compressed data */ +extern long isize; /* byte length of input file */ #endif -extern long block_start; /* window offset of current block */ -extern unsigned near strstart; /* window offset of current string */ +extern long block_start; /* window offset of current block */ +extern unsigned near strstart; /* window offset of current string */ /* =========================================================================== * Local (static) routines in this file. */ -local void init_block OF((void)); -local void pqdownheap OF((ct_data near *tree, int k)); -local void gen_bitlen OF((tree_desc near *desc)); -local void gen_codes OF((ct_data near *tree, int max_code)); -local void build_tree OF((tree_desc near *desc)); -local void scan_tree OF((ct_data near *tree, int max_code)); -local void send_tree OF((ct_data near *tree, int max_code)); -local int build_bl_tree OF((void)); +local void init_block OF((void)); +local void pqdownheap OF((ct_data near * tree, int k)); +local void gen_bitlen OF((tree_desc near * desc)); +local void gen_codes OF((ct_data near * tree, int max_code)); +local void build_tree OF((tree_desc near * desc)); +local void scan_tree OF((ct_data near * tree, int max_code)); +local void send_tree OF((ct_data near * tree, int max_code)); +local int build_bl_tree OF((void)); local void send_all_trees OF((int lcodes, int dcodes, int blcodes)); -local void compress_block OF((ct_data near *ltree, ct_data near *dtree)); -local void set_file_type OF((void)); +local void compress_block OF((ct_data near * ltree, ct_data near * dtree)); +local void set_file_type OF((void)); #ifndef DEBUG # define send_code(c, tree) send_bits(tree[c].Code, tree[c].Len) /* Send a code of the given tree. c and tree must not have side effects */ -#else /* DEBUG */ +#else /* DEBUG */ # define send_code(c, tree) \ { if (verbose>1) fprintf(stderr,"\ncd %3d ",(c)); \ send_bits(tree[c].Code, tree[c].Len); } @@ -2237,75 +2287,81 @@ local void set_file_type OF((void)); * (DEFLATE/STORE). */ void ct_init(attr, methodp) - ush *attr; /* pointer to internal file attribute */ - int *methodp; /* pointer to compression method */ +ush *attr; /* pointer to internal file attribute */ +int *methodp; /* pointer to compression method */ { - int n; /* iterates over tree elements */ - int bits; /* bit counter */ - int length; /* length value */ - int code; /* code value */ - int dist; /* distance index */ - - file_type = attr; - file_method = methodp; - compressed_len = input_len = 0L; - - if (static_dtree[0].Len != 0) return; /* ct_init already called */ - - /* Initialize the mapping length (0..255) -> length code (0..28) */ - length = 0; - for (code = 0; code < LENGTH_CODES-1; code++) { - base_length[code] = length; - for (n = 0; n < (1<<extra_lbits[code]); n++) { - length_code[length++] = (uch)code; - } - } - Assert (length == 256, "ct_init: length != 256"); - /* Note that the length 255 (match length 258) can be represented - * in two different ways: code 284 + 5 bits or code 285, so we - * overwrite length_code[255] to use the best encoding: - */ - length_code[length-1] = (uch)code; - - /* Initialize the mapping dist (0..32K) -> dist code (0..29) */ - dist = 0; - for (code = 0 ; code < 16; code++) { - base_dist[code] = dist; - for (n = 0; n < (1<<extra_dbits[code]); n++) { - dist_code[dist++] = (uch)code; - } - } - Assert (dist == 256, "ct_init: dist != 256"); - dist >>= 7; /* from now on, all distances are divided by 128 */ - for ( ; code < D_CODES; code++) { - base_dist[code] = dist << 7; - for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { - dist_code[256 + dist++] = (uch)code; - } - } - Assert (dist == 256, "ct_init: 256+dist != 512"); - - /* Construct the codes of the static literal tree */ - for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; - n = 0; - while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; - while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; - while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; - while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; - /* Codes 286 and 287 do not exist, but we must include them in the - * tree construction to get a canonical Huffman tree (longest code - * all ones) - */ - gen_codes((ct_data near *)static_ltree, L_CODES+1); - - /* The static distance tree is trivial: */ - for (n = 0; n < D_CODES; n++) { - static_dtree[n].Len = 5; - static_dtree[n].Code = bi_reverse(n, 5); - } - - /* Initialize the first block of the first file: */ - init_block(); + int n; /* iterates over tree elements */ + int bits; /* bit counter */ + int length; /* length value */ + int code; /* code value */ + int dist; /* distance index */ + + file_type = attr; + file_method = methodp; + compressed_len = input_len = 0L; + + if (static_dtree[0].Len != 0) + return; /* ct_init already called */ + + /* Initialize the mapping length (0..255) -> length code (0..28) */ + length = 0; + for (code = 0; code < LENGTH_CODES - 1; code++) { + base_length[code] = length; + for (n = 0; n < (1 << extra_lbits[code]); n++) { + length_code[length++] = (uch) code; + } + } + Assert(length == 256, "ct_init: length != 256"); + /* Note that the length 255 (match length 258) can be represented + * in two different ways: code 284 + 5 bits or code 285, so we + * overwrite length_code[255] to use the best encoding: + */ + length_code[length - 1] = (uch) code; + + /* Initialize the mapping dist (0..32K) -> dist code (0..29) */ + dist = 0; + for (code = 0; code < 16; code++) { + base_dist[code] = dist; + for (n = 0; n < (1 << extra_dbits[code]); n++) { + dist_code[dist++] = (uch) code; + } + } + Assert(dist == 256, "ct_init: dist != 256"); + dist >>= 7; /* from now on, all distances are divided by 128 */ + for (; code < D_CODES; code++) { + base_dist[code] = dist << 7; + for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) { + dist_code[256 + dist++] = (uch) code; + } + } + Assert(dist == 256, "ct_init: 256+dist != 512"); + + /* Construct the codes of the static literal tree */ + for (bits = 0; bits <= MAX_BITS; bits++) + bl_count[bits] = 0; + n = 0; + while (n <= 143) + static_ltree[n++].Len = 8, bl_count[8]++; + while (n <= 255) + static_ltree[n++].Len = 9, bl_count[9]++; + while (n <= 279) + static_ltree[n++].Len = 7, bl_count[7]++; + while (n <= 287) + static_ltree[n++].Len = 8, bl_count[8]++; + /* Codes 286 and 287 do not exist, but we must include them in the + * tree construction to get a canonical Huffman tree (longest code + * all ones) + */ + gen_codes((ct_data near *) static_ltree, L_CODES + 1); + + /* The static distance tree is trivial: */ + for (n = 0; n < D_CODES; n++) { + static_dtree[n].Len = 5; + static_dtree[n].Code = bi_reverse(n, 5); + } + + /* Initialize the first block of the first file: */ + init_block(); } /* =========================================================================== @@ -2313,17 +2369,21 @@ void ct_init(attr, methodp) */ local void init_block() { - int n; /* iterates over tree elements */ - - /* Initialize the trees. */ - for (n = 0; n < L_CODES; n++) dyn_ltree[n].Freq = 0; - for (n = 0; n < D_CODES; n++) dyn_dtree[n].Freq = 0; - for (n = 0; n < BL_CODES; n++) bl_tree[n].Freq = 0; - - dyn_ltree[END_BLOCK].Freq = 1; - opt_len = static_len = 0L; - last_lit = last_dist = last_flags = 0; - flags = 0; flag_bit = 1; + int n; /* iterates over tree elements */ + + /* Initialize the trees. */ + for (n = 0; n < L_CODES; n++) + dyn_ltree[n].Freq = 0; + for (n = 0; n < D_CODES; n++) + dyn_dtree[n].Freq = 0; + for (n = 0; n < BL_CODES; n++) + bl_tree[n].Freq = 0; + + dyn_ltree[END_BLOCK].Freq = 1; + opt_len = static_len = 0L; + last_lit = last_dist = last_flags = 0; + flags = 0; + flag_bit = 1; } #define SMALLEST 1 @@ -2356,25 +2416,29 @@ local void init_block() * two sons). */ local void pqdownheap(tree, k) - ct_data near *tree; /* the tree to restore */ - int k; /* node to move down */ +ct_data near *tree; /* the tree to restore */ +int k; /* node to move down */ { - int v = heap[k]; - int j = k << 1; /* left son of k */ - while (j <= heap_len) { - /* Set j to the smallest of the two sons: */ - if (j < heap_len && smaller(tree, heap[j+1], heap[j])) j++; - - /* Exit if v is smaller than both sons */ - if (smaller(tree, v, heap[j])) break; - - /* Exchange v with the smallest son */ - heap[k] = heap[j]; k = j; - - /* And continue down the tree, setting j to the left son of k */ - j <<= 1; - } - heap[k] = v; + int v = heap[k]; + int j = k << 1; /* left son of k */ + + while (j <= heap_len) { + /* Set j to the smallest of the two sons: */ + if (j < heap_len && smaller(tree, heap[j + 1], heap[j])) + j++; + + /* Exit if v is smaller than both sons */ + if (smaller(tree, v, heap[j])) + break; + + /* Exchange v with the smallest son */ + heap[k] = heap[j]; + k = j; + + /* And continue down the tree, setting j to the left son of k */ + j <<= 1; + } + heap[k] = v; } /* =========================================================================== @@ -2388,80 +2452,93 @@ local void pqdownheap(tree, k) * not null. */ local void gen_bitlen(desc) - tree_desc near *desc; /* the tree descriptor */ +tree_desc near *desc; /* the tree descriptor */ { - ct_data near *tree = desc->dyn_tree; - int near *extra = desc->extra_bits; - int base = desc->extra_base; - int max_code = desc->max_code; - int max_length = desc->max_length; - ct_data near *stree = desc->static_tree; - int h; /* heap index */ - int n, m; /* iterate over the tree elements */ - int bits; /* bit length */ - int xbits; /* extra bits */ - ush f; /* frequency */ - int overflow = 0; /* number of elements with bit length too large */ - - for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; - - /* In a first pass, compute the optimal bit lengths (which may - * overflow in the case of the bit length tree). - */ - tree[heap[heap_max]].Len = 0; /* root of the heap */ - - for (h = heap_max+1; h < HEAP_SIZE; h++) { - n = heap[h]; - bits = tree[tree[n].Dad].Len + 1; - if (bits > max_length) bits = max_length, overflow++; - tree[n].Len = (ush)bits; - /* We overwrite tree[n].Dad which is no longer needed */ - - if (n > max_code) continue; /* not a leaf node */ - - bl_count[bits]++; - xbits = 0; - if (n >= base) xbits = extra[n-base]; - f = tree[n].Freq; - opt_len += (ulg)f * (bits + xbits); - if (stree) static_len += (ulg)f * (stree[n].Len + xbits); - } - if (overflow == 0) return; - - Trace((stderr,"\nbit length overflow\n")); - /* This happens for example on obj2 and pic of the Calgary corpus */ - - /* Find the first bit length which could increase: */ - do { - bits = max_length-1; - while (bl_count[bits] == 0) bits--; - bl_count[bits]--; /* move one leaf down the tree */ - bl_count[bits+1] += 2; /* move one overflow item as its brother */ - bl_count[max_length]--; - /* The brother of the overflow item also moves one step up, - * but this does not affect bl_count[max_length] - */ - overflow -= 2; - } while (overflow > 0); - - /* Now recompute all bit lengths, scanning in increasing frequency. - * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all - * lengths instead of fixing only the wrong ones. This idea is taken - * from 'ar' written by Haruhiko Okumura.) - */ - for (bits = max_length; bits != 0; bits--) { - n = bl_count[bits]; - while (n != 0) { - m = heap[--h]; - if (m > max_code) continue; - if (tree[m].Len != (unsigned) bits) { - Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); - opt_len += ((long)bits-(long)tree[m].Len)*(long)tree[m].Freq; - tree[m].Len = (ush)bits; - } - n--; - } - } + ct_data near *tree = desc->dyn_tree; + int near *extra = desc->extra_bits; + int base = desc->extra_base; + int max_code = desc->max_code; + int max_length = desc->max_length; + ct_data near *stree = desc->static_tree; + int h; /* heap index */ + int n, m; /* iterate over the tree elements */ + int bits; /* bit length */ + int xbits; /* extra bits */ + ush f; /* frequency */ + int overflow = 0; /* number of elements with bit length too large */ + + for (bits = 0; bits <= MAX_BITS; bits++) + bl_count[bits] = 0; + + /* In a first pass, compute the optimal bit lengths (which may + * overflow in the case of the bit length tree). + */ + tree[heap[heap_max]].Len = 0; /* root of the heap */ + + for (h = heap_max + 1; h < HEAP_SIZE; h++) { + n = heap[h]; + bits = tree[tree[n].Dad].Len + 1; + if (bits > max_length) + bits = max_length, overflow++; + tree[n].Len = (ush) bits; + /* We overwrite tree[n].Dad which is no longer needed */ + + if (n > max_code) + continue; /* not a leaf node */ + + bl_count[bits]++; + xbits = 0; + if (n >= base) + xbits = extra[n - base]; + f = tree[n].Freq; + opt_len += (ulg) f *(bits + xbits); + + if (stree) + static_len += (ulg) f *(stree[n].Len + xbits); + } + if (overflow == 0) + return; + + Trace((stderr, "\nbit length overflow\n")); + /* This happens for example on obj2 and pic of the Calgary corpus */ + + /* Find the first bit length which could increase: */ + do { + bits = max_length - 1; + while (bl_count[bits] == 0) + bits--; + bl_count[bits]--; /* move one leaf down the tree */ + bl_count[bits + 1] += 2; /* move one overflow item as its brother */ + bl_count[max_length]--; + /* The brother of the overflow item also moves one step up, + * but this does not affect bl_count[max_length] + */ + overflow -= 2; + } while (overflow > 0); + + /* Now recompute all bit lengths, scanning in increasing frequency. + * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all + * lengths instead of fixing only the wrong ones. This idea is taken + * from 'ar' written by Haruhiko Okumura.) + */ + for (bits = max_length; bits != 0; bits--) { + n = bl_count[bits]; + while (n != 0) { + m = heap[--h]; + if (m > max_code) + continue; + if (tree[m].Len != (unsigned) bits) { + Trace( + (stderr, "code %d bits %d->%d\n", m, tree[m].Len, + bits)); + opt_len += + ((long) bits - + (long) tree[m].Len) * (long) tree[m].Freq; + tree[m].Len = (ush) bits; + } + n--; + } + } } /* =========================================================================== @@ -2472,37 +2549,41 @@ local void gen_bitlen(desc) * OUT assertion: the field code is set for all tree elements of non * zero code length. */ -local void gen_codes (tree, max_code) - ct_data near *tree; /* the tree to decorate */ - int max_code; /* largest code with non zero frequency */ +local void gen_codes(tree, max_code) +ct_data near *tree; /* the tree to decorate */ +int max_code; /* largest code with non zero frequency */ { - ush next_code[MAX_BITS+1]; /* next code value for each bit length */ - ush code = 0; /* running code value */ - int bits; /* bit index */ - int n; /* code index */ - - /* The distribution counts are first used to generate the code values - * without bit reversal. - */ - for (bits = 1; bits <= MAX_BITS; bits++) { - next_code[bits] = code = (code + bl_count[bits-1]) << 1; - } - /* Check that the bit counts in bl_count are consistent. The last code - * must be all ones. - */ - Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1, - "inconsistent bit counts"); - Tracev((stderr,"\ngen_codes: max_code %d ", max_code)); - - for (n = 0; n <= max_code; n++) { - int len = tree[n].Len; - if (len == 0) continue; - /* Now reverse the bits */ - tree[n].Code = bi_reverse(next_code[len]++, len); - - Tracec(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ", - n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1)); - } + ush next_code[MAX_BITS + 1]; /* next code value for each bit length */ + ush code = 0; /* running code value */ + int bits; /* bit index */ + int n; /* code index */ + + /* The distribution counts are first used to generate the code values + * without bit reversal. + */ + for (bits = 1; bits <= MAX_BITS; bits++) { + next_code[bits] = code = (code + bl_count[bits - 1]) << 1; + } + /* Check that the bit counts in bl_count are consistent. The last code + * must be all ones. + */ + Assert(code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1, + "inconsistent bit counts"); + Tracev((stderr, "\ngen_codes: max_code %d ", max_code)); + + for (n = 0; n <= max_code; n++) { + int len = tree[n].Len; + + if (len == 0) + continue; + /* Now reverse the bits */ + tree[n].Code = bi_reverse(next_code[len]++, len); + + Tracec(tree != static_ltree, + (stderr, "\nn %3d %c l %2d c %4x (%x) ", n, + (isgraph(n) ? n : ' '), len, tree[n].Code, + next_code[len] - 1)); + } } /* =========================================================================== @@ -2514,84 +2595,89 @@ local void gen_codes (tree, max_code) * also updated if stree is not null. The field max_code is set. */ local void build_tree(desc) - tree_desc near *desc; /* the tree descriptor */ +tree_desc near *desc; /* the tree descriptor */ { - ct_data near *tree = desc->dyn_tree; - ct_data near *stree = desc->static_tree; - int elems = desc->elems; - int n, m; /* iterate over heap elements */ - int max_code = -1; /* largest code with non zero frequency */ - int node = elems; /* next internal node of the tree */ - - /* Construct the initial heap, with least frequent element in - * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. - * heap[0] is not used. - */ - heap_len = 0, heap_max = HEAP_SIZE; - - for (n = 0; n < elems; n++) { - if (tree[n].Freq != 0) { - heap[++heap_len] = max_code = n; - depth[n] = 0; - } else { - tree[n].Len = 0; - } - } - - /* The pkzip format requires that at least one distance code exists, - * and that at least one bit should be sent even if there is only one - * possible code. So to avoid special checks later on we force at least - * two codes of non zero frequency. - */ - while (heap_len < 2) { - int new = heap[++heap_len] = (max_code < 2 ? ++max_code : 0); - tree[new].Freq = 1; - depth[new] = 0; - opt_len--; if (stree) static_len -= stree[new].Len; - /* new is 0 or 1 so it does not have extra bits */ - } - desc->max_code = max_code; - - /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, - * establish sub-heaps of increasing lengths: - */ - for (n = heap_len/2; n >= 1; n--) pqdownheap(tree, n); - - /* Construct the Huffman tree by repeatedly combining the least two - * frequent nodes. - */ - do { - pqremove(tree, n); /* n = node of least frequency */ - m = heap[SMALLEST]; /* m = node of next least frequency */ - - heap[--heap_max] = n; /* keep the nodes sorted by frequency */ - heap[--heap_max] = m; - - /* Create a new node father of n and m */ - tree[node].Freq = tree[n].Freq + tree[m].Freq; - depth[node] = (uch) (MAX(depth[n], depth[m]) + 1); - tree[n].Dad = tree[m].Dad = (ush)node; + ct_data near *tree = desc->dyn_tree; + ct_data near *stree = desc->static_tree; + int elems = desc->elems; + int n, m; /* iterate over heap elements */ + int max_code = -1; /* largest code with non zero frequency */ + int node = elems; /* next internal node of the tree */ + + /* Construct the initial heap, with least frequent element in + * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. + * heap[0] is not used. + */ + heap_len = 0, heap_max = HEAP_SIZE; + + for (n = 0; n < elems; n++) { + if (tree[n].Freq != 0) { + heap[++heap_len] = max_code = n; + depth[n] = 0; + } else { + tree[n].Len = 0; + } + } + + /* The pkzip format requires that at least one distance code exists, + * and that at least one bit should be sent even if there is only one + * possible code. So to avoid special checks later on we force at least + * two codes of non zero frequency. + */ + while (heap_len < 2) { + int new = heap[++heap_len] = (max_code < 2 ? ++max_code : 0); + + tree[new].Freq = 1; + depth[new] = 0; + opt_len--; + if (stree) + static_len -= stree[new].Len; + /* new is 0 or 1 so it does not have extra bits */ + } + desc->max_code = max_code; + + /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, + * establish sub-heaps of increasing lengths: + */ + for (n = heap_len / 2; n >= 1; n--) + pqdownheap(tree, n); + + /* Construct the Huffman tree by repeatedly combining the least two + * frequent nodes. + */ + do { + pqremove(tree, n); /* n = node of least frequency */ + m = heap[SMALLEST]; /* m = node of next least frequency */ + + heap[--heap_max] = n; /* keep the nodes sorted by frequency */ + heap[--heap_max] = m; + + /* Create a new node father of n and m */ + tree[node].Freq = tree[n].Freq + tree[m].Freq; + depth[node] = (uch) (MAX(depth[n], depth[m]) + 1); + tree[n].Dad = tree[m].Dad = (ush) node; #ifdef DUMP_BL_TREE - if (tree == bl_tree) { - fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", - node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); - } + if (tree == bl_tree) { + fprintf(stderr, "\nnode %d(%d), sons %d(%d) %d(%d)", + node, tree[node].Freq, n, tree[n].Freq, m, + tree[m].Freq); + } #endif - /* and insert the new node in the heap */ - heap[SMALLEST] = node++; - pqdownheap(tree, SMALLEST); + /* and insert the new node in the heap */ + heap[SMALLEST] = node++; + pqdownheap(tree, SMALLEST); - } while (heap_len >= 2); + } while (heap_len >= 2); - heap[--heap_max] = heap[SMALLEST]; + heap[--heap_max] = heap[SMALLEST]; - /* At this point, the fields freq and dad are set. We can now - * generate the bit lengths. - */ - gen_bitlen((tree_desc near *)desc); + /* At this point, the fields freq and dad are set. We can now + * generate the bit lengths. + */ + gen_bitlen((tree_desc near *) desc); - /* The field len is now set, we can generate the bit codes */ - gen_codes ((ct_data near *)tree, max_code); + /* The field len is now set, we can generate the bit codes */ + gen_codes((ct_data near *) tree, max_code); } /* =========================================================================== @@ -2600,94 +2686,107 @@ local void build_tree(desc) * counts. (The contribution of the bit length codes will be added later * during the construction of bl_tree.) */ -local void scan_tree (tree, max_code) - ct_data near *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ +local void scan_tree(tree, max_code) +ct_data near *tree; /* the tree to be scanned */ +int max_code; /* and its largest code of non zero frequency */ { - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - if (nextlen == 0) max_count = 138, min_count = 3; - tree[max_code+1].Len = (ush)0xffff; /* guard */ - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - bl_tree[curlen].Freq += count; - } else if (curlen != 0) { - if (curlen != prevlen) bl_tree[curlen].Freq++; - bl_tree[REP_3_6].Freq++; - } else if (count <= 10) { - bl_tree[REPZ_3_10].Freq++; - } else { - bl_tree[REPZ_11_138].Freq++; - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + if (nextlen == 0) + max_count = 138, min_count = 3; + tree[max_code + 1].Len = (ush) 0xffff; /* guard */ + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; + nextlen = tree[n + 1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + bl_tree[curlen].Freq += count; + } else if (curlen != 0) { + if (curlen != prevlen) + bl_tree[curlen].Freq++; + bl_tree[REP_3_6].Freq++; + } else if (count <= 10) { + bl_tree[REPZ_3_10].Freq++; + } else { + bl_tree[REPZ_11_138].Freq++; + } + count = 0; + prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } } /* =========================================================================== * Send a literal or distance tree in compressed form, using the codes in * bl_tree. */ -local void send_tree (tree, max_code) - ct_data near *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ +local void send_tree(tree, max_code) +ct_data near *tree; /* the tree to be scanned */ +int max_code; /* and its largest code of non zero frequency */ { - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - /* tree[max_code+1].Len = -1; */ /* guard already set */ - if (nextlen == 0) max_count = 138, min_count = 3; - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - do { send_code(curlen, bl_tree); } while (--count != 0); - - } else if (curlen != 0) { - if (curlen != prevlen) { - send_code(curlen, bl_tree); count--; - } - Assert(count >= 3 && count <= 6, " 3_6?"); - send_code(REP_3_6, bl_tree); send_bits(count-3, 2); - - } else if (count <= 10) { - send_code(REPZ_3_10, bl_tree); send_bits(count-3, 3); - - } else { - send_code(REPZ_11_138, bl_tree); send_bits(count-11, 7); - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + +/* tree[max_code+1].Len = -1; *//* guard already set */ + if (nextlen == 0) + max_count = 138, min_count = 3; + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; + nextlen = tree[n + 1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + do { + send_code(curlen, bl_tree); + } while (--count != 0); + + } else if (curlen != 0) { + if (curlen != prevlen) { + send_code(curlen, bl_tree); + count--; + } + Assert(count >= 3 && count <= 6, " 3_6?"); + send_code(REP_3_6, bl_tree); + send_bits(count - 3, 2); + + } else if (count <= 10) { + send_code(REPZ_3_10, bl_tree); + send_bits(count - 3, 3); + + } else { + send_code(REPZ_11_138, bl_tree); + send_bits(count - 11, 7); + } + count = 0; + prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } } /* =========================================================================== @@ -2696,30 +2795,33 @@ local void send_tree (tree, max_code) */ local int build_bl_tree() { - int max_blindex; /* index of last bit length code of non zero freq */ - - /* Determine the bit length frequencies for literal and distance trees */ - scan_tree((ct_data near *)dyn_ltree, l_desc.max_code); - scan_tree((ct_data near *)dyn_dtree, d_desc.max_code); - - /* Build the bit length tree: */ - build_tree((tree_desc near *)(&bl_desc)); - /* opt_len now includes the length of the tree representations, except - * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. - */ - - /* Determine the number of bit length codes to send. The pkzip format - * requires that at least 4 bit length codes be sent. (appnote.txt says - * 3 but the actual value used is 4.) - */ - for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { - if (bl_tree[bl_order[max_blindex]].Len != 0) break; - } - /* Update opt_len to include the bit length tree and counts */ - opt_len += 3*(max_blindex+1) + 5+5+4; - Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", opt_len, static_len)); - - return max_blindex; + int max_blindex; /* index of last bit length code of non zero freq */ + + /* Determine the bit length frequencies for literal and distance trees */ + scan_tree((ct_data near *) dyn_ltree, l_desc.max_code); + scan_tree((ct_data near *) dyn_dtree, d_desc.max_code); + + /* Build the bit length tree: */ + build_tree((tree_desc near *) (&bl_desc)); + /* opt_len now includes the length of the tree representations, except + * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. + */ + + /* Determine the number of bit length codes to send. The pkzip format + * requires that at least 4 bit length codes be sent. (appnote.txt says + * 3 but the actual value used is 4.) + */ + for (max_blindex = BL_CODES - 1; max_blindex >= 3; max_blindex--) { + if (bl_tree[bl_order[max_blindex]].Len != 0) + break; + } + /* Update opt_len to include the bit length tree and counts */ + opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4; + Tracev( + (stderr, "\ndyn trees: dyn %ld, stat %ld", opt_len, + static_len)); + + return max_blindex; } /* =========================================================================== @@ -2728,28 +2830,29 @@ local int build_bl_tree() * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. */ local void send_all_trees(lcodes, dcodes, blcodes) - int lcodes, dcodes, blcodes; /* number of codes for each tree */ +int lcodes, dcodes, blcodes; /* number of codes for each tree */ { - int rank; /* index in bl_order */ - - Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); - Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, - "too many codes"); - Tracev((stderr, "\nbl counts: ")); - send_bits(lcodes-257, 5); /* not +255 as stated in appnote.txt */ - send_bits(dcodes-1, 5); - send_bits(blcodes-4, 4); /* not -3 as stated in appnote.txt */ - for (rank = 0; rank < blcodes; rank++) { - Tracev((stderr, "\nbl code %2d ", bl_order[rank])); - send_bits(bl_tree[bl_order[rank]].Len, 3); - } - Tracev((stderr, "\nbl tree: sent %ld", bits_sent)); - - send_tree((ct_data near *)dyn_ltree, lcodes-1); /* send the literal tree */ - Tracev((stderr, "\nlit tree: sent %ld", bits_sent)); - - send_tree((ct_data near *)dyn_dtree, dcodes-1); /* send the distance tree */ - Tracev((stderr, "\ndist tree: sent %ld", bits_sent)); + int rank; /* index in bl_order */ + + Assert(lcodes >= 257 && dcodes >= 1 + && blcodes >= 4, "not enough codes"); + Assert(lcodes <= L_CODES && dcodes <= D_CODES + && blcodes <= BL_CODES, "too many codes"); + Tracev((stderr, "\nbl counts: ")); + send_bits(lcodes - 257, 5); /* not +255 as stated in appnote.txt */ + send_bits(dcodes - 1, 5); + send_bits(blcodes - 4, 4); /* not -3 as stated in appnote.txt */ + for (rank = 0; rank < blcodes; rank++) { + Tracev((stderr, "\nbl code %2d ", bl_order[rank])); + send_bits(bl_tree[bl_order[rank]].Len, 3); + } + Tracev((stderr, "\nbl tree: sent %ld", bits_sent)); + + send_tree((ct_data near *) dyn_ltree, lcodes - 1); /* send the literal tree */ + Tracev((stderr, "\nlit tree: sent %ld", bits_sent)); + + send_tree((ct_data near *) dyn_dtree, dcodes - 1); /* send the distance tree */ + Tracev((stderr, "\ndist tree: sent %ld", bits_sent)); } /* =========================================================================== @@ -2758,204 +2861,222 @@ local void send_all_trees(lcodes, dcodes, blcodes) * returns the total compressed length for the file so far. */ ulg flush_block(buf, stored_len, eof) - char *buf; /* input block, or NULL if too old */ - ulg stored_len; /* length of input block */ - int eof; /* true if this is the last block for a file */ +char *buf; /* input block, or NULL if too old */ +ulg stored_len; /* length of input block */ +int eof; /* true if this is the last block for a file */ { - ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ - int max_blindex; /* index of last bit length code of non zero freq */ - - flag_buf[last_flags] = flags; /* Save the flags for the last 8 items */ - - /* Check if the file is ascii or binary */ - if (*file_type == (ush)UNKNOWN) set_file_type(); - - /* Construct the literal and distance trees */ - build_tree((tree_desc near *)(&l_desc)); - Tracev((stderr, "\nlit data: dyn %ld, stat %ld", opt_len, static_len)); - - build_tree((tree_desc near *)(&d_desc)); - Tracev((stderr, "\ndist data: dyn %ld, stat %ld", opt_len, static_len)); - /* At this point, opt_len and static_len are the total bit lengths of - * the compressed block data, excluding the tree representations. - */ - - /* Build the bit length tree for the above two trees, and get the index - * in bl_order of the last bit length code to send. - */ - max_blindex = build_bl_tree(); - - /* Determine the best encoding. Compute first the block length in bytes */ - opt_lenb = (opt_len+3+7)>>3; - static_lenb = (static_len+3+7)>>3; - input_len += stored_len; /* for debugging only */ - - Trace((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ", - opt_lenb, opt_len, static_lenb, static_len, stored_len, - last_lit, last_dist)); - - if (static_lenb <= opt_lenb) opt_lenb = static_lenb; - - /* If compression failed and this is the first and last block, - * and if the zip file can be seeked (to rewrite the local header), - * the whole file is transformed into a stored file: - */ + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ + int max_blindex; /* index of last bit length code of non zero freq */ + + flag_buf[last_flags] = flags; /* Save the flags for the last 8 items */ + + /* Check if the file is ascii or binary */ + if (*file_type == (ush) UNKNOWN) + set_file_type(); + + /* Construct the literal and distance trees */ + build_tree((tree_desc near *) (&l_desc)); + Tracev((stderr, "\nlit data: dyn %ld, stat %ld", opt_len, static_len)); + + build_tree((tree_desc near *) (&d_desc)); + Tracev( + (stderr, "\ndist data: dyn %ld, stat %ld", opt_len, + static_len)); + /* At this point, opt_len and static_len are the total bit lengths of + * the compressed block data, excluding the tree representations. + */ + + /* Build the bit length tree for the above two trees, and get the index + * in bl_order of the last bit length code to send. + */ + max_blindex = build_bl_tree(); + + /* Determine the best encoding. Compute first the block length in bytes */ + opt_lenb = (opt_len + 3 + 7) >> 3; + static_lenb = (static_len + 3 + 7) >> 3; + input_len += stored_len; /* for debugging only */ + + Trace( + (stderr, + "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ", + opt_lenb, opt_len, static_lenb, static_len, stored_len, + last_lit, last_dist)); + + if (static_lenb <= opt_lenb) + opt_lenb = static_lenb; + + /* If compression failed and this is the first and last block, + * and if the zip file can be seeked (to rewrite the local header), + * the whole file is transformed into a stored file: + */ #ifdef FORCE_METHOD #else - if (stored_len <= opt_lenb && eof && compressed_len == 0L && seekable()) { + if (stored_len <= opt_lenb && eof && compressed_len == 0L + && seekable()) { #endif - /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */ - if (buf == (char*)0) error ("block vanished"); + /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */ + if (buf == (char *) 0) + error("block vanished"); - copy_block(buf, (unsigned)stored_len, 0); /* without header */ - compressed_len = stored_len << 3; - *file_method = STORED; + copy_block(buf, (unsigned) stored_len, 0); /* without header */ + compressed_len = stored_len << 3; + *file_method = STORED; #ifdef FORCE_METHOD #else - } else if (stored_len+4 <= opt_lenb && buf != (char*)0) { - /* 4: two words for the lengths */ + } else if (stored_len + 4 <= opt_lenb && buf != (char *) 0) { + /* 4: two words for the lengths */ #endif - /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. - * Otherwise we can't have processed more than WSIZE input bytes since - * the last block flush, because compression would have been - * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to - * transform a block into a stored block. - */ - send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */ - compressed_len = (compressed_len + 3 + 7) & ~7L; - compressed_len += (stored_len + 4) << 3; + /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. + * Otherwise we can't have processed more than WSIZE input bytes since + * the last block flush, because compression would have been + * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to + * transform a block into a stored block. + */ + send_bits((STORED_BLOCK << 1) + eof, 3); /* send block type */ + compressed_len = (compressed_len + 3 + 7) & ~7L; + compressed_len += (stored_len + 4) << 3; - copy_block(buf, (unsigned)stored_len, 1); /* with header */ + copy_block(buf, (unsigned) stored_len, 1); /* with header */ #ifdef FORCE_METHOD #else - } else if (static_lenb == opt_lenb) { -#endif - send_bits((STATIC_TREES<<1)+eof, 3); - compress_block((ct_data near *)static_ltree, (ct_data near *)static_dtree); - compressed_len += 3 + static_len; - } else { - send_bits((DYN_TREES<<1)+eof, 3); - send_all_trees(l_desc.max_code+1, d_desc.max_code+1, max_blindex+1); - compress_block((ct_data near *)dyn_ltree, (ct_data near *)dyn_dtree); - compressed_len += 3 + opt_len; - } - Assert (compressed_len == bits_sent, "bad compressed size"); - init_block(); - - if (eof) { - Assert (input_len == isize, "bad input size"); - bi_windup(); - compressed_len += 7; /* align on byte boundary */ - } - Tracev((stderr,"\ncomprlen %lu(%lu) ", compressed_len>>3, - compressed_len-7*eof)); - - return compressed_len >> 3; + } else if (static_lenb == opt_lenb) { +#endif + send_bits((STATIC_TREES << 1) + eof, 3); + compress_block((ct_data near *) static_ltree, + (ct_data near *) static_dtree); + compressed_len += 3 + static_len; + } else { + send_bits((DYN_TREES << 1) + eof, 3); + send_all_trees(l_desc.max_code + 1, d_desc.max_code + 1, + max_blindex + 1); + compress_block((ct_data near *) dyn_ltree, + (ct_data near *) dyn_dtree); + compressed_len += 3 + opt_len; + } + Assert(compressed_len == bits_sent, "bad compressed size"); + init_block(); + + if (eof) { + Assert(input_len == isize, "bad input size"); + bi_windup(); + compressed_len += 7; /* align on byte boundary */ + } + Tracev((stderr, "\ncomprlen %lu(%lu) ", compressed_len >> 3, + compressed_len - 7 * eof)); + + return compressed_len >> 3; } /* =========================================================================== * Save the match info and tally the frequency counts. Return true if * the current block must be flushed. */ -int ct_tally (dist, lc) - int dist; /* distance of matched string */ - int lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ +int ct_tally(dist, lc) +int dist; /* distance of matched string */ +int lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ { - l_buf[last_lit++] = (uch)lc; - if (dist == 0) { - /* lc is the unmatched char */ - dyn_ltree[lc].Freq++; - } else { - /* Here, lc is the match length - MIN_MATCH */ - dist--; /* dist = match distance - 1 */ - Assert((ush)dist < (ush)MAX_DIST && - (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && - (ush)d_code(dist) < (ush)D_CODES, "ct_tally: bad match"); - - dyn_ltree[length_code[lc]+LITERALS+1].Freq++; - dyn_dtree[d_code(dist)].Freq++; - - d_buf[last_dist++] = (ush)dist; - flags |= flag_bit; - } - flag_bit <<= 1; - - /* Output the flags if they fill a byte: */ - if ((last_lit & 7) == 0) { - flag_buf[last_flags++] = flags; - flags = 0, flag_bit = 1; - } - /* Try to guess if it is profitable to stop the current block here */ - if ((last_lit & 0xfff) == 0) { - /* Compute an upper bound for the compressed length */ - ulg out_length = (ulg)last_lit*8L; - ulg in_length = (ulg)strstart-block_start; - int dcode; - for (dcode = 0; dcode < D_CODES; dcode++) { - out_length += (ulg)dyn_dtree[dcode].Freq*(5L+extra_dbits[dcode]); - } - out_length >>= 3; - Trace((stderr,"\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ", - last_lit, last_dist, in_length, out_length, - 100L - out_length*100L/in_length)); - if (last_dist < last_lit/2 && out_length < in_length/2) return 1; - } - return (last_lit == LIT_BUFSIZE-1 || last_dist == DIST_BUFSIZE); - /* We avoid equality with LIT_BUFSIZE because of wraparound at 64K - * on 16 bit machines and because stored blocks are restricted to - * 64K-1 bytes. - */ + l_buf[last_lit++] = (uch) lc; + if (dist == 0) { + /* lc is the unmatched char */ + dyn_ltree[lc].Freq++; + } else { + /* Here, lc is the match length - MIN_MATCH */ + dist--; /* dist = match distance - 1 */ + Assert((ush) dist < (ush) MAX_DIST && + (ush) lc <= (ush) (MAX_MATCH - MIN_MATCH) && + (ush) d_code(dist) < (ush) D_CODES, "ct_tally: bad match"); + + dyn_ltree[length_code[lc] + LITERALS + 1].Freq++; + dyn_dtree[d_code(dist)].Freq++; + + d_buf[last_dist++] = (ush) dist; + flags |= flag_bit; + } + flag_bit <<= 1; + + /* Output the flags if they fill a byte: */ + if ((last_lit & 7) == 0) { + flag_buf[last_flags++] = flags; + flags = 0, flag_bit = 1; + } + /* Try to guess if it is profitable to stop the current block here */ + if ((last_lit & 0xfff) == 0) { + /* Compute an upper bound for the compressed length */ + ulg out_length = (ulg) last_lit * 8L; + ulg in_length = (ulg) strstart - block_start; + int dcode; + + for (dcode = 0; dcode < D_CODES; dcode++) { + out_length += + (ulg) dyn_dtree[dcode].Freq * (5L + extra_dbits[dcode]); + } + out_length >>= 3; + Trace( + (stderr, + "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ", + last_lit, last_dist, in_length, out_length, + 100L - out_length * 100L / in_length)); + if (last_dist < last_lit / 2 && out_length < in_length / 2) + return 1; + } + return (last_lit == LIT_BUFSIZE - 1 || last_dist == DIST_BUFSIZE); + /* We avoid equality with LIT_BUFSIZE because of wraparound at 64K + * on 16 bit machines and because stored blocks are restricted to + * 64K-1 bytes. + */ } /* =========================================================================== * Send the block data compressed using the given Huffman trees */ local void compress_block(ltree, dtree) - ct_data near *ltree; /* literal tree */ - ct_data near *dtree; /* distance tree */ +ct_data near *ltree; /* literal tree */ +ct_data near *dtree; /* distance tree */ { - unsigned dist; /* distance of matched string */ - int lc; /* match length or unmatched char (if dist == 0) */ - unsigned lx = 0; /* running index in l_buf */ - unsigned dx = 0; /* running index in d_buf */ - unsigned fx = 0; /* running index in flag_buf */ - uch flag = 0; /* current flags */ - unsigned code; /* the code to send */ - int extra; /* number of extra bits to send */ - - if (last_lit != 0) do { - if ((lx & 7) == 0) flag = flag_buf[fx++]; - lc = l_buf[lx++]; - if ((flag & 1) == 0) { - send_code(lc, ltree); /* send a literal byte */ - Tracecv(isgraph(lc), (stderr," '%c' ", lc)); - } else { - /* Here, lc is the match length - MIN_MATCH */ - code = length_code[lc]; - send_code(code+LITERALS+1, ltree); /* send the length code */ - extra = extra_lbits[code]; - if (extra != 0) { - lc -= base_length[code]; - send_bits(lc, extra); /* send the extra length bits */ - } - dist = d_buf[dx++]; - /* Here, dist is the match distance - 1 */ - code = d_code(dist); - Assert (code < D_CODES, "bad d_code"); - - send_code(code, dtree); /* send the distance code */ - extra = extra_dbits[code]; - if (extra != 0) { - dist -= base_dist[code]; - send_bits(dist, extra); /* send the extra distance bits */ - } - } /* literal or match pair ? */ - flag >>= 1; - } while (lx < last_lit); - - send_code(END_BLOCK, ltree); + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ + unsigned lx = 0; /* running index in l_buf */ + unsigned dx = 0; /* running index in d_buf */ + unsigned fx = 0; /* running index in flag_buf */ + uch flag = 0; /* current flags */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + + if (last_lit != 0) + do { + if ((lx & 7) == 0) + flag = flag_buf[fx++]; + lc = l_buf[lx++]; + if ((flag & 1) == 0) { + send_code(lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr, " '%c' ", lc)); + } else { + /* Here, lc is the match length - MIN_MATCH */ + code = length_code[lc]; + send_code(code + LITERALS + 1, ltree); /* send the length code */ + extra = extra_lbits[code]; + if (extra != 0) { + lc -= base_length[code]; + send_bits(lc, extra); /* send the extra length bits */ + } + dist = d_buf[dx++]; + /* Here, dist is the match distance - 1 */ + code = d_code(dist); + Assert(code < D_CODES, "bad d_code"); + + send_code(code, dtree); /* send the distance code */ + extra = extra_dbits[code]; + if (extra != 0) { + dist -= base_dist[code]; + send_bits(dist, extra); /* send the extra distance bits */ + } + } /* literal or match pair ? */ + flag >>= 1; + } while (lx < last_lit); + + send_code(END_BLOCK, ltree); } /* =========================================================================== @@ -2966,17 +3087,22 @@ local void compress_block(ltree, dtree) */ local void set_file_type() { - int n = 0; - unsigned ascii_freq = 0; - unsigned bin_freq = 0; - while (n < 7) bin_freq += dyn_ltree[n++].Freq; - while (n < 128) ascii_freq += dyn_ltree[n++].Freq; - while (n < LITERALS) bin_freq += dyn_ltree[n++].Freq; - *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; - if (*file_type == BINARY && translate_eol) { - warn("-l used on binary file", ""); - } + int n = 0; + unsigned ascii_freq = 0; + unsigned bin_freq = 0; + + while (n < 7) + bin_freq += dyn_ltree[n++].Freq; + while (n < 128) + ascii_freq += dyn_ltree[n++].Freq; + while (n < LITERALS) + bin_freq += dyn_ltree[n++].Freq; + *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; + if (*file_type == BINARY && translate_eol) { + warn("-l used on binary file", ""); + } } + /* util.c -- utility functions for gzip support * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the @@ -2997,7 +3123,7 @@ local void set_file_type() #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) # include <stdlib.h> #else - extern int errno; +extern int errno; #endif /* =========================================================================== @@ -3005,30 +3131,32 @@ local void set_file_type() * IN assertion: insize bytes have already been read in inbuf. */ int copy(in, out) - int in, out; /* input and output file descriptors */ +int in, out; /* input and output file descriptors */ { - errno = 0; - while (insize != 0 && (int)insize != EOF) { - write_buf(out, (char*)inbuf, insize); - bytes_out += insize; - insize = read(in, (char*)inbuf, INBUFSIZ); - } - if ((int)insize == EOF && errno != 0) { - read_error(); - } - bytes_in = bytes_out; - return OK; + errno = 0; + while (insize != 0 && (int) insize != EOF) { + write_buf(out, (char *) inbuf, insize); + bytes_out += insize; + insize = read(in, (char *) inbuf, INBUFSIZ); + } + if ((int) insize == EOF && errno != 0) { + read_error(); + } + bytes_in = bytes_out; + return OK; } /* ======================================================================== * Put string s in lower case, return s. */ char *strlwr(s) - char *s; +char *s; { - char *t; - for (t = s; *t; t++) *t = tolow(*t); - return s; + char *t; + + for (t = s; *t; t++) + *t = tolow(*t); + return s; } #if defined(NO_STRING_H) && !defined(STDC_HEADERS) @@ -3039,7 +3167,7 @@ char *strlwr(s) # define const # endif -int strspn OF((const char *s, const char *accept)); +int strspn OF((const char *s, const char *accept)); int strcspn OF((const char *s, const char *reject)); /* ======================================================================== @@ -3047,21 +3175,23 @@ int strcspn OF((const char *s, const char *reject)); * of s which contains only characters in accept. */ int strspn(s, accept) - const char *s; - const char *accept; +const char *s; +const char *accept; { - register const char *p; - register const char *a; - register int count = 0; - - for (p = s; *p != '\0'; ++p) { - for (a = accept; *a != '\0'; ++a) { - if (*p == *a) break; + register const char *p; + register const char *a; + register int count = 0; + + for (p = s; *p != '\0'; ++p) { + for (a = accept; *a != '\0'; ++a) { + if (*p == *a) + break; + } + if (*a == '\0') + return count; + ++count; } - if (*a == '\0') return count; - ++count; - } - return count; + return count; } /* ======================================================================== @@ -3069,104 +3199,113 @@ int strspn(s, accept) * which contains no characters from reject. */ int strcspn(s, reject) - const char *s; - const char *reject; +const char *s; +const char *reject; { - register int count = 0; + register int count = 0; - while (*s != '\0') { - if (strchr(reject, *s++) != NULL) return count; - ++count; - } - return count; + while (*s != '\0') { + if (strchr(reject, *s++) != NULL) + return count; + ++count; + } + return count; } -#endif /* NO_STRING_H */ +#endif /* NO_STRING_H */ /* ======================================================================== * Add an environment variable (if any) before argv, and update argc. * Return the expanded environment variable to be freed later, or NULL * if no options were added to argv. */ -#define SEPARATOR " \t" /* separators in env variable */ +#define SEPARATOR " \t" /* separators in env variable */ char *add_envopt(argcp, argvp, env) - int *argcp; /* pointer to argc */ - char ***argvp; /* pointer to argv */ - char *env; /* name of environment variable */ +int *argcp; /* pointer to argc */ +char ***argvp; /* pointer to argv */ +char *env; /* name of environment variable */ { - char *p; /* running pointer through env variable */ - char **oargv; /* runs through old argv array */ - char **nargv; /* runs through new argv array */ - int oargc = *argcp; /* old argc */ - int nargc = 0; /* number of arguments in env variable */ - - env = (char*)getenv(env); - if (env == NULL) return NULL; - - p = (char*)xmalloc(strlen(env)+1); - env = strcpy(p, env); /* keep env variable intact */ - - for (p = env; *p; nargc++ ) { /* move through env */ - p += strspn(p, SEPARATOR); /* skip leading separators */ - if (*p == '\0') break; - - p += strcspn(p, SEPARATOR); /* find end of word */ - if (*p) *p++ = '\0'; /* mark it */ - } - if (nargc == 0) { - free(env); - return NULL; - } - *argcp += nargc; - /* Allocate the new argv array, with an extra element just in case - * the original arg list did not end with a NULL. - */ - nargv = (char**)calloc(*argcp+1, sizeof(char *)); - if (nargv == NULL) error("out of memory"); - oargv = *argvp; - *argvp = nargv; - - /* Copy the program name first */ - if (oargc-- < 0) error("argc<=0"); - *(nargv++) = *(oargv++); - - /* Then copy the environment args */ - for (p = env; nargc > 0; nargc--) { - p += strspn(p, SEPARATOR); /* skip separators */ - *(nargv++) = p; /* store start */ - while (*p++) ; /* skip over word */ - } - - /* Finally copy the old args and add a NULL (usual convention) */ - while (oargc--) *(nargv++) = *(oargv++); - *nargv = NULL; - return env; + char *p; /* running pointer through env variable */ + char **oargv; /* runs through old argv array */ + char **nargv; /* runs through new argv array */ + int oargc = *argcp; /* old argc */ + int nargc = 0; /* number of arguments in env variable */ + + env = (char *) getenv(env); + if (env == NULL) + return NULL; + + p = (char *) xmalloc(strlen(env) + 1); + env = strcpy(p, env); /* keep env variable intact */ + + for (p = env; *p; nargc++) { /* move through env */ + p += strspn(p, SEPARATOR); /* skip leading separators */ + if (*p == '\0') + break; + + p += strcspn(p, SEPARATOR); /* find end of word */ + if (*p) + *p++ = '\0'; /* mark it */ + } + if (nargc == 0) { + free(env); + return NULL; + } + *argcp += nargc; + /* Allocate the new argv array, with an extra element just in case + * the original arg list did not end with a NULL. + */ + nargv = (char **) calloc(*argcp + 1, sizeof(char *)); + + if (nargv == NULL) + error("out of memory"); + oargv = *argvp; + *argvp = nargv; + + /* Copy the program name first */ + if (oargc-- < 0) + error("argc<=0"); + *(nargv++) = *(oargv++); + + /* Then copy the environment args */ + for (p = env; nargc > 0; nargc--) { + p += strspn(p, SEPARATOR); /* skip separators */ + *(nargv++) = p; /* store start */ + while (*p++); /* skip over word */ + } + + /* Finally copy the old args and add a NULL (usual convention) */ + while (oargc--) + *(nargv++) = *(oargv++); + *nargv = NULL; + return env; } + /* ======================================================================== * Display compression ratio on the given stream on 6 characters. */ void display_ratio(num, den, file) - long num; - long den; - FILE *file; +long num; +long den; +FILE *file; { - long ratio; /* 1000 times the compression ratio */ - - if (den == 0) { - ratio = 0; /* no compression */ - } else if (den < 2147483L) { /* (2**31 -1)/1000 */ - ratio = 1000L*num/den; - } else { - ratio = num/(den/1000L); - } - if (ratio < 0) { - putc('-', file); - ratio = -ratio; - } else { - putc(' ', file); - } - fprintf(file, "%2ld.%1ld%%", ratio / 10L, ratio % 10L); + long ratio; /* 1000 times the compression ratio */ + + if (den == 0) { + ratio = 0; /* no compression */ + } else if (den < 2147483L) { /* (2**31 -1)/1000 */ + ratio = 1000L * num / den; + } else { + ratio = num / (den / 1000L); + } + if (ratio < 0) { + putc('-', file); + ratio = -ratio; + } else { + putc(' ', file); + } + fprintf(file, "%2ld.%1ld%%", ratio / 10L, ratio % 10L); } @@ -3186,8 +3325,8 @@ void display_ratio(num, den, file) # include <fcntl.h> #endif -local ulg crc; /* crc on uncompressed file data */ -long header_bytes; /* number of bytes in gzip header */ +local ulg crc; /* crc on uncompressed file data */ +long header_bytes; /* number of bytes in gzip header */ /* =========================================================================== * Deflate in to out. @@ -3195,48 +3334,48 @@ long header_bytes; /* number of bytes in gzip header */ * The variables time_stamp and save_orig_name are initialized. */ int zip(in, out) - int in, out; /* input and output file descriptors */ +int in, out; /* input and output file descriptors */ { - uch flags = 0; /* general purpose bit flags */ - ush attr = 0; /* ascii/binary flag */ - ush deflate_flags = 0; /* pkzip -es, -en or -ex equivalent */ + uch flags = 0; /* general purpose bit flags */ + ush attr = 0; /* ascii/binary flag */ + ush deflate_flags = 0; /* pkzip -es, -en or -ex equivalent */ - ifd = in; - ofd = out; - outcnt = 0; + ifd = in; + ofd = out; + outcnt = 0; - /* Write the header to the gzip file. See algorithm.doc for the format */ + /* Write the header to the gzip file. See algorithm.doc for the format */ - method = DEFLATED; - put_byte(GZIP_MAGIC[0]); /* magic header */ - put_byte(GZIP_MAGIC[1]); - put_byte(DEFLATED); /* compression method */ + method = DEFLATED; + put_byte(GZIP_MAGIC[0]); /* magic header */ + put_byte(GZIP_MAGIC[1]); + put_byte(DEFLATED); /* compression method */ - put_byte(flags); /* general flags */ - put_long(time_stamp); + put_byte(flags); /* general flags */ + put_long(time_stamp); - /* Write deflated file to zip file */ - crc = updcrc(0, 0); + /* Write deflated file to zip file */ + crc = updcrc(0, 0); - bi_init(out); - ct_init(&attr, &method); - lm_init(&deflate_flags); + bi_init(out); + ct_init(&attr, &method); + lm_init(&deflate_flags); - put_byte((uch)deflate_flags); /* extra flags */ - put_byte(OS_CODE); /* OS identifier */ + put_byte((uch) deflate_flags); /* extra flags */ + put_byte(OS_CODE); /* OS identifier */ - header_bytes = (long)outcnt; + header_bytes = (long) outcnt; - (void)deflate(); + (void) deflate(); - /* Write the crc and uncompressed size */ - put_long(crc); - put_long(isize); - header_bytes += 2*sizeof(long); + /* Write the crc and uncompressed size */ + put_long(crc); + put_long(isize); + header_bytes += 2 * sizeof(long); - flush_outbuf(); - return OK; + flush_outbuf(); + return OK; } @@ -3246,18 +3385,19 @@ int zip(in, out) * IN assertion: size >= 2 (for end-of-line translation) */ int file_read(buf, size) - char *buf; - unsigned size; +char *buf; +unsigned size; { - unsigned len; + unsigned len; - Assert(insize == 0, "inbuf not empty"); + Assert(insize == 0, "inbuf not empty"); - len = read(ifd, buf, size); - if (len == (unsigned)(-1) || len == 0) return (int)len; + len = read(ifd, buf, size); + if (len == (unsigned) (-1) || len == 0) + return (int) len; - crc = updcrc((uch*)buf, len); - isize += (ulg)len; - return (int)len; + crc = updcrc((uch *) buf, len); + isize += (ulg) len; + return (int) len; } #endif diff --git a/archival/tar.c b/archival/tar.c index 6496231ae..87b5d2176 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini tar implementation for busybox based on code taken from sash. * @@ -40,27 +41,29 @@ #include <utime.h> #include <sys/types.h> #include <sys/sysmacros.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ #ifdef BB_FEATURE_TAR_CREATE static const char tar_usage[] = -"tar -[cxtvOf] [tarFileName] [FILE] ...\n\n" -"Create, extract, or list files from a tar file.\n\n" -"Options:\n" -"\tc=create, x=extract, t=list contents, v=verbose,\n" -"\tO=extract to stdout, f=tarfile or \"-\" for stdin\n"; + "tar -[cxtvOf] [tarFileName] [FILE] ...\n\n" + "Create, extract, or list files from a tar file.\n\n" + "Options:\n" + + "\tc=create, x=extract, t=list contents, v=verbose,\n" + "\tO=extract to stdout, f=tarfile or \"-\" for stdin\n"; #else static const char tar_usage[] = -"tar -[xtvOf] [tarFileName] [FILE] ...\n\n" -"Extract, or list files stored in a tar file. This\n" -"version of tar does not support creation of tar files.\n\n" -"Options:\n" -"\tx=extract, t=list contents, v=verbose,\n" -"\tO=extract to stdout, f=tarfile or \"-\" for stdin\n"; + "tar -[xtvOf] [tarFileName] [FILE] ...\n\n" + "Extract, or list files stored in a tar file. This\n" + "version of tar does not support creation of tar files.\n\n" + "Options:\n" + + "\tx=extract, t=list contents, v=verbose,\n" + "\tO=extract to stdout, f=tarfile or \"-\" for stdin\n"; #endif @@ -78,22 +81,22 @@ static const char tar_usage[] = * with zero padding. We only process this information minimally. */ typedef struct { - char name[TAR_NAME_SIZE]; - char mode[8]; - char uid[8]; - char gid[8]; - char size[12]; - char mtime[12]; - char checkSum[8]; - char typeFlag; - char linkName[TAR_NAME_SIZE]; - char magic[6]; - char version[2]; - char uname[32]; - char gname[32]; - char devMajor[8]; - char devMinor[8]; - char prefix[155]; + char name[TAR_NAME_SIZE]; + char mode[8]; + char uid[8]; + char gid[8]; + char size[12]; + char mtime[12]; + char checkSum[8]; + char typeFlag; + char linkName[TAR_NAME_SIZE]; + char magic[6]; + char version[2]; + char uname[32]; + char gname[32]; + char devMajor[8]; + char devMinor[8]; + char prefix[155]; } TarHeader; #define TAR_MAGIC "ustar" @@ -113,7 +116,7 @@ static int createFlag; static int verboseFlag; static int tostdoutFlag; -static int inHeader; // <- check me +static int inHeader; // <- check me static int badHeader; static int errorFlag; static int skipFileFlag; @@ -140,141 +143,145 @@ static ino_t tarInode; /* * Local procedures to restore files from a tar file. */ -static void readTarFile (int fileCount, char **fileTable); -static void readData (const char *cp, int count); -static long getOctal (const char *cp, int len); +static void readTarFile(int fileCount, char **fileTable); +static void readData(const char *cp, int count); +static long getOctal(const char *cp, int len); + +static void readHeader(const TarHeader * hp, -static void readHeader (const TarHeader * hp, - int fileCount, char **fileTable); + int fileCount, char **fileTable); -static int wantFileName (const char *fileName, - int fileCount, char **fileTable); +static int wantFileName(const char *fileName, + + int fileCount, char **fileTable); #ifdef BB_FEATURE_TAR_CREATE /* * Local procedures to save files into a tar file. */ -static void saveFile (const char *fileName, int seeLinks); +static void saveFile(const char *fileName, int seeLinks); + +static void saveRegularFile(const char *fileName, -static void saveRegularFile (const char *fileName, - const struct stat *statbuf); + const struct stat *statbuf); -static void saveDirectory (const char *fileName, - const struct stat *statbuf); +static void saveDirectory(const char *fileName, -static void writeHeader (const char *fileName, const struct stat *statbuf); + const struct stat *statbuf); -static void writeTarFile (int fileCount, char **fileTable); -static void writeTarBlock (const char *buf, int len); -static int putOctal (char *cp, int len, long value); +static void writeHeader(const char *fileName, const struct stat *statbuf); + +static void writeTarFile(int fileCount, char **fileTable); +static void writeTarBlock(const char *buf, int len); +static int putOctal(char *cp, int len, long value); #endif -extern int tar_main (int argc, char **argv) +extern int tar_main(int argc, char **argv) { - const char *options; - - argc--; - argv++; - - if (argc < 1) - usage( tar_usage); - - - errorFlag = FALSE; - extractFlag = FALSE; - createFlag = FALSE; - listFlag = FALSE; - verboseFlag = FALSE; - tostdoutFlag = FALSE; - tarName = NULL; - tarDev = 0; - tarInode = 0; - tarFd = -1; - - /* - * Parse the options. - */ - if (**argv == '-') - options = (*argv++) + 1; - else - options = (*argv++); - argc--; - - for (; *options; options++) { - switch (*options) { - case 'f': - if (tarName != NULL) { - fprintf (stderr, "Only one 'f' option allowed\n"); - - exit (FALSE); - } - - tarName = *argv++; - argc--; - - break; - - case 't': - if (extractFlag == TRUE || createFlag == TRUE ) - goto flagError; - listFlag = TRUE; - break; - - case 'x': - if (listFlag == TRUE || createFlag == TRUE ) - goto flagError; - extractFlag = TRUE; - break; - case 'c': - if (extractFlag == TRUE || listFlag == TRUE) - goto flagError; - createFlag = TRUE; - break; - - case 'v': - verboseFlag = TRUE; - break; - - case 'O': - tostdoutFlag = TRUE; - break; - - case '-': - usage( tar_usage); - break; - - default: - fprintf (stderr, "Unknown tar flag '%c'\n" - "Try `tar --help' for more information\n", - *options); - exit (FALSE); + const char *options; + + argc--; + argv++; + + if (argc < 1) + usage(tar_usage); + + + errorFlag = FALSE; + extractFlag = FALSE; + createFlag = FALSE; + listFlag = FALSE; + verboseFlag = FALSE; + tostdoutFlag = FALSE; + tarName = NULL; + tarDev = 0; + tarInode = 0; + tarFd = -1; + + /* + * Parse the options. + */ + if (**argv == '-') + options = (*argv++) + 1; + else + options = (*argv++); + argc--; + + for (; *options; options++) { + switch (*options) { + case 'f': + if (tarName != NULL) { + fprintf(stderr, "Only one 'f' option allowed\n"); + + exit(FALSE); + } + + tarName = *argv++; + argc--; + + break; + + case 't': + if (extractFlag == TRUE || createFlag == TRUE) + goto flagError; + listFlag = TRUE; + break; + + case 'x': + if (listFlag == TRUE || createFlag == TRUE) + goto flagError; + extractFlag = TRUE; + break; + case 'c': + if (extractFlag == TRUE || listFlag == TRUE) + goto flagError; + createFlag = TRUE; + break; + + case 'v': + verboseFlag = TRUE; + break; + + case 'O': + tostdoutFlag = TRUE; + break; + + case '-': + usage(tar_usage); + break; + + default: + fprintf(stderr, "Unknown tar flag '%c'\n" + "Try `tar --help' for more information\n", *options); + exit(FALSE); + } } - } - /* - * Do the correct type of action supplying the rest of the - * command line arguments as the list of files to process. - */ - if (createFlag==TRUE) { + /* + * Do the correct type of action supplying the rest of the + * command line arguments as the list of files to process. + */ + if (createFlag == TRUE) { #ifndef BB_FEATURE_TAR_CREATE - fprintf (stderr, "This version of tar was not compiled with tar creation support.\n" ); - exit (FALSE); + fprintf(stderr, + "This version of tar was not compiled with tar creation support.\n"); + exit(FALSE); #else - writeTarFile (argc, argv); -#endif - } else { - readTarFile (argc, argv); - } - if (errorFlag==TRUE) { - fprintf (stderr, "\n"); - } - exit (!errorFlag); - -flagError: - fprintf (stderr, "Exactly one of 'c', 'x' or 't' must be specified\n"); - exit (FALSE); + writeTarFile(argc, argv); +#endif + } else { + readTarFile(argc, argv); + } + if (errorFlag == TRUE) { + fprintf(stderr, "\n"); + } + exit(!errorFlag); + + flagError: + fprintf(stderr, "Exactly one of 'c', 'x' or 't' must be specified\n"); + exit(FALSE); } @@ -282,120 +289,120 @@ flagError: * Read a tar file and extract or list the specified files within it. * If the list is empty than all files are extracted or listed. */ -static void readTarFile (int fileCount, char **fileTable) +static void readTarFile(int fileCount, char **fileTable) { - const char *cp; - int cc; - int inCc; - int blockSize; - char buf[BUF_SIZE]; - - skipFileFlag = FALSE; - badHeader = FALSE; - warnedRoot = FALSE; - eofFlag = FALSE; - inHeader = TRUE; - inCc = 0; - dataCc = 0; - outFd = -1; - blockSize = sizeof (buf); - cp = buf; - - /* - * Open the tar file for reading. - */ - if ((tarName == NULL) || !strcmp (tarName, "-")) { - tarFd = fileno(stdin); - } else - tarFd = open (tarName, O_RDONLY); - - if (tarFd < 0) { - perror (tarName); - errorFlag = TRUE; - return; - } - - /* - * Read blocks from the file until an end of file header block - * has been seen. (A real end of file from a read is an error.) - */ - while (eofFlag==FALSE) { + const char *cp; + int cc; + int inCc; + int blockSize; + char buf[BUF_SIZE]; + + skipFileFlag = FALSE; + badHeader = FALSE; + warnedRoot = FALSE; + eofFlag = FALSE; + inHeader = TRUE; + inCc = 0; + dataCc = 0; + outFd = -1; + blockSize = sizeof(buf); + cp = buf; + /* - * Read the next block of data if necessary. - * This will be a large block if possible, which we will - * then process in the small tar blocks. + * Open the tar file for reading. */ - if (inCc <= 0) { - cp = buf; - inCc = fullRead (tarFd, buf, blockSize); - - if (inCc < 0) { - perror (tarName); - errorFlag = TRUE; - goto done; - } + if ((tarName == NULL) || !strcmp(tarName, "-")) { + tarFd = fileno(stdin); + } else + tarFd = open(tarName, O_RDONLY); - if (inCc == 0) { - fprintf (stderr, - "Unexpected end of file from \"%s\"", tarName); + if (tarFd < 0) { + perror(tarName); errorFlag = TRUE; - goto done; - } + return; } /* - * If we are expecting a header block then examine it. + * Read blocks from the file until an end of file header block + * has been seen. (A real end of file from a read is an error.) */ - if (inHeader==TRUE) { - readHeader ((const TarHeader *) cp, fileCount, fileTable); - - cp += TAR_BLOCK_SIZE; - inCc -= TAR_BLOCK_SIZE; - - continue; + while (eofFlag == FALSE) { + /* + * Read the next block of data if necessary. + * This will be a large block if possible, which we will + * then process in the small tar blocks. + */ + if (inCc <= 0) { + cp = buf; + inCc = fullRead(tarFd, buf, blockSize); + + if (inCc < 0) { + perror(tarName); + errorFlag = TRUE; + goto done; + } + + if (inCc == 0) { + fprintf(stderr, + "Unexpected end of file from \"%s\"", tarName); + errorFlag = TRUE; + goto done; + } + } + + /* + * If we are expecting a header block then examine it. + */ + if (inHeader == TRUE) { + readHeader((const TarHeader *) cp, fileCount, fileTable); + + cp += TAR_BLOCK_SIZE; + inCc -= TAR_BLOCK_SIZE; + + continue; + } + + /* + * We are currently handling the data for a file. + * Process the minimum of the amount of data we have available + * and the amount left to be processed for the file. + */ + cc = inCc; + + if (cc > dataCc) + cc = dataCc; + + readData(cp, cc); + + /* + * If the amount left isn't an exact multiple of the tar block + * size then round it up to the next block boundary since there + * is padding at the end of the file. + */ + if (cc % TAR_BLOCK_SIZE) + cc += TAR_BLOCK_SIZE - (cc % TAR_BLOCK_SIZE); + + cp += cc; + inCc -= cc; } + done: /* - * We are currently handling the data for a file. - * Process the minimum of the amount of data we have available - * and the amount left to be processed for the file. + * Close the tar file if needed. */ - cc = inCc; - - if (cc > dataCc) - cc = dataCc; - - readData (cp, cc); + if ((tarFd >= 0) && (close(tarFd) < 0)) + perror(tarName); /* - * If the amount left isn't an exact multiple of the tar block - * size then round it up to the next block boundary since there - * is padding at the end of the file. + * Close the output file if needed. + * This is only done here on a previous error and so no + * message is required on errors. */ - if (cc % TAR_BLOCK_SIZE) - cc += TAR_BLOCK_SIZE - (cc % TAR_BLOCK_SIZE); - - cp += cc; - inCc -= cc; - } - - done: - /* - * Close the tar file if needed. - */ - if ((tarFd >= 0) && (close (tarFd) < 0)) - perror (tarName); - - /* - * Close the output file if needed. - * This is only done here on a previous error and so no - * message is required on errors. - */ - if (tostdoutFlag == FALSE) { - if (outFd >= 0) { - close (outFd); + if (tostdoutFlag == FALSE) { + if (outFd >= 0) { + close(outFd); + } } - } } @@ -405,304 +412,305 @@ static void readTarFile (int fileCount, char **fileTable) * the end of the tar file. */ static void -readHeader (const TarHeader * hp, int fileCount, char **fileTable) +readHeader(const TarHeader * hp, int fileCount, char **fileTable) { - int checkSum; - int cc; - int hardLink; - int softLink; - int devFileFlag; - unsigned int major; - unsigned int minor; - long size; - struct utimbuf utb; - - /* - * If the block is completely empty, then this is the end of the - * archive file. If the name is null, then just skip this header. - */ - outName = hp->name; - - if (*outName == '\0') { - for (cc = TAR_BLOCK_SIZE; cc > 0; cc--) { - if (*outName++) + int checkSum; + int cc; + int hardLink; + int softLink; + int devFileFlag; + unsigned int major; + unsigned int minor; + long size; + struct utimbuf utb; + + /* + * If the block is completely empty, then this is the end of the + * archive file. If the name is null, then just skip this header. + */ + outName = hp->name; + + if (*outName == '\0') { + for (cc = TAR_BLOCK_SIZE; cc > 0; cc--) { + if (*outName++) + return; + } + + eofFlag = TRUE; + return; } - eofFlag = TRUE; - - return; - } - - /* - * There is another file in the archive to examine. - * Extract the encoded information and check it. - */ - mode = getOctal (hp->mode, sizeof (hp->mode)); - uid = getOctal (hp->uid, sizeof (hp->uid)); - gid = getOctal (hp->gid, sizeof (hp->gid)); - size = getOctal (hp->size, sizeof (hp->size)); - mtime = getOctal (hp->mtime, sizeof (hp->mtime)); - checkSum = getOctal (hp->checkSum, sizeof (hp->checkSum)); - major = getOctal (hp->devMajor, sizeof (hp->devMajor)); - minor = getOctal (hp->devMinor, sizeof (hp->devMinor)); - - if ((mode < 0) || (uid < 0) || (gid < 0) || (size < 0)) { - if (badHeader==FALSE) - fprintf (stderr, "Bad tar header, skipping\n"); - - badHeader = TRUE; - - return; - } - - badHeader = FALSE; - skipFileFlag = FALSE; - devFileFlag = FALSE; - - /* - * Check for the file modes. - */ - hardLink = ((hp->typeFlag == TAR_TYPE_HARD_LINK) || - (hp->typeFlag == TAR_TYPE_HARD_LINK - '0')); - - softLink = ((hp->typeFlag == TAR_TYPE_SOFT_LINK) || - (hp->typeFlag == TAR_TYPE_SOFT_LINK - '0')); - - /* - * Check for a directory. - */ - if (outName[strlen (outName) - 1] == '/') - mode |= S_IFDIR; - - /* - * Check for absolute paths in the file. - * If we find any, then warn the user and make them relative. - */ - if (*outName == '/') { - while (*outName == '/') - outName++; - - if (warnedRoot==FALSE) { - fprintf (stderr, - "Absolute path detected, removing leading slashes\n"); - } + /* + * There is another file in the archive to examine. + * Extract the encoded information and check it. + */ + mode = getOctal(hp->mode, sizeof(hp->mode)); + uid = getOctal(hp->uid, sizeof(hp->uid)); + gid = getOctal(hp->gid, sizeof(hp->gid)); + size = getOctal(hp->size, sizeof(hp->size)); + mtime = getOctal(hp->mtime, sizeof(hp->mtime)); + checkSum = getOctal(hp->checkSum, sizeof(hp->checkSum)); + major = getOctal(hp->devMajor, sizeof(hp->devMajor)); + minor = getOctal(hp->devMinor, sizeof(hp->devMinor)); - warnedRoot = TRUE; - } - - /* - * See if we want this file to be restored. - * If not, then set up to skip it. - */ - if (wantFileName (outName, fileCount, fileTable) == FALSE) { - if ( !hardLink && !softLink && (S_ISREG (mode) || S_ISCHR (mode) - || S_ISBLK (mode) || S_ISSOCK(mode) || S_ISFIFO(mode) ) ) { - inHeader = (size == 0)? TRUE : FALSE; - dataCc = size; - } + if ((mode < 0) || (uid < 0) || (gid < 0) || (size < 0)) { + if (badHeader == FALSE) + fprintf(stderr, "Bad tar header, skipping\n"); - skipFileFlag = TRUE; - - return; - } - - /* - * This file is to be handled. - * If we aren't extracting then just list information about the file. - */ - if (extractFlag==FALSE) { - if (verboseFlag==TRUE) { - printf ("%s %3d/%-d ", modeString (mode), uid, gid); - if( S_ISCHR (mode) || S_ISBLK (mode) ) - printf ("%4d,%4d %s ", major,minor, timeString (mtime)); - else - printf ("%9ld %s ", size, timeString (mtime)); - } - printf ("%s", outName); - - if (hardLink) - printf (" (link to \"%s\")", hp->linkName); - else if (softLink) - printf (" (symlink to \"%s\")", hp->linkName); - else if (S_ISREG (mode) || S_ISCHR (mode) || S_ISBLK (mode) || - S_ISSOCK(mode) || S_ISFIFO(mode) ) { - inHeader = (size == 0)? TRUE : FALSE; - dataCc = size; + badHeader = TRUE; + + return; } - printf ("\n"); + badHeader = FALSE; + skipFileFlag = FALSE; + devFileFlag = FALSE; - return; - } + /* + * Check for the file modes. + */ + hardLink = ((hp->typeFlag == TAR_TYPE_HARD_LINK) || + (hp->typeFlag == TAR_TYPE_HARD_LINK - '0')); + + softLink = ((hp->typeFlag == TAR_TYPE_SOFT_LINK) || + (hp->typeFlag == TAR_TYPE_SOFT_LINK - '0')); + + /* + * Check for a directory. + */ + if (outName[strlen(outName) - 1] == '/') + mode |= S_IFDIR; + + /* + * Check for absolute paths in the file. + * If we find any, then warn the user and make them relative. + */ + if (*outName == '/') { + while (*outName == '/') + outName++; - /* - * We really want to extract the file. - */ - if (verboseFlag==TRUE) - printf ("x %s\n", outName); + if (warnedRoot == FALSE) { + fprintf(stderr, + "Absolute path detected, removing leading slashes\n"); + } - if (hardLink) { - if (link (hp->linkName, outName) < 0) { - perror (outName); - return; + warnedRoot = TRUE; } - /* Set the file time */ - utb.actime = mtime; - utb.modtime = mtime; - utime (outName, &utb); - /* Set the file permissions */ - chown(outName, uid, gid); - chmod(outName, mode); - return; - } - - if (softLink) { -#ifdef S_ISLNK - if (symlink (hp->linkName, outName) < 0) { - perror (outName); - return; + + /* + * See if we want this file to be restored. + * If not, then set up to skip it. + */ + if (wantFileName(outName, fileCount, fileTable) == FALSE) { + if (!hardLink && !softLink && (S_ISREG(mode) || S_ISCHR(mode) + || S_ISBLK(mode) || S_ISSOCK(mode) + || S_ISFIFO(mode))) { + inHeader = (size == 0) ? TRUE : FALSE; + dataCc = size; + } + + skipFileFlag = TRUE; + + return; } - /* Try to change ownership of the symlink. - * If libs doesn't support that, don't bother. - * Changing the pointed-to file is the Wrong Thing(tm). + + /* + * This file is to be handled. + * If we aren't extracting then just list information about the file. */ + if (extractFlag == FALSE) { + if (verboseFlag == TRUE) { + printf("%s %3d/%-d ", modeString(mode), uid, gid); + if (S_ISCHR(mode) || S_ISBLK(mode)) + printf("%4d,%4d %s ", major, minor, timeString(mtime)); + else + printf("%9ld %s ", size, timeString(mtime)); + } + printf("%s", outName); + + if (hardLink) + printf(" (link to \"%s\")", hp->linkName); + else if (softLink) + printf(" (symlink to \"%s\")", hp->linkName); + else if (S_ISREG(mode) || S_ISCHR(mode) || S_ISBLK(mode) || + S_ISSOCK(mode) || S_ISFIFO(mode)) { + inHeader = (size == 0) ? TRUE : FALSE; + dataCc = size; + } + + printf("\n"); + + return; + } + + /* + * We really want to extract the file. + */ + if (verboseFlag == TRUE) + printf("x %s\n", outName); + + if (hardLink) { + if (link(hp->linkName, outName) < 0) { + perror(outName); + return; + } + /* Set the file time */ + utb.actime = mtime; + utb.modtime = mtime; + utime(outName, &utb); + /* Set the file permissions */ + chown(outName, uid, gid); + chmod(outName, mode); + return; + } + + if (softLink) { +#ifdef S_ISLNK + if (symlink(hp->linkName, outName) < 0) { + perror(outName); + return; + } + /* Try to change ownership of the symlink. + * If libs doesn't support that, don't bother. + * Changing the pointed-to file is the Wrong Thing(tm). + */ #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - lchown(outName, uid, gid); + lchown(outName, uid, gid); #endif - /* Do not change permissions or date on symlink, - * since it changes the pointed to file instead. duh. */ + /* Do not change permissions or date on symlink, + * since it changes the pointed to file instead. duh. */ #else - fprintf (stderr, "Cannot create symbolic links\n"); + fprintf(stderr, "Cannot create symbolic links\n"); #endif - return; - } - - /* Set the umask for this process so it doesn't - * screw things up. */ - umask(0); - - /* - * If the file is a directory, then just create the path. - */ - if (S_ISDIR (mode)) { - if (createPath (outName, mode)==TRUE) { - /* Set the file time */ - utb.actime = mtime; - utb.modtime = mtime; - utime (outName, &utb); - /* Set the file permissions */ - chown(outName, uid, gid); - chmod(outName, mode); - return; + return; } - return; - } - - /* - * There is a file to write. - * First create the path to it if necessary with default permissions. - */ - createPath (outName, 0777); - - inHeader = (size == 0)? TRUE : FALSE; - dataCc = size; - - /* - * Start the output file. - */ - if (tostdoutFlag == TRUE) - outFd = fileno(stdout); - else { - if ( S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) ) { - devFileFlag = TRUE; - outFd = mknod (outName, mode, makedev(major, minor) ); + + /* Set the umask for this process so it doesn't + * screw things up. */ + umask(0); + + /* + * If the file is a directory, then just create the path. + */ + if (S_ISDIR(mode)) { + if (createPath(outName, mode) == TRUE) { + /* Set the file time */ + utb.actime = mtime; + utb.modtime = mtime; + utime(outName, &utb); + /* Set the file permissions */ + chown(outName, uid, gid); + chmod(outName, mode); + return; + } + return; } - else if (S_ISFIFO(mode) ) { - devFileFlag = TRUE; - outFd = mkfifo(outName, mode); - } else { - outFd = open (outName, O_WRONLY | O_CREAT | O_TRUNC, mode); + + /* + * There is a file to write. + * First create the path to it if necessary with default permissions. + */ + createPath(outName, 0777); + + inHeader = (size == 0) ? TRUE : FALSE; + dataCc = size; + + /* + * Start the output file. + */ + if (tostdoutFlag == TRUE) + outFd = fileno(stdout); + else { + if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode)) { + devFileFlag = TRUE; + outFd = mknod(outName, mode, makedev(major, minor)); + } else if (S_ISFIFO(mode)) { + devFileFlag = TRUE; + outFd = mkfifo(outName, mode); + } else { + outFd = open(outName, O_WRONLY | O_CREAT | O_TRUNC, mode); + } + if (outFd < 0) { + perror(outName); + skipFileFlag = TRUE; + return; + } + /* Set the file time */ + utb.actime = mtime; + utb.modtime = mtime; + utime(outName, &utb); + /* Set the file permissions */ + chown(outName, uid, gid); + chmod(outName, mode); } - if (outFd < 0) { - perror (outName); - skipFileFlag = TRUE; - return; + + + /* + * If the file is empty, then that's all we need to do. + */ + if (size == 0 && (tostdoutFlag == FALSE) && (devFileFlag == FALSE)) { + close(outFd); + outFd = -1; } - /* Set the file time */ - utb.actime = mtime; - utb.modtime = mtime; - utime (outName, &utb); - /* Set the file permissions */ - chown(outName, uid, gid); - chmod(outName, mode); - } - - - /* - * If the file is empty, then that's all we need to do. - */ - if (size == 0 && (tostdoutFlag == FALSE) && (devFileFlag == FALSE)) { - close (outFd); - outFd = -1; - } } /* * Handle a data block of some specified size that was read. */ -static void readData (const char *cp, int count) +static void readData(const char *cp, int count) { - /* - * Reduce the amount of data left in this file. - * If there is no more data left, then we need to read - * the header again. - */ - dataCc -= count; - - if (dataCc <= 0) - inHeader = TRUE; + /* + * Reduce the amount of data left in this file. + * If there is no more data left, then we need to read + * the header again. + */ + dataCc -= count; - /* - * If we aren't extracting files or this file is being - * skipped then do nothing more. - */ - if (extractFlag==FALSE || skipFileFlag==TRUE) - return; - - /* - * Write the data to the output file. - */ - if (fullWrite (outFd, cp, count) < 0) { - perror (outName); - if (tostdoutFlag == FALSE) { - close (outFd); - outFd = -1; + if (dataCc <= 0) + inHeader = TRUE; + + /* + * If we aren't extracting files or this file is being + * skipped then do nothing more. + */ + if (extractFlag == FALSE || skipFileFlag == TRUE) + return; + + /* + * Write the data to the output file. + */ + if (fullWrite(outFd, cp, count) < 0) { + perror(outName); + if (tostdoutFlag == FALSE) { + close(outFd); + outFd = -1; + } + skipFileFlag = TRUE; + return; } - skipFileFlag = TRUE; - return; - } - - /* - * Check if we are done writing to the file now. - */ - if (dataCc <= 0 && tostdoutFlag == FALSE) { - struct utimbuf utb; - if (close (outFd)) - perror (outName); - /* Set the file time */ - utb.actime = mtime; - utb.modtime = mtime; - utime (outName, &utb); - /* Set the file permissions */ - chown(outName, uid, gid); - chmod(outName, mode); + /* + * Check if we are done writing to the file now. + */ + if (dataCc <= 0 && tostdoutFlag == FALSE) { + struct utimbuf utb; + + if (close(outFd)) + perror(outName); - outFd = -1; - } + /* Set the file time */ + utb.actime = mtime; + utb.modtime = mtime; + utime(outName, &utb); + /* Set the file permissions */ + chown(outName, uid, gid); + chmod(outName, mode); + + outFd = -1; + } } @@ -712,40 +720,40 @@ static void readData (const char *cp, int count) * Returns TRUE if the file is selected. */ static int -wantFileName (const char *fileName, int fileCount, char **fileTable) +wantFileName(const char *fileName, int fileCount, char **fileTable) { - const char *pathName; - int fileLength; - int pathLength; - - /* - * If there are no files in the list, then the file is wanted. - */ - if (fileCount == 0) - return TRUE; + const char *pathName; + int fileLength; + int pathLength; + + /* + * If there are no files in the list, then the file is wanted. + */ + if (fileCount == 0) + return TRUE; - fileLength = strlen (fileName); + fileLength = strlen(fileName); - /* - * Check each of the test paths. - */ - while (fileCount-- > 0) { - pathName = *fileTable++; + /* + * Check each of the test paths. + */ + while (fileCount-- > 0) { + pathName = *fileTable++; - pathLength = strlen (pathName); + pathLength = strlen(pathName); - if (fileLength < pathLength) - continue; + if (fileLength < pathLength) + continue; - if (memcmp (fileName, pathName, pathLength) != 0) - continue; + if (memcmp(fileName, pathName, pathLength) != 0) + continue; - if ((fileLength == pathLength) || (fileName[pathLength] == '/')) { - return TRUE; + if ((fileLength == pathLength) || (fileName[pathLength] == '/')) { + return TRUE; + } } - } - return FALSE; + return FALSE; } /* @@ -753,34 +761,34 @@ wantFileName (const char *fileName, int fileCount, char **fileTable) * spaces on both sides of the number and with an optional null character * at the end. Returns -1 on an illegal format. */ -static long getOctal (const char *cp, int len) +static long getOctal(const char *cp, int len) { - long val; + long val; - while ((len > 0) && (*cp == ' ')) { - cp++; - len--; - } + while ((len > 0) && (*cp == ' ')) { + cp++; + len--; + } - if ((len == 0) || !isOctal (*cp)) - return -1; + if ((len == 0) || !isOctal(*cp)) + return -1; - val = 0; + val = 0; - while ((len > 0) && isOctal (*cp)) { - val = val * 8 + *cp++ - '0'; - len--; - } + while ((len > 0) && isOctal(*cp)) { + val = val * 8 + *cp++ - '0'; + len--; + } - while ((len > 0) && (*cp == ' ')) { - cp++; - len--; - } + while ((len > 0) && (*cp == ' ')) { + cp++; + len--; + } - if ((len > 0) && *cp) - return -1; + if ((len > 0) && *cp) + return -1; - return val; + return val; } @@ -795,65 +803,65 @@ static long getOctal (const char *cp, int len) /* * Write a tar file containing the specified files. */ -static void writeTarFile (int fileCount, char **fileTable) +static void writeTarFile(int fileCount, char **fileTable) { - struct stat statbuf; - - /* - * Make sure there is at least one file specified. - */ - if (fileCount <= 0) { - fprintf (stderr, "No files specified to be saved\n"); - errorFlag = TRUE; - } - - /* - * Create the tar file for writing. - */ - if ((tarName == NULL) || !strcmp (tarName, "-")) { - tostdoutFlag = TRUE; - tarFd = fileno(stdout); - } else - tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0666); - - if (tarFd < 0) { - perror (tarName); - errorFlag = TRUE; - return; - } - - /* - * Get the device and inode of the tar file for checking later. - */ - if (fstat (tarFd, &statbuf) < 0) { - perror (tarName); - errorFlag = TRUE; - goto done; - } - - tarDev = statbuf.st_dev; - tarInode = statbuf.st_ino; - - /* - * Append each file name into the archive file. - * Follow symbolic links for these top level file names. - */ - while (errorFlag==FALSE && (fileCount-- > 0)) { - saveFile (*fileTable++, FALSE); - } - - /* - * Now write an empty block of zeroes to end the archive. - */ - writeTarBlock ("", 1); + struct stat statbuf; + + /* + * Make sure there is at least one file specified. + */ + if (fileCount <= 0) { + fprintf(stderr, "No files specified to be saved\n"); + errorFlag = TRUE; + } + + /* + * Create the tar file for writing. + */ + if ((tarName == NULL) || !strcmp(tarName, "-")) { + tostdoutFlag = TRUE; + tarFd = fileno(stdout); + } else + tarFd = open(tarName, O_WRONLY | O_CREAT | O_TRUNC, 0666); + + if (tarFd < 0) { + perror(tarName); + errorFlag = TRUE; + return; + } + + /* + * Get the device and inode of the tar file for checking later. + */ + if (fstat(tarFd, &statbuf) < 0) { + perror(tarName); + errorFlag = TRUE; + goto done; + } + + tarDev = statbuf.st_dev; + tarInode = statbuf.st_ino; + + /* + * Append each file name into the archive file. + * Follow symbolic links for these top level file names. + */ + while (errorFlag == FALSE && (fileCount-- > 0)) { + saveFile(*fileTable++, FALSE); + } + + /* + * Now write an empty block of zeroes to end the archive. + */ + writeTarBlock("", 1); done: - /* - * Close the tar file and check for errors if it was opened. - */ - if ((tostdoutFlag == FALSE) && (tarFd >= 0) && (close (tarFd) < 0)) - perror (tarName); + /* + * Close the tar file and check for errors if it was opened. + */ + if ((tostdoutFlag == FALSE) && (tarFd >= 0) && (close(tarFd) < 0)) + perror(tarName); } /* @@ -863,73 +871,73 @@ static void writeTarFile (int fileCount, char **fileTable) * flag indicates whether or not we want to see symbolic links as * they really are, instead of blindly following them. */ -static void saveFile (const char *fileName, int seeLinks) +static void saveFile(const char *fileName, int seeLinks) { - int status; - struct stat statbuf; + int status; + struct stat statbuf; - if (verboseFlag==TRUE) - printf ("a %s\n", fileName); + if (verboseFlag == TRUE) + printf("a %s\n", fileName); - /* - * Check that the file name will fit in the header. - */ - if (strlen (fileName) >= TAR_NAME_SIZE) { - fprintf (stderr, "%s: File name is too long\n", fileName); + /* + * Check that the file name will fit in the header. + */ + if (strlen(fileName) >= TAR_NAME_SIZE) { + fprintf(stderr, "%s: File name is too long\n", fileName); - return; - } + return; + } - /* - * Find out about the file. - */ + /* + * Find out about the file. + */ #ifdef S_ISLNK - if (seeLinks==TRUE) - status = lstat (fileName, &statbuf); - else + if (seeLinks == TRUE) + status = lstat(fileName, &statbuf); + else #endif - status = stat (fileName, &statbuf); + status = stat(fileName, &statbuf); - if (status < 0) { - perror (fileName); + if (status < 0) { + perror(fileName); + + return; + } - return; - } + /* + * Make sure we aren't trying to save our file into itself. + */ + if ((statbuf.st_dev == tarDev) && (statbuf.st_ino == tarInode)) { + fprintf(stderr, "Skipping saving of archive file itself\n"); - /* - * Make sure we aren't trying to save our file into itself. - */ - if ((statbuf.st_dev == tarDev) && (statbuf.st_ino == tarInode)) { - fprintf (stderr, "Skipping saving of archive file itself\n"); + return; + } - return; - } + /* + * Check the type of file. + */ + mode = statbuf.st_mode; - /* - * Check the type of file. - */ - mode = statbuf.st_mode; + if (S_ISDIR(mode)) { + saveDirectory(fileName, &statbuf); - if (S_ISDIR (mode)) { - saveDirectory (fileName, &statbuf); + return; + } + if (S_ISREG(mode)) { + saveRegularFile(fileName, &statbuf); - return; - } - if (S_ISREG (mode)) { - saveRegularFile (fileName, &statbuf); + return; + } - return; - } - - /* Some day add support for tarring these up... but not today. :) */ + /* Some day add support for tarring these up... but not today. :) */ // if (S_ISLNK(mode) || S_ISFIFO(mode) || S_ISBLK(mode) || S_ISCHR (mode) ) { -// fprintf (stderr, "%s: This version of tar can't store this type of file\n", fileName); +// fprintf (stderr, "%s: This version of tar can't store this type of file\n", fileName); // } - /* - * The file is a strange type of file, ignore it. - */ - fprintf (stderr, "%s: not a directory or regular file\n", fileName); + /* + * The file is a strange type of file, ignore it. + */ + fprintf(stderr, "%s: not a directory or regular file\n", fileName); } @@ -937,173 +945,172 @@ static void saveFile (const char *fileName, int seeLinks) * Save a regular file to the tar file. */ static void -saveRegularFile (const char *fileName, const struct stat *statbuf) +saveRegularFile(const char *fileName, const struct stat *statbuf) { - int sawEof; - int fileFd; - int cc; - int dataCount; - long fullDataCount; - char data[TAR_BLOCK_SIZE * 16]; - - /* - * Open the file for reading. - */ - fileFd = open (fileName, O_RDONLY); - - if (fileFd < 0) { - perror (fileName); - - return; - } - - /* - * Write out the header for the file. - */ - writeHeader (fileName, statbuf); - - /* - * Write the data blocks of the file. - * We must be careful to write the amount of data that the stat - * buffer indicated, even if the file has changed size. Otherwise - * the tar file will be incorrect. - */ - fullDataCount = statbuf->st_size; - sawEof = FALSE; - - while (fullDataCount > 0) { - /* - * Get the amount to write this iteration which is - * the minumum of the amount left to write and the - * buffer size. - */ - dataCount = sizeof (data); - - if (dataCount > fullDataCount) - dataCount = (int) fullDataCount; + int sawEof; + int fileFd; + int cc; + int dataCount; + long fullDataCount; + char data[TAR_BLOCK_SIZE * 16]; /* - * Read the data from the file if we haven't seen the - * end of file yet. + * Open the file for reading. */ - cc = 0; - - if (sawEof==FALSE) { - cc = fullRead (fileFd, data, dataCount); + fileFd = open(fileName, O_RDONLY); - if (cc < 0) { - perror (fileName); - - (void) close (fileFd); - errorFlag = TRUE; + if (fileFd < 0) { + perror(fileName); return; - } - - /* - * If the file ended too soon, complain and set - * a flag so we will zero fill the rest of it. - */ - if (cc < dataCount) { - fprintf (stderr, - "%s: Short read - zero filling", fileName); - - sawEof = TRUE; - } } /* - * Zero fill the rest of the data if necessary. + * Write out the header for the file. */ - if (cc < dataCount) - memset (data + cc, 0, dataCount - cc); + writeHeader(fileName, statbuf); /* - * Write the buffer to the TAR file. + * Write the data blocks of the file. + * We must be careful to write the amount of data that the stat + * buffer indicated, even if the file has changed size. Otherwise + * the tar file will be incorrect. */ - writeTarBlock (data, dataCount); - - fullDataCount -= dataCount; - } + fullDataCount = statbuf->st_size; + sawEof = FALSE; + + while (fullDataCount > 0) { + /* + * Get the amount to write this iteration which is + * the minumum of the amount left to write and the + * buffer size. + */ + dataCount = sizeof(data); + + if (dataCount > fullDataCount) + dataCount = (int) fullDataCount; + + /* + * Read the data from the file if we haven't seen the + * end of file yet. + */ + cc = 0; + + if (sawEof == FALSE) { + cc = fullRead(fileFd, data, dataCount); + + if (cc < 0) { + perror(fileName); + + (void) close(fileFd); + errorFlag = TRUE; + + return; + } + + /* + * If the file ended too soon, complain and set + * a flag so we will zero fill the rest of it. + */ + if (cc < dataCount) { + fprintf(stderr, "%s: Short read - zero filling", fileName); + + sawEof = TRUE; + } + } + + /* + * Zero fill the rest of the data if necessary. + */ + if (cc < dataCount) + memset(data + cc, 0, dataCount - cc); + + /* + * Write the buffer to the TAR file. + */ + writeTarBlock(data, dataCount); + + fullDataCount -= dataCount; + } - /* - * Close the file. - */ - if ((tostdoutFlag == FALSE) && close (fileFd) < 0) - fprintf (stderr, "%s: close: %s\n", fileName, strerror (errno)); + /* + * Close the file. + */ + if ((tostdoutFlag == FALSE) && close(fileFd) < 0) + fprintf(stderr, "%s: close: %s\n", fileName, strerror(errno)); } /* * Save a directory and all of its files to the tar file. */ -static void saveDirectory (const char *dirName, const struct stat *statbuf) +static void saveDirectory(const char *dirName, const struct stat *statbuf) { - DIR *dir; - struct dirent *entry; - int needSlash; - char fullName[PATH_MAX + 1]; - - /* - * Construct the directory name as used in the tar file by appending - * a slash character to it. - */ - strcpy (fullName, dirName); - strcat (fullName, "/"); - - /* - * Write out the header for the directory entry. - */ - writeHeader (fullName, statbuf); - - /* - * Open the directory. - */ - dir = opendir (dirName); - - if (dir == NULL) { - fprintf (stderr, "Cannot read directory \"%s\": %s\n", - dirName, strerror (errno)); - - return; - } - - /* - * See if a slash is needed. - */ - needSlash = (*dirName && (dirName[strlen (dirName) - 1] != '/')); - - /* - * Read all of the directory entries and check them, - * except for the current and parent directory entries. - */ - while (errorFlag==FALSE && ((entry = readdir (dir)) != NULL)) { - if ((strcmp (entry->d_name, ".") == 0) || - (strcmp (entry->d_name, "..") == 0)) { - continue; - } + DIR *dir; + struct dirent *entry; + int needSlash; + char fullName[PATH_MAX + 1]; + + /* + * Construct the directory name as used in the tar file by appending + * a slash character to it. + */ + strcpy(fullName, dirName); + strcat(fullName, "/"); + + /* + * Write out the header for the directory entry. + */ + writeHeader(fullName, statbuf); /* - * Build the full path name to the file. + * Open the directory. */ - strcpy (fullName, dirName); + dir = opendir(dirName); + + if (dir == NULL) { + fprintf(stderr, "Cannot read directory \"%s\": %s\n", + dirName, strerror(errno)); - if (needSlash) - strcat (fullName, "/"); + return; + } - strcat (fullName, entry->d_name); + /* + * See if a slash is needed. + */ + needSlash = (*dirName && (dirName[strlen(dirName) - 1] != '/')); /* - * Write this file to the tar file, noticing whether or not - * the file is a symbolic link. + * Read all of the directory entries and check them, + * except for the current and parent directory entries. */ - saveFile (fullName, TRUE); - } + while (errorFlag == FALSE && ((entry = readdir(dir)) != NULL)) { + if ((strcmp(entry->d_name, ".") == 0) || + (strcmp(entry->d_name, "..") == 0)) { + continue; + } + + /* + * Build the full path name to the file. + */ + strcpy(fullName, dirName); + + if (needSlash) + strcat(fullName, "/"); + + strcat(fullName, entry->d_name); + + /* + * Write this file to the tar file, noticing whether or not + * the file is a symbolic link. + */ + saveFile(fullName, TRUE); + } - /* - * All done, close the directory. - */ - closedir (dir); + /* + * All done, close the directory. + */ + closedir(dir); } @@ -1111,54 +1118,54 @@ static void saveDirectory (const char *dirName, const struct stat *statbuf) * Write a tar header for the specified file name and status. * It is assumed that the file name fits. */ -static void writeHeader (const char *fileName, const struct stat *statbuf) +static void writeHeader(const char *fileName, const struct stat *statbuf) { - long checkSum; - const unsigned char *cp; - int len; - TarHeader header; - - /* - * Zero the header block in preparation for filling it in. - */ - memset ((char *) &header, 0, sizeof (header)); - - /* - * Fill in the header. - */ - strcpy (header.name, fileName); - - strncpy (header.magic, TAR_MAGIC, sizeof (header.magic)); - strncpy (header.version, TAR_VERSION, sizeof (header.version)); - - putOctal (header.mode, sizeof (header.mode), statbuf->st_mode & 0777); - putOctal (header.uid, sizeof (header.uid), statbuf->st_uid); - putOctal (header.gid, sizeof (header.gid), statbuf->st_gid); - putOctal (header.size, sizeof (header.size), statbuf->st_size); - putOctal (header.mtime, sizeof (header.mtime), statbuf->st_mtime); - - header.typeFlag = TAR_TYPE_REGULAR; - - /* - * Calculate and store the checksum. - * This is the sum of all of the bytes of the header, - * with the checksum field itself treated as blanks. - */ - memset (header.checkSum, ' ', sizeof (header.checkSum)); - - cp = (const unsigned char *) &header; - len = sizeof (header); - checkSum = 0; - - while (len-- > 0) - checkSum += *cp++; - - putOctal (header.checkSum, sizeof (header.checkSum), checkSum); - - /* - * Write the tar header. - */ - writeTarBlock ((const char *) &header, sizeof (header)); + long checkSum; + const unsigned char *cp; + int len; + TarHeader header; + + /* + * Zero the header block in preparation for filling it in. + */ + memset((char *) &header, 0, sizeof(header)); + + /* + * Fill in the header. + */ + strcpy(header.name, fileName); + + strncpy(header.magic, TAR_MAGIC, sizeof(header.magic)); + strncpy(header.version, TAR_VERSION, sizeof(header.version)); + + putOctal(header.mode, sizeof(header.mode), statbuf->st_mode & 0777); + putOctal(header.uid, sizeof(header.uid), statbuf->st_uid); + putOctal(header.gid, sizeof(header.gid), statbuf->st_gid); + putOctal(header.size, sizeof(header.size), statbuf->st_size); + putOctal(header.mtime, sizeof(header.mtime), statbuf->st_mtime); + + header.typeFlag = TAR_TYPE_REGULAR; + + /* + * Calculate and store the checksum. + * This is the sum of all of the bytes of the header, + * with the checksum field itself treated as blanks. + */ + memset(header.checkSum, ' ', sizeof(header.checkSum)); + + cp = (const unsigned char *) &header; + len = sizeof(header); + checkSum = 0; + + while (len-- > 0) + checkSum += *cp++; + + putOctal(header.checkSum, sizeof(header.checkSum), checkSum); + + /* + * Write the tar header. + */ + writeTarBlock((const char *) &header, sizeof(header)); } @@ -1167,56 +1174,56 @@ static void writeHeader (const char *fileName, const struct stat *statbuf) * The data is always padded out to a multiple of TAR_BLOCK_SIZE. * The errorFlag static variable is set on an error. */ -static void writeTarBlock (const char *buf, int len) +static void writeTarBlock(const char *buf, int len) { - int partialLength; - int completeLength; - char fullBlock[TAR_BLOCK_SIZE]; - - /* - * If we had a write error before, then do nothing more. - */ - if (errorFlag==TRUE) - return; - - /* - * Get the amount of complete and partial blocks. - */ - partialLength = len % TAR_BLOCK_SIZE; - completeLength = len - partialLength; - - /* - * Write all of the complete blocks. - */ - if ((completeLength > 0) && !fullWrite (tarFd, buf, completeLength)) { - perror (tarName); - - errorFlag = TRUE; - - return; - } - - /* - * If there are no partial blocks left, we are done. - */ - if (partialLength == 0) - return; - - /* - * Copy the partial data into a complete block, and pad the rest - * of it with zeroes. - */ - memcpy (fullBlock, buf + completeLength, partialLength); - memset (fullBlock + partialLength, 0, TAR_BLOCK_SIZE - partialLength); - - /* - * Write the last complete block. - */ - if (!fullWrite (tarFd, fullBlock, TAR_BLOCK_SIZE)) { - perror (tarName); - - errorFlag = TRUE; - } + int partialLength; + int completeLength; + char fullBlock[TAR_BLOCK_SIZE]; + + /* + * If we had a write error before, then do nothing more. + */ + if (errorFlag == TRUE) + return; + + /* + * Get the amount of complete and partial blocks. + */ + partialLength = len % TAR_BLOCK_SIZE; + completeLength = len - partialLength; + + /* + * Write all of the complete blocks. + */ + if ((completeLength > 0) && !fullWrite(tarFd, buf, completeLength)) { + perror(tarName); + + errorFlag = TRUE; + + return; + } + + /* + * If there are no partial blocks left, we are done. + */ + if (partialLength == 0) + return; + + /* + * Copy the partial data into a complete block, and pad the rest + * of it with zeroes. + */ + memcpy(fullBlock, buf + completeLength, partialLength); + memset(fullBlock + partialLength, 0, TAR_BLOCK_SIZE - partialLength); + + /* + * Write the last complete block. + */ + if (!fullWrite(tarFd, fullBlock, TAR_BLOCK_SIZE)) { + perror(tarName); + + errorFlag = TRUE; + } } @@ -1225,48 +1232,48 @@ static void writeTarBlock (const char *buf, int len) * The number is zero and space padded and possibly null padded. * Returns TRUE if successful. */ -static int putOctal (char *cp, int len, long value) +static int putOctal(char *cp, int len, long value) { - int tempLength; - char *tempString; - char tempBuffer[32]; - - /* - * Create a string of the specified length with an initial space, - * leading zeroes and the octal number, and a trailing null. - */ - tempString = tempBuffer; - - sprintf (tempString, " %0*lo", len - 2, value); - - tempLength = strlen (tempString) + 1; - - /* - * If the string is too large, suppress the leading space. - */ - if (tempLength > len) { - tempLength--; - tempString++; - } - - /* - * If the string is still too large, suppress the trailing null. - */ - if (tempLength > len) - tempLength--; - - /* - * If the string is still too large, fail. - */ - if (tempLength > len) - return FALSE; + int tempLength; + char *tempString; + char tempBuffer[32]; - /* - * Copy the string to the field. - */ - memcpy (cp, tempString, len); + /* + * Create a string of the specified length with an initial space, + * leading zeroes and the octal number, and a trailing null. + */ + tempString = tempBuffer; - return TRUE; + sprintf(tempString, " %0*lo", len - 2, value); + + tempLength = strlen(tempString) + 1; + + /* + * If the string is too large, suppress the leading space. + */ + if (tempLength > len) { + tempLength--; + tempString++; + } + + /* + * If the string is still too large, suppress the trailing null. + */ + if (tempLength > len) + tempLength--; + + /* + * If the string is still too large, fail. + */ + if (tempLength > len) + return FALSE; + + /* + * Copy the string to the field. + */ + memcpy(cp, tempString, len); + + return TRUE; } #endif @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" #include <stdio.h> #include <string.h> @@ -16,329 +17,342 @@ static int been_there_done_that = 0; * replacement may be in order */ #if 0 -void exit (int status) __attribute__ ((noreturn)); -void exit (int status) { _exit(status); }; -void abort (void) __attribute__ ((__noreturn__)); -void abort (void) { _exit(0); }; -int atexit (void (*__func) (void)) { _exit(0); }; +void exit(int status) __attribute__ ((noreturn)); +void exit(int status) +{ + _exit(status); +}; +void abort(void) __attribute__ ((__noreturn__)); +void abort(void) +{ + _exit(0); +}; +int atexit(void (*__func) (void)) +{ + _exit(0); +}; void *__libc_stack_end; #endif static const struct Applet applets[] = { -#ifdef BB_BUSYBOX //bin - {"busybox", busybox_main}, +#ifdef BB_BUSYBOX //bin + {"busybox", busybox_main}, +#endif +#ifdef BB_BLOCK_DEVICE //sbin + {"block_device", block_device_main}, #endif -#ifdef BB_BLOCK_DEVICE //sbin - {"block_device", block_device_main}, +#ifdef BB_CAT //bin + {"cat", cat_main}, #endif -#ifdef BB_CAT //bin - {"cat", cat_main}, +#ifdef BB_CHMOD_CHOWN_CHGRP //bin + {"chmod", chmod_chown_chgrp_main}, + {"chown", chmod_chown_chgrp_main}, + {"chgrp", chmod_chown_chgrp_main}, #endif -#ifdef BB_CHMOD_CHOWN_CHGRP //bin - {"chmod", chmod_chown_chgrp_main}, - {"chown", chmod_chown_chgrp_main}, - {"chgrp", chmod_chown_chgrp_main}, +#ifdef BB_CHROOT //sbin + {"chroot", chroot_main}, #endif -#ifdef BB_CHROOT //sbin - {"chroot", chroot_main}, +#ifdef BB_CLEAR //usr/bin + {"clear", clear_main}, #endif -#ifdef BB_CLEAR //usr/bin - {"clear", clear_main}, +#ifdef BB_CHVT //usr/bin + {"chvt", chvt_main}, #endif -#ifdef BB_CHVT //usr/bin - {"chvt", chvt_main}, +#ifdef BB_CP_MV //bin + {"cp", cp_mv_main}, + {"mv", cp_mv_main}, #endif -#ifdef BB_CP_MV //bin - {"cp", cp_mv_main}, - {"mv", cp_mv_main}, +#ifdef BB_DATE //bin + {"date", date_main}, #endif -#ifdef BB_DATE //bin - {"date", date_main}, +#ifdef BB_DD //bin + {"dd", dd_main}, #endif -#ifdef BB_DD //bin - {"dd", dd_main}, +#ifdef BB_DF //bin + {"df", df_main}, #endif -#ifdef BB_DF //bin - {"df", df_main}, +#ifdef BB_DMESG //bin + {"dmesg", dmesg_main}, #endif -#ifdef BB_DMESG //bin - {"dmesg", dmesg_main}, +#ifdef BB_DU //bin + {"du", du_main}, #endif -#ifdef BB_DU //bin - {"du", du_main}, +#ifdef BB_DUTMP //usr/sbin + {"dutmp", dutmp_main}, #endif -#ifdef BB_DUTMP //usr/sbin - {"dutmp", dutmp_main}, +#ifdef BB_FBSET //usr/sbin + {"fbset", fbset_main}, #endif -#ifdef BB_FBSET //usr/sbin - {"fbset", fbset_main}, +#ifdef BB_FDFLUSH //bin + {"fdflush", fdflush_main}, #endif -#ifdef BB_FDFLUSH //bin - {"fdflush", fdflush_main}, +#ifdef BB_FIND //usr/bin + {"find", find_main}, #endif -#ifdef BB_FIND //usr/bin - {"find", find_main}, +#ifdef BB_FREE //usr/bin + {"free", free_main}, #endif -#ifdef BB_FREE //usr/bin - {"free", free_main}, +#ifdef BB_DEALLOCVT //usr/bin + {"deallocvt", deallocvt_main}, #endif -#ifdef BB_DEALLOCVT //usr/bin - {"deallocvt", deallocvt_main}, +#ifdef BB_FSCK_MINIX //sbin + {"fsck.minix", fsck_minix_main}, #endif -#ifdef BB_FSCK_MINIX //sbin - {"fsck.minix", fsck_minix_main}, +#ifdef BB_MKFS_MINIX //sbin + {"mkfs.minix", mkfs_minix_main}, #endif -#ifdef BB_MKFS_MINIX //sbin - {"mkfs.minix", mkfs_minix_main}, +#ifdef BB_GREP //bin + {"grep", grep_main}, #endif -#ifdef BB_GREP //bin - {"grep", grep_main}, +#ifdef BB_HALT //sbin + {"halt", halt_main}, #endif -#ifdef BB_HALT //sbin - {"halt", halt_main}, +#ifdef BB_HEAD //bin + {"head", head_main}, #endif -#ifdef BB_HEAD //bin - {"head", head_main}, +#ifdef BB_HOSTID //usr/bin + {"hostid", hostid_main}, #endif -#ifdef BB_HOSTID //usr/bin - {"hostid", hostid_main}, +#ifdef BB_HOSTNAME //bin + {"hostname", hostname_main}, #endif -#ifdef BB_HOSTNAME //bin - {"hostname", hostname_main}, +#ifdef BB_INIT //sbin + {"init", init_main}, #endif -#ifdef BB_INIT //sbin - {"init", init_main}, +#ifdef BB_INSMOD //sbin + {"insmod", insmod_main}, #endif -#ifdef BB_INSMOD //sbin - {"insmod", insmod_main}, +#ifdef BB_FEATURE_LINUXRC // + {"linuxrc", init_main}, #endif -#ifdef BB_FEATURE_LINUXRC // - {"linuxrc", init_main}, +#ifdef BB_KILL //bin + {"kill", kill_main}, #endif -#ifdef BB_KILL //bin - {"kill", kill_main}, +#ifdef BB_LENGTH //usr/bin + {"length", length_main}, #endif -#ifdef BB_LENGTH //usr/bin - {"length", length_main}, +#ifdef BB_LN //bin + {"ln", ln_main}, #endif -#ifdef BB_LN //bin - {"ln", ln_main}, +#ifdef BB_LOADACM //usr/bin + {"loadacm", loadacm_main}, #endif -#ifdef BB_LOADACM //usr/bin - {"loadacm", loadacm_main}, -#endif -#ifdef BB_LOADFONT //usr/bin - {"loadfont", loadfont_main}, +#ifdef BB_LOADFONT //usr/bin + {"loadfont", loadfont_main}, #endif -#ifdef BB_LOADKMAP //sbin - {"loadkmap", loadkmap_main}, +#ifdef BB_LOADKMAP //sbin + {"loadkmap", loadkmap_main}, #endif -#ifdef BB_LS //bin - {"ls", ls_main}, +#ifdef BB_LS //bin + {"ls", ls_main}, #endif -#ifdef BB_LSMOD //sbin - {"lsmod", lsmod_main}, +#ifdef BB_LSMOD //sbin + {"lsmod", lsmod_main}, #endif -#ifdef BB_MAKEDEVS //sbin - {"makedevs", makedevs_main}, +#ifdef BB_MAKEDEVS //sbin + {"makedevs", makedevs_main}, #endif -#ifdef BB_MATH //usr/bin - {"math", math_main}, +#ifdef BB_MATH //usr/bin + {"math", math_main}, #endif -#ifdef BB_MKDIR //bin - {"mkdir", mkdir_main}, +#ifdef BB_MKDIR //bin + {"mkdir", mkdir_main}, #endif -#ifdef BB_MKFIFO //usr/bin - {"mkfifo", mkfifo_main}, +#ifdef BB_MKFIFO //usr/bin + {"mkfifo", mkfifo_main}, #endif -#ifdef BB_MKNOD //bin - {"mknod", mknod_main}, +#ifdef BB_MKNOD //bin + {"mknod", mknod_main}, #endif -#ifdef BB_MKSWAP //sbin - {"mkswap", mkswap_main}, +#ifdef BB_MKSWAP //sbin + {"mkswap", mkswap_main}, #endif -#ifdef BB_MNC //usr/bin - {"mnc", mnc_main}, +#ifdef BB_MNC //usr/bin + {"mnc", mnc_main}, #endif -#ifdef BB_MORE //bin - {"more", more_main}, +#ifdef BB_MORE //bin + {"more", more_main}, #endif -#ifdef BB_MOUNT //bin - {"mount", mount_main}, +#ifdef BB_MOUNT //bin + {"mount", mount_main}, #endif -#ifdef BB_MT //bin - {"mt", mt_main}, +#ifdef BB_MT //bin + {"mt", mt_main}, #endif -#ifdef BB_NSLOOKUP //usr/bin - {"nslookup", nslookup_main}, +#ifdef BB_NSLOOKUP //usr/bin + {"nslookup", nslookup_main}, #endif -#ifdef BB_PING //bin - {"ping", ping_main}, +#ifdef BB_PING //bin + {"ping", ping_main}, #endif -#ifdef BB_POWEROFF //sbin - {"poweroff", poweroff_main}, +#ifdef BB_POWEROFF //sbin + {"poweroff", poweroff_main}, #endif -#ifdef BB_PRINTF //usr/bin - {"printf", printf_main}, +#ifdef BB_PRINTF //usr/bin + {"printf", printf_main}, #endif -#ifdef BB_PS //bin - {"ps", ps_main}, +#ifdef BB_PS //bin + {"ps", ps_main}, #endif -#ifdef BB_PWD //bin - {"pwd", pwd_main}, +#ifdef BB_PWD //bin + {"pwd", pwd_main}, #endif -#ifdef BB_REBOOT //sbin - {"reboot", reboot_main}, +#ifdef BB_REBOOT //sbin + {"reboot", reboot_main}, #endif -#ifdef BB_RM //bin - {"rm", rm_main}, +#ifdef BB_RM //bin + {"rm", rm_main}, #endif -#ifdef BB_RMDIR //bin - {"rmdir", rmdir_main}, +#ifdef BB_RMDIR //bin + {"rmdir", rmdir_main}, #endif -#ifdef BB_RMMOD //sbin - {"rmmod", rmmod_main}, +#ifdef BB_RMMOD //sbin + {"rmmod", rmmod_main}, #endif -#ifdef BB_SFDISK //sbin - {"fdisk", sfdisk_main}, - {"sfdisk", sfdisk_main}, +#ifdef BB_SFDISK //sbin + {"fdisk", sfdisk_main}, + {"sfdisk", sfdisk_main}, #endif -#ifdef BB_SED //bin - {"sed", sed_main}, +#ifdef BB_SED //bin + {"sed", sed_main}, #endif -#ifdef BB_SLEEP //bin - {"sleep", sleep_main}, +#ifdef BB_SLEEP //bin + {"sleep", sleep_main}, #endif -#ifdef BB_SORT //bin - {"sort", sort_main}, +#ifdef BB_SORT //bin + {"sort", sort_main}, #endif -#ifdef BB_SYNC //bin - {"sync", sync_main}, +#ifdef BB_SYNC //bin + {"sync", sync_main}, #endif -#ifdef BB_SYSLOGD //sbin - {"syslogd", syslogd_main}, +#ifdef BB_SYSLOGD //sbin + {"syslogd", syslogd_main}, #endif -#ifdef BB_LOGGER //usr/bin - {"logger", logger_main}, +#ifdef BB_LOGGER //usr/bin + {"logger", logger_main}, #endif -#ifdef BB_LOGNAME //usr/bin - {"logname", logname_main}, +#ifdef BB_LOGNAME //usr/bin + {"logname", logname_main}, #endif -#ifdef BB_SWAPONOFF //sbin - {"swapon", swap_on_off_main}, - {"swapoff", swap_on_off_main}, +#ifdef BB_SWAPONOFF //sbin + {"swapon", swap_on_off_main}, + {"swapoff", swap_on_off_main}, #endif -#ifdef BB_TAIL //usr/bin - {"tail", tail_main}, +#ifdef BB_TAIL //usr/bin + {"tail", tail_main}, #endif -#ifdef BB_TAR //bin - {"tar", tar_main}, +#ifdef BB_TAR //bin + {"tar", tar_main}, #endif -#ifdef BB_TEE //bin - {"tee", tee_main}, +#ifdef BB_TEE //bin + {"tee", tee_main}, #endif -#ifdef BB_TOUCH //usr/bin - {"touch", touch_main}, +#ifdef BB_TOUCH //usr/bin + {"touch", touch_main}, #endif -#ifdef BB_TRUE_FALSE //bin - {"true", true_main}, - {"false", false_main}, +#ifdef BB_TRUE_FALSE //bin + {"true", true_main}, + {"false", false_main}, #endif -#ifdef BB_TTY //usr/bin - {"tty", tty_main}, +#ifdef BB_TTY //usr/bin + {"tty", tty_main}, #endif -#ifdef BB_UNAME //bin - {"uname", uname_main}, +#ifdef BB_UNAME //bin + {"uname", uname_main}, #endif -#ifdef BB_UMOUNT //bin - {"umount", umount_main}, +#ifdef BB_UMOUNT //bin + {"umount", umount_main}, #endif -#ifdef BB_UNIQ //bin - {"uniq", uniq_main}, +#ifdef BB_UNIQ //bin + {"uniq", uniq_main}, #endif -#ifdef BB_UPDATE //sbin - {"update", update_main}, +#ifdef BB_UPDATE //sbin + {"update", update_main}, #endif -#ifdef BB_WC //usr/bin - {"wc", wc_main}, +#ifdef BB_WC //usr/bin + {"wc", wc_main}, #endif -#ifdef BB_WHOAMI //usr/bin - {"whoami", whoami_main}, +#ifdef BB_WHOAMI //usr/bin + {"whoami", whoami_main}, #endif -#ifdef BB_YES //usr/bin - {"yes", yes_main}, +#ifdef BB_YES //usr/bin + {"yes", yes_main}, #endif -#ifdef BB_GUNZIP //bin - {"zcat", gunzip_main}, - {"gunzip", gunzip_main}, +#ifdef BB_GUNZIP //bin + {"zcat", gunzip_main}, + {"gunzip", gunzip_main}, #endif -#ifdef BB_GZIP //bin - {"gzip", gzip_main}, +#ifdef BB_GZIP //bin + {"gzip", gzip_main}, #endif - {0} + {0} }; int main(int argc, char **argv) { - char *s = argv[0]; - char *name = argv[0]; - const struct Applet *a = applets; + char *s = argv[0]; + char *name = argv[0]; + const struct Applet *a = applets; - while (*s != '\0') { - if (*s++ == '/') - name = s; - } + while (*s != '\0') { + if (*s++ == '/') + name = s; + } - while (a->name != 0) { - if (strcmp(name, a->name) == 0) { - int status; + while (a->name != 0) { + if (strcmp(name, a->name) == 0) { + int status; - status = ((*(a->main)) (argc, argv)); - if (status < 0) { - fprintf(stderr, "%s: %s\n", a->name, strerror(errno)); - } - fprintf(stderr, "\n"); - exit(status); + status = ((*(a->main)) (argc, argv)); + if (status < 0) { + fprintf(stderr, "%s: %s\n", a->name, strerror(errno)); + } + fprintf(stderr, "\n"); + exit(status); + } + a++; } - a++; - } - exit (busybox_main(argc, argv)); + exit(busybox_main(argc, argv)); } int busybox_main(int argc, char **argv) { - int col=0; - argc--; - argv++; + int col = 0; - if (been_there_done_that == 1 || argc < 1) { - const struct Applet *a = applets; - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", - BB_VER, BB_BT); - fprintf(stderr, "Usage: busybox [function] [arguments]...\n"); - fprintf(stderr, " or: [function] [arguments]...\n\n"); - fprintf(stderr, - "\tMost people will create a symlink to busybox for each\n" - "\tfunction name, and busybox will act like whatever you invoke it as.\n"); - fprintf(stderr, "\nCurrently defined functions:\n"); + argc--; + argv++; - while (a->name != 0) { - col+=fprintf(stderr, "%s%s", ((col==0)? "\t":", "), (a++)->name); - if (col>60 && a->name != 0) { - fprintf(stderr, ",\n"); - col=0; - } + if (been_there_done_that == 1 || argc < 1) { + const struct Applet *a = applets; + + fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", + BB_VER, BB_BT); + fprintf(stderr, "Usage: busybox [function] [arguments]...\n"); + fprintf(stderr, " or: [function] [arguments]...\n\n"); + fprintf(stderr, + "\tMost people will create a symlink to busybox for each\n" + "\tfunction name, and busybox will act like whatever you invoke it as.\n"); + fprintf(stderr, "\nCurrently defined functions:\n"); + + while (a->name != 0) { + col += + fprintf(stderr, "%s%s", ((col == 0) ? "\t" : ", "), + (a++)->name); + if (col > 60 && a->name != 0) { + fprintf(stderr, ",\n"); + col = 0; + } + } + fprintf(stderr, "\n\n"); + exit(-1); + } else { + /* If we've already been here once, exit now */ + been_there_done_that = 1; + return (main(argc, argv)); } - fprintf(stderr, "\n\n"); - exit(-1); - } else { - /* If we've already been here once, exit now */ - been_there_done_that = 1; - return (main(argc, argv)); - } } diff --git a/busybox.def.h b/busybox.def.h index 8e26b1492..f8c6e6e07 100644 --- a/busybox.def.h +++ b/busybox.def.h @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ // This file defines the feature set to be compiled into busybox. // When you turn things off here, they won't be compiled in at all. // @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini Cat implementation for busybox * @@ -24,36 +25,37 @@ #include <stdio.h> -static void print_file( FILE *file) +static void print_file(FILE * file) { - int c; - while ((c = getc(file)) != EOF) - putc(c, stdout); - fclose(file); - fflush(stdout); + int c; + + while ((c = getc(file)) != EOF) + putc(c, stdout); + fclose(file); + fflush(stdout); } extern int cat_main(int argc, char **argv) { - FILE *file; - - if (argc==1) { - print_file( stdin); - exit( TRUE); - } - - if ( **(argv+1) == '-' ) { - usage ("cat [file ...]\n"); - } - argc--; - - while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv) ) { - file = fopen(*argv, "r"); - if (file == NULL) { - perror(*argv); - exit(FALSE); + FILE *file; + + if (argc == 1) { + print_file(stdin); + exit(TRUE); + } + + if (**(argv + 1) == '-') { + usage("cat [file ...]\n"); + } + argc--; + + while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv)) { + file = fopen(*argv, "r"); + if (file == NULL) { + perror(*argv); + exit(FALSE); + } + print_file(file); } - print_file( file); - } - exit(TRUE); + exit(TRUE); } diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c index b4c5da936..d5e67b599 100644 --- a/chmod_chown_chgrp.c +++ b/chmod_chown_chgrp.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini chown/chmod/chgrp implementation for busybox * @@ -34,8 +35,8 @@ static uid_t uid = -1; static gid_t gid = -1; static int whichApp; -static char* invocationName=NULL; -static char* theMode=NULL; +static char *invocationName = NULL; +static char *theMode = NULL; #define CHGRP_APP 1 @@ -43,130 +44,147 @@ static char* theMode=NULL; #define CHMOD_APP 3 static const char chgrp_usage[] = "chgrp [OPTION]... GROUP FILE...\n\n" - "Change the group membership of each FILE to GROUP.\n" - "\nOptions:\n\t-R\tchange files and directories recursively\n"; -static const char chown_usage[] = "chown [OPTION]... OWNER[.[GROUP] FILE...\n\n" - "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n" - "\nOptions:\n\t-R\tchange files and directories recursively\n"; -static const char chmod_usage[] = "chmod [-R] MODE[,MODE]... FILE...\n\n" -"Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n" -"one or more of the letters rwxst.\n\n" - "\nOptions:\n\t-R\tchange files and directories recursively.\n"; - - -static int fileAction(const char *fileName, struct stat* statbuf) + "Change the group membership of each FILE to GROUP.\n" + + "\nOptions:\n\t-R\tchange files and directories recursively\n"; +static const char chown_usage[] = + "chown [OPTION]... OWNER[.[GROUP] FILE...\n\n" + "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n" + + "\nOptions:\n\t-R\tchange files and directories recursively\n"; +static const char chmod_usage[] = + "chmod [-R] MODE[,MODE]... FILE...\n\n" + "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n" + + "one or more of the letters rwxst.\n\n" + "\nOptions:\n\t-R\tchange files and directories recursively.\n"; + + +static int fileAction(const char *fileName, struct stat *statbuf) { - switch (whichApp) { + switch (whichApp) { case CHGRP_APP: case CHOWN_APP: #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - if (lchown(fileName, (whichApp==CHOWN_APP)? uid : statbuf->st_uid, - (gid==-1)? statbuf->st_gid : gid) == 0) + if (lchown + (fileName, (whichApp == CHOWN_APP) ? uid : statbuf->st_uid, + (gid == -1) ? statbuf->st_gid : gid) == 0) #else - if (chown(fileName, (whichApp==CHOWN_APP)? uid : statbuf->st_uid, - (gid==-1)? statbuf->st_gid : gid) == 0) + if (chown + (fileName, (whichApp == CHOWN_APP) ? uid : statbuf->st_uid, + (gid == -1) ? statbuf->st_gid : gid) == 0) #endif - { - return( TRUE); - } - break; + { + return (TRUE); + } + break; case CHMOD_APP: - /* Parse the specified modes */ - if ( parse_mode(theMode, &(statbuf->st_mode)) == FALSE ) { - fprintf(stderr, "%s: unknown mode: %s\n", invocationName, theMode); - exit( FALSE); - } - if (chmod(fileName, statbuf->st_mode) == 0) - return( TRUE); - break; - } - perror(fileName); - return( FALSE); + /* Parse the specified modes */ + if (parse_mode(theMode, &(statbuf->st_mode)) == FALSE) { + fprintf(stderr, "%s: unknown mode: %s\n", invocationName, + theMode); + exit(FALSE); + } + if (chmod(fileName, statbuf->st_mode) == 0) + return (TRUE); + break; + } + perror(fileName); + return (FALSE); } int chmod_chown_chgrp_main(int argc, char **argv) { - int recursiveFlag=FALSE; - char *groupName; - char *p; - const char *appUsage; - - whichApp = (strcmp(*argv, "chown")==0)? CHOWN_APP : (strcmp(*argv, "chmod")==0)? CHMOD_APP : CHGRP_APP; - - appUsage = (whichApp==CHOWN_APP)? chown_usage : (whichApp==CHMOD_APP)? chmod_usage : chgrp_usage; - - if (argc < 2) - usage( appUsage); - invocationName = *argv; - argc--; - argv++; - - /* Parse options */ - while (**argv == '-') { - while (*++(*argv)) switch (**argv) { - case 'R': - recursiveFlag = TRUE; - break; - default: - fprintf(stderr, invalid_option, invocationName, **argv); - usage( appUsage); - } + int recursiveFlag = FALSE; + char *groupName; + char *p; + const char *appUsage; + + whichApp = + (strcmp(*argv, "chown") == + 0) ? CHOWN_APP : (strcmp(*argv, + "chmod") == 0) ? CHMOD_APP : CHGRP_APP; + + appUsage = + (whichApp == CHOWN_APP) ? chown_usage : (whichApp == + CHMOD_APP) ? chmod_usage : + chgrp_usage; + + if (argc < 2) + usage(appUsage); + invocationName = *argv; argc--; argv++; - } - - if ( whichApp == CHMOD_APP ) { - theMode = *argv; - } else { - - /* Find the selected group */ - if ( whichApp==CHGRP_APP ) { - groupName = *argv; - gid = strtoul(groupName, &p, 10); /* maybe it's already numeric */ - if (groupName == p) - gid = my_getgrnam(groupName); - if (gid == -1) - goto bad_group; - } else { - groupName = strchr(*argv, '.'); - if (groupName) { - *groupName++ = '\0'; - gid = strtoul(groupName, &p, 10); - if (groupName == p) - gid = my_getgrnam(groupName); - if (gid == -1) - goto bad_group; - } else - gid = -1; + + /* Parse options */ + while (**argv == '-') { + while (*++(*argv)) + switch (**argv) { + case 'R': + recursiveFlag = TRUE; + break; + default: + fprintf(stderr, invalid_option, invocationName, **argv); + usage(appUsage); + } + argc--; + argv++; } + if (whichApp == CHMOD_APP) { + theMode = *argv; + } else { - /* Find the selected user (if appropriate) */ - if (whichApp==CHOWN_APP) { - uid = strtoul(*argv, &p, 10); /* if numeric ...*/ - if (*argv == p) - uid = my_getpwnam(*argv); - if (uid == -1) { - fprintf(stderr, "%s: unknown user name: %s\n", invocationName, *argv); - exit( FALSE); - } + /* Find the selected group */ + if (whichApp == CHGRP_APP) { + groupName = *argv; + gid = strtoul(groupName, &p, 10); /* maybe it's already numeric */ + if (groupName == p) + gid = my_getgrnam(groupName); + if (gid == -1) + goto bad_group; + } else { + groupName = strchr(*argv, '.'); + if (groupName) { + *groupName++ = '\0'; + gid = strtoul(groupName, &p, 10); + if (groupName == p) + gid = my_getgrnam(groupName); + if (gid == -1) + goto bad_group; + } else + gid = -1; + } + + + /* Find the selected user (if appropriate) */ + if (whichApp == CHOWN_APP) { + uid = strtoul(*argv, &p, 10); /* if numeric ... */ + if (*argv == p) + uid = my_getpwnam(*argv); + if (uid == -1) { + fprintf(stderr, "%s: unknown user name: %s\n", + invocationName, *argv); + exit(FALSE); + } + } } - } - - /* Ok, ready to do the deed now */ - if (argc <= 1) { - fprintf(stderr, "%s: too few arguments\n", invocationName); - exit( FALSE); - } - while (argc-- > 1) { - if (recursiveAction( *(++argv), recursiveFlag, TRUE, FALSE, fileAction, fileAction)==FALSE) - exit( FALSE); - } - exit(TRUE); - -bad_group: - fprintf(stderr, "%s: unknown group name: %s\n", invocationName, groupName); - exit( FALSE); -} + /* Ok, ready to do the deed now */ + if (argc <= 1) { + fprintf(stderr, "%s: too few arguments\n", invocationName); + exit(FALSE); + } + while (argc-- > 1) { + if (recursiveAction + (*(++argv), recursiveFlag, TRUE, FALSE, fileAction, + fileAction) == FALSE) + exit(FALSE); + } + exit(TRUE); + bad_group: + fprintf(stderr, "%s: unknown group name: %s\n", invocationName, + groupName); + exit(FALSE); +} @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini chroot implementation for busybox * @@ -28,39 +29,39 @@ static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n\n" -"Run COMMAND with root directory set to NEWROOT.\n"; + + "Run COMMAND with root directory set to NEWROOT.\n"; int chroot_main(int argc, char **argv) { - if ( (argc < 2) || (**(argv+1) == '-') ) { - usage( chroot_usage); - } - argc--; - argv++; + if ((argc < 2) || (**(argv + 1) == '-')) { + usage(chroot_usage); + } + argc--; + argv++; - if (chroot (*argv) || (chdir ("/"))) { - fprintf(stderr, "chroot: cannot change root directory to %s: %s\n", - *argv, strerror(errno)); - exit( FALSE); - } + if (chroot(*argv) || (chdir("/"))) { + fprintf(stderr, "chroot: cannot change root directory to %s: %s\n", + *argv, strerror(errno)); + exit(FALSE); + } - argc--; - argv++; - if (argc >= 1) { - fprintf(stderr, "command: %s\n", *argv); - execvp (*argv, argv); - } - else { - char *prog; - prog = getenv ("SHELL"); - if (!prog) - prog = "/bin/sh"; - execlp (prog, prog, NULL); - } - fprintf(stderr, "chroot: cannot execute %s: %s\n", - *argv, strerror(errno)); - exit( FALSE); -} + argc--; + argv++; + if (argc >= 1) { + fprintf(stderr, "command: %s\n", *argv); + execvp(*argv, argv); + } else { + char *prog; + prog = getenv("SHELL"); + if (!prog) + prog = "/bin/sh"; + execlp(prog, prog, NULL); + } + fprintf(stderr, "chroot: cannot execute %s: %s\n", + *argv, strerror(errno)); + exit(FALSE); +} @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * chvt.c - aeb - 940227 - Change virtual terminal * @@ -13,24 +14,23 @@ extern int getfd(void); -int -chvt_main(int argc, char** argv) +int chvt_main(int argc, char **argv) { - int fd, num; + int fd, num; - if ( ( argc != 2) || (**(argv+1) == '-' ) ) { - usage ("chvt N\n\nChange foreground virtual terminal to /dev/ttyN\n"); - } - fd = get_console_fd("/dev/console"); - num = atoi(argv[1]); - if (ioctl(fd,VT_ACTIVATE,num)) { - perror("VT_ACTIVATE"); - exit(FALSE); - } - if (ioctl(fd,VT_WAITACTIVE,num)) { - perror("VT_WAITACTIVE"); - exit(FALSE); - } - exit( TRUE); + if ((argc != 2) || (**(argv + 1) == '-')) { + usage + ("chvt N\n\nChange foreground virtual terminal to /dev/ttyN\n"); + } + fd = get_console_fd("/dev/console"); + num = atoi(argv[1]); + if (ioctl(fd, VT_ACTIVATE, num)) { + perror("VT_ACTIVATE"); + exit(FALSE); + } + if (ioctl(fd, VT_WAITACTIVE, num)) { + perror("VT_WAITACTIVE"); + exit(FALSE); + } + exit(TRUE); } - @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini clear implementation for busybox * @@ -25,9 +26,8 @@ #include <stdio.h> -extern int -clear_main(int argc, char** argv) +extern int clear_main(int argc, char **argv) { printf("\033[H\033[J"); - exit( TRUE); + exit(TRUE); } diff --git a/console-tools/chvt.c b/console-tools/chvt.c index bea00ea83..a32bd3e78 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * chvt.c - aeb - 940227 - Change virtual terminal * @@ -13,24 +14,23 @@ extern int getfd(void); -int -chvt_main(int argc, char** argv) +int chvt_main(int argc, char **argv) { - int fd, num; + int fd, num; - if ( ( argc != 2) || (**(argv+1) == '-' ) ) { - usage ("chvt N\n\nChange foreground virtual terminal to /dev/ttyN\n"); - } - fd = get_console_fd("/dev/console"); - num = atoi(argv[1]); - if (ioctl(fd,VT_ACTIVATE,num)) { - perror("VT_ACTIVATE"); - exit(FALSE); - } - if (ioctl(fd,VT_WAITACTIVE,num)) { - perror("VT_WAITACTIVE"); - exit(FALSE); - } - exit( TRUE); + if ((argc != 2) || (**(argv + 1) == '-')) { + usage + ("chvt N\n\nChange foreground virtual terminal to /dev/ttyN\n"); + } + fd = get_console_fd("/dev/console"); + num = atoi(argv[1]); + if (ioctl(fd, VT_ACTIVATE, num)) { + perror("VT_ACTIVATE"); + exit(FALSE); + } + if (ioctl(fd, VT_WAITACTIVE, num)) { + perror("VT_WAITACTIVE"); + exit(FALSE); + } + exit(TRUE); } - diff --git a/console-tools/clear.c b/console-tools/clear.c index 67a3af983..899840a8a 100644 --- a/console-tools/clear.c +++ b/console-tools/clear.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini clear implementation for busybox * @@ -25,9 +26,8 @@ #include <stdio.h> -extern int -clear_main(int argc, char** argv) +extern int clear_main(int argc, char **argv) { printf("\033[H\033[J"); - exit( TRUE); + exit(TRUE); } diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c index 1e13ff69c..141062edc 100644 --- a/console-tools/deallocvt.c +++ b/console-tools/deallocvt.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s) * Renamed deallocvt. @@ -13,38 +14,39 @@ extern int getfd(void); char *progname; -int -deallocvt_main(int argc, char *argv[]) { - int fd, num, i; +int deallocvt_main(int argc, char *argv[]) +{ + int fd, num, i; - if ( ( argc != 2) || (**(argv+1) == '-' ) ) { - usage ("deallocvt N\n\nDeallocate unused virtual terminal /dev/ttyN\n"); - } + if ((argc != 2) || (**(argv + 1) == '-')) { + usage + ("deallocvt N\n\nDeallocate unused virtual terminal /dev/ttyN\n"); + } - progname = argv[0]; + progname = argv[0]; - fd = get_console_fd("/dev/console"); + fd = get_console_fd("/dev/console"); - if (argc == 1) { - /* deallocate all unused consoles */ - if (ioctl(fd,VT_DISALLOCATE,0)) { - perror("VT_DISALLOCATE"); - exit(1); - } - } else - for (i = 1; i < argc; i++) { - num = atoi(argv[i]); - if (num == 0) - fprintf(stderr, "%s: 0: illegal VT number\n", progname); - else if (num == 1) - fprintf(stderr, "%s: VT 1 cannot be deallocated\n", progname); - else - if (ioctl(fd,VT_DISALLOCATE,num)) { - perror("VT_DISALLOCATE"); - fprintf(stderr, "%s: could not deallocate console %d\n", - progname, num); - exit(1); - } - } - exit(0); + if (argc == 1) { + /* deallocate all unused consoles */ + if (ioctl(fd, VT_DISALLOCATE, 0)) { + perror("VT_DISALLOCATE"); + exit(1); + } + } else + for (i = 1; i < argc; i++) { + num = atoi(argv[i]); + if (num == 0) + fprintf(stderr, "%s: 0: illegal VT number\n", progname); + else if (num == 1) + fprintf(stderr, "%s: VT 1 cannot be deallocated\n", + progname); + else if (ioctl(fd, VT_DISALLOCATE, num)) { + perror("VT_DISALLOCATE"); + fprintf(stderr, "%s: could not deallocate console %d\n", + progname, num); + exit(1); + } + } + exit(0); } diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c index 491bc5ce8..072562f6b 100644 --- a/console-tools/loadacm.c +++ b/console-tools/loadacm.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Derived from * mapscrn.c - version 0.92 @@ -23,120 +24,115 @@ typedef unsigned short unicode; static long int ctoi(unsigned char *s, int *is_unicode); -int old_screen_map_read_ascii(FILE *fp, unsigned char buf[]); -int uni_screen_map_read_ascii(FILE *fp, unicode buf[], int* is_unicode); -unicode utf8_to_ucs2 (char* buf); -int screen_map_load(int fd, FILE *fp); +int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]); +int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode); +unicode utf8_to_ucs2(char *buf); +int screen_map_load(int fd, FILE * fp); int loadacm_main(int argc, char **argv) { - int fd; - - fd = open("/dev/tty", O_RDWR); - if (fd < 0) { - fprintf(stderr, "Error opening /dev/tty1: %s\n", strerror(errno)); - return 1; - } - - if (screen_map_load(fd, stdin)) - { - fprintf(stderr, "Error loading acm: %s\n", strerror(errno)); - return 1; - } - - write(fd, "\033(K", 3); - - return 0; + int fd; + + fd = open("/dev/tty", O_RDWR); + if (fd < 0) { + fprintf(stderr, "Error opening /dev/tty1: %s\n", strerror(errno)); + return 1; + } + + if (screen_map_load(fd, stdin)) { + fprintf(stderr, "Error loading acm: %s\n", strerror(errno)); + return 1; + } + + write(fd, "\033(K", 3); + + return 0; } -int screen_map_load(int fd, FILE *fp) +int screen_map_load(int fd, FILE * fp) { - struct stat stbuf; - unicode wbuf[E_TABSZ]; - unsigned char buf[E_TABSZ]; - int parse_failed = 0; - int is_unicode; - - if (fstat(fp->_fileno, &stbuf)) - perror("Cannot stat map file"), exit(1); - - /* first try a UTF screen-map: either ASCII (no restriction) or binary (regular file) */ - if (!(parse_failed = (-1 == uni_screen_map_read_ascii(fp,wbuf,&is_unicode))) || - (S_ISREG(stbuf.st_mode) && - (stbuf.st_size == (sizeof(unicode) * E_TABSZ)))) /* test for binary UTF map by size */ - { - if (parse_failed) - { - if (-1 == fseek (fp, 0, SEEK_SET)) - { - if (errno == ESPIPE) - fprintf (stderr, "16bit screen-map MUST be a regular file.\n"), exit (1); - else - perror ("fseek failed reading binary 16bit screen-map"), exit (1); - } - - if (fread(wbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) - perror("Cannot read [new] map from file"), exit(1); + struct stat stbuf; + unicode wbuf[E_TABSZ]; + unsigned char buf[E_TABSZ]; + int parse_failed = 0; + int is_unicode; + + if (fstat(fp->_fileno, &stbuf)) + perror("Cannot stat map file"), exit(1); + + /* first try a UTF screen-map: either ASCII (no restriction) or binary (regular file) */ + if (! + (parse_failed = + (-1 == uni_screen_map_read_ascii(fp, wbuf, &is_unicode))) +|| (S_ISREG(stbuf.st_mode) && (stbuf.st_size == (sizeof(unicode) * E_TABSZ)))) { /* test for binary UTF map by size */ + if (parse_failed) { + if (-1 == fseek(fp, 0, SEEK_SET)) { + if (errno == ESPIPE) + fprintf(stderr, + "16bit screen-map MUST be a regular file.\n"), + exit(1); + else + perror("fseek failed reading binary 16bit screen-map"), + exit(1); + } + + if (fread(wbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) + perror("Cannot read [new] map from file"), exit(1); #if 0 - else - fprintf(stderr, "Input screen-map is binary.\n"); + else + fprintf(stderr, "Input screen-map is binary.\n"); #endif + } + + /* if it was effectively a 16-bit ASCII, OK, else try to read as 8-bit map */ + /* same if it was binary, ie. if parse_failed */ + if (parse_failed || is_unicode) { + if (ioctl(fd, PIO_UNISCRNMAP, wbuf)) + perror("PIO_UNISCRNMAP ioctl"), exit(1); + else + return 0; + } } - /* if it was effectively a 16-bit ASCII, OK, else try to read as 8-bit map */ - /* same if it was binary, ie. if parse_failed */ - if (parse_failed || is_unicode) - { - if (ioctl(fd,PIO_UNISCRNMAP,wbuf)) - perror("PIO_UNISCRNMAP ioctl"), exit(1); - else - return 0; + /* rewind... */ + if (-1 == fseek(fp, 0, SEEK_SET)) { + if (errno == ESPIPE) + fprintf(stderr, + "Assuming 8bit screen-map - MUST be a regular file.\n"), + exit(1); + else + perror("fseek failed assuming 8bit screen-map"), exit(1); } - } - - /* rewind... */ - if (-1 == fseek (fp, 0, SEEK_SET)) - { - if (errno == ESPIPE) - fprintf (stderr, "Assuming 8bit screen-map - MUST be a regular file.\n"), exit (1); - else - perror ("fseek failed assuming 8bit screen-map"), exit (1); - } - - /* ... and try an old 8-bit screen-map */ - if (!(parse_failed = (-1 == old_screen_map_read_ascii(fp,buf))) || - (S_ISREG(stbuf.st_mode) && - (stbuf.st_size == E_TABSZ))) /* test for binary old 8-bit map by size */ - { - if (parse_failed) - { - if (-1 == fseek (fp, 0, SEEK_SET)) - { - if (errno == ESPIPE) - /* should not - it succedeed above */ - fprintf (stderr, "fseek() returned ESPIPE !\n"), exit (1); - else - perror ("fseek for binary 8bit screen-map"), exit (1); - } - - if (fread(buf,E_TABSZ,1,fp) != 1) - perror("Cannot read [old] map from file"), exit(1); + + /* ... and try an old 8-bit screen-map */ + if (!(parse_failed = (-1 == old_screen_map_read_ascii(fp, buf))) || + (S_ISREG(stbuf.st_mode) && (stbuf.st_size == E_TABSZ))) { /* test for binary old 8-bit map by size */ + if (parse_failed) { + if (-1 == fseek(fp, 0, SEEK_SET)) { + if (errno == ESPIPE) + /* should not - it succedeed above */ + fprintf(stderr, "fseek() returned ESPIPE !\n"), + exit(1); + else + perror("fseek for binary 8bit screen-map"), exit(1); + } + + if (fread(buf, E_TABSZ, 1, fp) != 1) + perror("Cannot read [old] map from file"), exit(1); #if 0 - else - fprintf(stderr, "Input screen-map is binary.\n"); + else + fprintf(stderr, "Input screen-map is binary.\n"); #endif + } + + if (ioctl(fd, PIO_SCRNMAP, buf)) + perror("PIO_SCRNMAP ioctl"), exit(1); + else + return 0; + } else { + fprintf(stderr, "Error parsing symbolic map\n"); + exit(1); } - - if (ioctl(fd,PIO_SCRNMAP,buf)) - perror("PIO_SCRNMAP ioctl"), exit(1); - else - return 0; - } - else - { - fprintf(stderr, "Error parsing symbolic map\n"); - exit(1); - } } @@ -149,116 +145,111 @@ int screen_map_load(int fd, FILE *fp) * * FIXME: ignores everything after second word */ -int uni_screen_map_read_ascii(FILE *fp, unicode buf[], int *is_unicode) +int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) { - char buffer[256]; /* line buffer reading file */ - char *p, *q; /* 1st + 2nd words in line */ - int in, on; /* the same, as numbers */ - int tmp_is_unicode; /* tmp for is_unicode calculation */ - int i; /* loop index - result holder */ - int ret_code = 0; /* return code */ - sigset_t sigset, old_sigset; - - assert (is_unicode); - - *is_unicode = 0; - - /* first 128 codes defaults to ASCII */ - for (i=0; i<128; i++) buf[i] = i; - /* remaining defaults to replacement char (usually E_TABSZ = 256) */ - for ( ; i<E_TABSZ; i++) buf[i] = 0xfffd; - - /* block SIGCHLD */ - sigemptyset (&sigset); - sigaddset (&sigset, SIGCHLD); - sigprocmask (SIG_BLOCK, &sigset, &old_sigset); - - do - { - if (NULL == fgets(buffer, sizeof(buffer),fp)) - { - if (feof (fp)) - break; - else - { - perror ("uni_screen_map_read_ascii() can't read line"); - exit (2); - } - } - - /* get "charset-relative charcode", stripping leading spaces */ - p = strtok(buffer," \t\n"); - - /* skip empty lines and comments */ - if (!p || *p == '#') - continue; - - /* get unicode mapping */ - q = strtok(NULL," \t\n"); - if (q) - { - in = ctoi(p, NULL); - if (in < 0 || in > 255) - { - ret_code = -1; - break; - } - - on = ctoi(q, &tmp_is_unicode); - if (in < 0 && on > 65535) - { - ret_code = -1; - break; - } - - *is_unicode |= tmp_is_unicode; - buf[in] = on; + char buffer[256]; /* line buffer reading file */ + char *p, *q; /* 1st + 2nd words in line */ + int in, on; /* the same, as numbers */ + int tmp_is_unicode; /* tmp for is_unicode calculation */ + int i; /* loop index - result holder */ + int ret_code = 0; /* return code */ + sigset_t sigset, old_sigset; + + assert(is_unicode); + + *is_unicode = 0; + + /* first 128 codes defaults to ASCII */ + for (i = 0; i < 128; i++) + buf[i] = i; + /* remaining defaults to replacement char (usually E_TABSZ = 256) */ + for (; i < E_TABSZ; i++) + buf[i] = 0xfffd; + + /* block SIGCHLD */ + sigemptyset(&sigset); + sigaddset(&sigset, SIGCHLD); + sigprocmask(SIG_BLOCK, &sigset, &old_sigset); + + do { + if (NULL == fgets(buffer, sizeof(buffer), fp)) { + if (feof(fp)) + break; + else { + perror("uni_screen_map_read_ascii() can't read line"); + exit(2); + } + } + + /* get "charset-relative charcode", stripping leading spaces */ + p = strtok(buffer, " \t\n"); + + /* skip empty lines and comments */ + if (!p || *p == '#') + continue; + + /* get unicode mapping */ + q = strtok(NULL, " \t\n"); + if (q) { + in = ctoi(p, NULL); + if (in < 0 || in > 255) { + ret_code = -1; + break; + } + + on = ctoi(q, &tmp_is_unicode); + if (in < 0 && on > 65535) { + ret_code = -1; + break; + } + + *is_unicode |= tmp_is_unicode; + buf[in] = on; + } else { + ret_code = -1; + break; + } } - else - { - ret_code = -1; - break; - } - } - while (1); /* terminated by break on feof() */ + while (1); /* terminated by break on feof() */ - /* restore sig mask */ - sigprocmask (SIG_SETMASK, &old_sigset, NULL); + /* restore sig mask */ + sigprocmask(SIG_SETMASK, &old_sigset, NULL); - return ret_code; + return ret_code; } -int old_screen_map_read_ascii(FILE *fp, unsigned char buf[]) +int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]) { - char buffer[256]; - int in, on; - char *p, *q; - - for (in=0; in<256; in++) buf[in]=in; - - while (fgets(buffer,sizeof(buffer)-1,fp)) - { - p = strtok(buffer," \t\n"); - - if (!p || *p == '#') - continue; - - q = strtok(NULL," \t\n#"); - if (q) - { - in = ctoi(p, NULL); - if (in < 0 || in > 255) return -1; - - on = ctoi(q, NULL); - if (in < 0 && on > 255) return -1; - - buf[in] = on; + char buffer[256]; + int in, on; + char *p, *q; + + for (in = 0; in < 256; in++) + buf[in] = in; + + while (fgets(buffer, sizeof(buffer) - 1, fp)) { + p = strtok(buffer, " \t\n"); + + if (!p || *p == '#') + continue; + + q = strtok(NULL, " \t\n#"); + if (q) { + in = ctoi(p, NULL); + if (in < 0 || in > 255) + return -1; + + on = ctoi(q, NULL); + if (in < 0 && on > 255) + return -1; + + buf[in] = on; + } else + return -1; } - else return -1; - } - - return(0); + + return (0); } @@ -270,172 +261,145 @@ int old_screen_map_read_ascii(FILE *fp, unsigned char buf[]) * * CAVEAT: will report valid UTF mappings using only 1 byte as 8-bit ones. */ -long int ctoi(unsigned char *s, int *is_unicode) +long int ctoi(unsigned char *s, int *is_unicode) { - int i; - size_t ls; - - ls = strlen(s); - if (is_unicode) *is_unicode = 0; - - /* hex-specified UCS2 */ - if ((strncmp(s,"U+",2) == 0) && - (strspn(s+2,"0123456789abcdefABCDEF") == ls-2)) - { - sscanf(s+2,"%x",&i); - if (is_unicode) *is_unicode = 1; - } - - /* hex-specified byte */ - else if ((ls <= 4) && (strncmp(s,"0x",2) == 0) && - (strspn(s+2,"0123456789abcdefABCDEF") == ls-2)) - sscanf(s+2,"%x",&i); - - /* oct-specified number (byte) */ - else if ((*s == '0') && - (strspn(s,"01234567") == ls)) - sscanf(s,"%o",&i); - - /* dec-specified number (byte) */ - else if (strspn(s,"0123456789") == ls) - sscanf(s,"%d",&i); - - /* single-byte quoted char */ - else if ((strlen(s) == 3) && (s[0] == '\'') && (s[2] == '\'')) - i=s[1]; - - /* multi-byte UTF8 quoted char */ - else if ((s[0] == '\'') && (s[ls-1] == '\'')) - { - s[ls-1] = 0; /* ensure we'll not "parse UTF too far" */ - i = utf8_to_ucs2(s+1); - if (is_unicode) *is_unicode = 1; - } - else - return(-1); - - return(i); + int i; + size_t ls; + + ls = strlen(s); + if (is_unicode) + *is_unicode = 0; + + /* hex-specified UCS2 */ + if ((strncmp(s, "U+", 2) == 0) && + (strspn(s + 2, "0123456789abcdefABCDEF") == ls - 2)) { + sscanf(s + 2, "%x", &i); + if (is_unicode) + *is_unicode = 1; + } + + /* hex-specified byte */ + else if ((ls <= 4) && (strncmp(s, "0x", 2) == 0) && + (strspn(s + 2, "0123456789abcdefABCDEF") == ls - 2)) + sscanf(s + 2, "%x", &i); + + /* oct-specified number (byte) */ + else if ((*s == '0') && (strspn(s, "01234567") == ls)) + sscanf(s, "%o", &i); + + /* dec-specified number (byte) */ + else if (strspn(s, "0123456789") == ls) + sscanf(s, "%d", &i); + + /* single-byte quoted char */ + else if ((strlen(s) == 3) && (s[0] == '\'') && (s[2] == '\'')) + i = s[1]; + + /* multi-byte UTF8 quoted char */ + else if ((s[0] == '\'') && (s[ls - 1] == '\'')) { + s[ls - 1] = 0; /* ensure we'll not "parse UTF too far" */ + i = utf8_to_ucs2(s + 1); + if (is_unicode) + *is_unicode = 1; + } else + return (-1); + + return (i); } -void saveoldmap(int fd, char *omfil) +void saveoldmap(int fd, char *omfil) { - FILE *fp; - char buf[E_TABSZ]; + FILE *fp; + char buf[E_TABSZ]; + #ifdef GIO_UNISCRNMAP - unicode xbuf[E_TABSZ]; - int is_old_map = 0; + unicode xbuf[E_TABSZ]; + int is_old_map = 0; - if (ioctl(fd,GIO_UNISCRNMAP,xbuf)) - { - perror("GIO_UNISCRNMAP ioctl error"); + if (ioctl(fd, GIO_UNISCRNMAP, xbuf)) { + perror("GIO_UNISCRNMAP ioctl error"); #endif - if (ioctl(fd,GIO_SCRNMAP,buf)) - { - perror("GIO_SCRNMAP ioctl error"); - exit(1); - } - else - is_old_map = 1; + if (ioctl(fd, GIO_SCRNMAP, buf)) { + perror("GIO_SCRNMAP ioctl error"); + exit(1); + } else + is_old_map = 1; #ifdef GIO_UNISCRNMAP - } + } #endif - - if ((fp = fopen(omfil, "w")) == NULL) - { - perror(omfil); - exit(1); - } + if ((fp = fopen(omfil, "w")) == NULL) { + perror(omfil); + exit(1); + } #ifdef GIO_UNISCRNMAP - if (is_old_map) - { + if (is_old_map) { #endif - if (fwrite(buf,E_TABSZ,1,fp) != 1) - { - perror("Error writing map to file"); - exit(1); - } + if (fwrite(buf, E_TABSZ, 1, fp) != 1) { + perror("Error writing map to file"); + exit(1); + } #ifdef GIO_UNISCRNMAP - } - else - if (fwrite(xbuf, sizeof(unicode) * E_TABSZ,1,fp) != 1) - { - perror("Error writing map to file"); - exit(1); + } else if (fwrite(xbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) { + perror("Error writing map to file"); + exit(1); } #endif - - fclose(fp); + + fclose(fp); } -unicode utf8_to_ucs2 (char* buf) +unicode utf8_to_ucs2(char *buf) { - int utf_count = 0; - long utf_char; - unicode tc; - unsigned char c; - - do - { - c = *buf; - buf++; - - /* if byte should be part of multi-byte sequence */ - if(c & 0x80) - { - /* if we have already started to parse a UTF8 sequence */ - if (utf_count > 0 && (c & 0xc0) == 0x80) - { - utf_char = (utf_char << 6) | (c & 0x3f); - utf_count--; - if (utf_count == 0) - tc = utf_char; - else - continue; - } - else /* Possibly 1st char of a UTF8 sequence */ - { - if ((c & 0xe0) == 0xc0) - { - utf_count = 1; - utf_char = (c & 0x1f); - } - else if ((c & 0xf0) == 0xe0) - { - utf_count = 2; - utf_char = (c & 0x0f); - } - else if ((c & 0xf8) == 0xf0) - { - utf_count = 3; - utf_char = (c & 0x07); - } - else if ((c & 0xfc) == 0xf8) - { - utf_count = 4; - utf_char = (c & 0x03); - } - else if ((c & 0xfe) == 0xfc) - { - utf_count = 5; - utf_char = (c & 0x01); - } - else - utf_count = 0; - continue; - } - } - else /* not part of multi-byte sequence - treat as ASCII - * this makes incomplete sequences to be ignored - */ - { - tc = c; - utf_count = 0; - } - } - while (utf_count); - - return tc; -} + int utf_count = 0; + long utf_char; + unicode tc; + unsigned char c; + + do { + c = *buf; + buf++; + + /* if byte should be part of multi-byte sequence */ + if (c & 0x80) { + /* if we have already started to parse a UTF8 sequence */ + if (utf_count > 0 && (c & 0xc0) == 0x80) { + utf_char = (utf_char << 6) | (c & 0x3f); + utf_count--; + if (utf_count == 0) + tc = utf_char; + else + continue; + } else { /* Possibly 1st char of a UTF8 sequence */ + + if ((c & 0xe0) == 0xc0) { + utf_count = 1; + utf_char = (c & 0x1f); + } else if ((c & 0xf0) == 0xe0) { + utf_count = 2; + utf_char = (c & 0x0f); + } else if ((c & 0xf8) == 0xf0) { + utf_count = 3; + utf_char = (c & 0x07); + } else if ((c & 0xfc) == 0xf8) { + utf_count = 4; + utf_char = (c & 0x03); + } else if ((c & 0xfe) == 0xfc) { + utf_count = 5; + utf_char = (c & 0x01); + } else + utf_count = 0; + continue; + } + } else { /* not part of multi-byte sequence - treat as ASCII + * this makes incomplete sequences to be ignored + */ + tc = c; + utf_count = 0; + } + } + while (utf_count); + return tc; +} diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index e44525d9c..64b725610 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * loadfont.c - Eugene Crosser & Andries Brouwer * @@ -30,72 +31,69 @@ #define PSF_SEPARATOR 0xFFFF static const char loadfont_usage[] = "loadfont\n" -"\n" -"\tLoad a console font from standard input.\n" -"\n"; + "\n" "\tLoad a console font from standard input.\n" "\n"; -struct psf_header -{ - unsigned char magic1, magic2; /* Magic number */ - unsigned char mode; /* PSF font mode */ - unsigned char charsize; /* Character size */ +struct psf_header { + unsigned char magic1, magic2; /* Magic number */ + unsigned char mode; /* PSF font mode */ + unsigned char charsize; /* Character size */ }; #define PSF_MAGIC_OK(x) ((x).magic1 == PSF_MAGIC1 && (x).magic2 == PSF_MAGIC2) static void loadnewfont(int fd); -extern int -loadfont_main(int argc, char **argv) +extern int loadfont_main(int argc, char **argv) { int fd; fd = open("/dev/tty0", O_RDWR); if (fd < 0) { - fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno)); - return 1; + fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno)); + return 1; } loadnewfont(fd); return 0; } -static void -do_loadfont(int fd, char *inbuf, int unit, int fontsize) { +static void do_loadfont(int fd, char *inbuf, int unit, int fontsize) +{ char buf[16384]; int i; - memset(buf,0,sizeof(buf)); + memset(buf, 0, sizeof(buf)); if (unit < 1 || unit > 32) { - fprintf(stderr, "Bad character size %d\n", unit); - exit(1); + fprintf(stderr, "Bad character size %d\n", unit); + exit(1); } for (i = 0; i < fontsize; i++) - memcpy(buf+(32*i), inbuf+(unit*i), unit); + memcpy(buf + (32 * i), inbuf + (unit * i), unit); #if defined( PIO_FONTX ) && !defined( __sparc__ ) { - struct consolefontdesc cfd; + struct consolefontdesc cfd; - cfd.charcount = fontsize; - cfd.charheight = unit; - cfd.chardata = buf; + cfd.charcount = fontsize; + cfd.charheight = unit; + cfd.chardata = buf; - if (ioctl(fd, PIO_FONTX, &cfd) == 0) - return; /* success */ - perror("PIO_FONTX ioctl error (trying PIO_FONT)"); + if (ioctl(fd, PIO_FONTX, &cfd) == 0) + return; /* success */ + perror("PIO_FONTX ioctl error (trying PIO_FONT)"); } #endif if (ioctl(fd, PIO_FONT, buf)) { - perror("PIO_FONT ioctl error"); - exit(1); + perror("PIO_FONT ioctl error"); + exit(1); } } static void -do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) { +do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) +{ struct unimapinit advice; struct unimapdesc ud; struct unipair *up; @@ -103,23 +101,24 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) { int glyph; u_short unicode; - maxct = tailsz; /* more than enough */ + maxct = tailsz; /* more than enough */ up = (struct unipair *) malloc(maxct * sizeof(struct unipair)); + if (!up) { - fprintf(stderr, "Out of memory?\n"); - exit(1); + fprintf(stderr, "Out of memory?\n"); + exit(1); } for (glyph = 0; glyph < fontsize; glyph++) { - while (tailsz >= 2) { - unicode = (((u_short) inbuf[1]) << 8) + inbuf[0]; - tailsz -= 2; - inbuf += 2; - if (unicode == PSF_SEPARATOR) - break; - up[ct].unicode = unicode; - up[ct].fontpos = glyph; - ct++; - } + while (tailsz >= 2) { + unicode = (((u_short) inbuf[1]) << 8) + inbuf[0]; + tailsz -= 2; + inbuf += 2; + if (unicode == PSF_SEPARATOR) + break; + up[ct].unicode = unicode; + up[ct].fontpos = glyph; + ct++; + } } /* Note: after PIO_UNIMAPCLR and before PIO_UNIMAP @@ -128,33 +127,33 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) { advice.advised_hashsize = 0; advice.advised_hashstep = 0; advice.advised_hashlevel = 0; - if(ioctl(fd, PIO_UNIMAPCLR, &advice)) { + if (ioctl(fd, PIO_UNIMAPCLR, &advice)) { #ifdef ENOIOCTLCMD - if (errno == ENOIOCTLCMD) { - fprintf(stderr, "It seems this kernel is older than 1.1.92\n"); - fprintf(stderr, "No Unicode mapping table loaded.\n"); - } else + if (errno == ENOIOCTLCMD) { + fprintf(stderr, "It seems this kernel is older than 1.1.92\n"); + fprintf(stderr, "No Unicode mapping table loaded.\n"); + } else #endif - perror("PIO_UNIMAPCLR"); - exit(1); + perror("PIO_UNIMAPCLR"); + exit(1); } ud.entry_ct = ct; ud.entries = up; - if(ioctl(fd, PIO_UNIMAP, &ud)) { + if (ioctl(fd, PIO_UNIMAP, &ud)) { #if 0 - if (errno == ENOMEM) { - /* change advice parameters */ - } + if (errno == ENOMEM) { + /* change advice parameters */ + } #endif - perror("PIO_UNIMAP"); - exit(1); + perror("PIO_UNIMAP"); + exit(1); } } -static void -loadnewfont(int fd) { +static void loadnewfont(int fd) +{ int unit; - char inbuf[32768]; /* primitive */ + char inbuf[32768]; /* primitive */ int inputlth, offset; /* @@ -178,57 +177,58 @@ loadnewfont(int fd) { /* test for psf first */ { - struct psf_header psfhdr; - int fontsize; - int hastable; - int head0, head; + struct psf_header psfhdr; + int fontsize; + int hastable; + int head0, head; - if (inputlth < sizeof(struct psf_header)) - goto no_psf; + if (inputlth < sizeof(struct psf_header)) + goto no_psf; - psfhdr = * (struct psf_header *) &inbuf[0]; + psfhdr = *(struct psf_header *) &inbuf[0]; - if (!PSF_MAGIC_OK(psfhdr)) - goto no_psf; + if (!PSF_MAGIC_OK(psfhdr)) + goto no_psf; - if (psfhdr.mode > PSF_MAXMODE) { - fprintf(stderr, "Unsupported psf file mode\n"); - exit(1); - } - fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); + if (psfhdr.mode > PSF_MAXMODE) { + fprintf(stderr, "Unsupported psf file mode\n"); + exit(1); + } + fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); #if !defined( PIO_FONTX ) || defined( __sparc__ ) - if (fontsize != 256) { - fprintf(stderr, "Only fontsize 256 supported\n"); - exit(1); - } + if (fontsize != 256) { + fprintf(stderr, "Only fontsize 256 supported\n"); + exit(1); + } #endif - hastable = (psfhdr.mode & PSF_MODEHASTAB); - unit = psfhdr.charsize; - head0 = sizeof(struct psf_header); - head = head0 + fontsize*unit; - if (head > inputlth || (!hastable && head != inputlth)) { - fprintf(stderr, "Input file: bad length\n"); - exit(1); - } - do_loadfont(fd, inbuf + head0, unit, fontsize); - if (hastable) - do_loadtable(fd, inbuf + head, inputlth-head, fontsize); - return; + hastable = (psfhdr.mode & PSF_MODEHASTAB); + unit = psfhdr.charsize; + head0 = sizeof(struct psf_header); + + head = head0 + fontsize * unit; + if (head > inputlth || (!hastable && head != inputlth)) { + fprintf(stderr, "Input file: bad length\n"); + exit(1); + } + do_loadfont(fd, inbuf + head0, unit, fontsize); + if (hastable) + do_loadtable(fd, inbuf + head, inputlth - head, fontsize); + return; } - no_psf: + no_psf: /* file with three code pages? */ if (inputlth == 9780) { - offset = 40; - unit = 16; + offset = 40; + unit = 16; } else { - /* bare font */ - if (inputlth & 0377) { - fprintf(stderr, "Bad input file size\n"); - exit(1); - } - offset = 0; - unit = inputlth/256; + /* bare font */ + if (inputlth & 0377) { + fprintf(stderr, "Bad input file size\n"); + exit(1); + } + offset = 0; + unit = inputlth / 256; } - do_loadfont(fd, inbuf+offset, unit, 256); + do_loadfont(fd, inbuf + offset, unit, 256); } diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index a228ca460..aa4f6bbc8 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini loadkmap implementation for busybox * @@ -29,61 +30,63 @@ static const char loadkmap_usage[] = "loadkmap\n" -"\n" -"\tLoad a binary keyboard translation table from standard input.\n" -"\n"; + "\n" + "\tLoad a binary keyboard translation table from standard input.\n" + "\n"; -int -loadkmap_main(int argc, char * * argv) -{ - struct kbentry ke; - u_short *ibuff; - int i,j,fd,readsz,pos,ibuffsz=NR_KEYS * sizeof(u_short); - char flags[MAX_NR_KEYMAPS],magic[]="bkeymap",buff[7]; - fd = open("/dev/tty0", O_RDWR); - if (fd < 0) { - fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno)); - return 1; - } +int loadkmap_main(int argc, char **argv) +{ + struct kbentry ke; + u_short *ibuff; + int i, j, fd, readsz, pos, ibuffsz = NR_KEYS * sizeof(u_short); + char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap", buff[7]; - read(0,buff,7); - if (0 != strncmp(buff,magic,7)) { - fprintf(stderr, "This is not a valid binary keymap.\n"); - return 1; - } - - if ( MAX_NR_KEYMAPS != read(0,flags,MAX_NR_KEYMAPS) ) { - fprintf(stderr, "Error reading keymap flags: %s\n", strerror(errno)); - return 1; - } + fd = open("/dev/tty0", O_RDWR); + if (fd < 0) { + fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno)); + return 1; + } + + read(0, buff, 7); + if (0 != strncmp(buff, magic, 7)) { + fprintf(stderr, "This is not a valid binary keymap.\n"); + return 1; + } - ibuff=(u_short *) malloc(ibuffsz); - if (!ibuff) { - fprintf(stderr, "Out of memory.\n"); - return 1; - } + if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS)) { + fprintf(stderr, "Error reading keymap flags: %s\n", + strerror(errno)); + return 1; + } + + ibuff = (u_short *) malloc(ibuffsz); + if (!ibuff) { + fprintf(stderr, "Out of memory.\n"); + return 1; + } - for(i=0; i<MAX_NR_KEYMAPS; i++) { - if (flags[i]==1){ - pos=0; - while (pos < ibuffsz) { - if ( (readsz = read(0,(char *)ibuff+pos,ibuffsz-pos)) < 0 ) { - fprintf(stderr, "Error reading keymap: %s\n", - strerror(errno)); - return 1; - } - pos += readsz; - } - for(j=0; j<NR_KEYS; j++) { - ke.kb_index = j; - ke.kb_table = i; - ke.kb_value = ibuff[j]; - ioctl(fd, KDSKBENT, &ke); - } + for (i = 0; i < MAX_NR_KEYMAPS; i++) { + if (flags[i] == 1) { + pos = 0; + while (pos < ibuffsz) { + if ((readsz = read(0, (char *) ibuff + pos, ibuffsz - pos)) + < 0) { + fprintf(stderr, "Error reading keymap: %s\n", + strerror(errno)); + return 1; + } + pos += readsz; + } + for (j = 0; j < NR_KEYS; j++) { + ke.kb_index = j; + ke.kb_table = i; + ke.kb_value = ibuff[j]; + ioctl(fd, KDSKBENT, &ke); + } + } } - } - close (fd); - return 0; + close(fd); + return 0; } diff --git a/coreutils/cat.c b/coreutils/cat.c index 0d32efe84..86f85fe8e 100644 --- a/coreutils/cat.c +++ b/coreutils/cat.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini Cat implementation for busybox * @@ -24,36 +25,37 @@ #include <stdio.h> -static void print_file( FILE *file) +static void print_file(FILE * file) { - int c; - while ((c = getc(file)) != EOF) - putc(c, stdout); - fclose(file); - fflush(stdout); + int c; + + while ((c = getc(file)) != EOF) + putc(c, stdout); + fclose(file); + fflush(stdout); } extern int cat_main(int argc, char **argv) { - FILE *file; - - if (argc==1) { - print_file( stdin); - exit( TRUE); - } - - if ( **(argv+1) == '-' ) { - usage ("cat [file ...]\n"); - } - argc--; - - while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv) ) { - file = fopen(*argv, "r"); - if (file == NULL) { - perror(*argv); - exit(FALSE); + FILE *file; + + if (argc == 1) { + print_file(stdin); + exit(TRUE); + } + + if (**(argv + 1) == '-') { + usage("cat [file ...]\n"); + } + argc--; + + while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv)) { + file = fopen(*argv, "r"); + if (file == NULL) { + perror(*argv); + exit(FALSE); + } + print_file(file); } - print_file( file); - } - exit(TRUE); + exit(TRUE); } diff --git a/coreutils/chroot.c b/coreutils/chroot.c index 16524d92e..6a01be603 100644 --- a/coreutils/chroot.c +++ b/coreutils/chroot.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini chroot implementation for busybox * @@ -28,39 +29,39 @@ static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n\n" -"Run COMMAND with root directory set to NEWROOT.\n"; + + "Run COMMAND with root directory set to NEWROOT.\n"; int chroot_main(int argc, char **argv) { - if ( (argc < 2) || (**(argv+1) == '-') ) { - usage( chroot_usage); - } - argc--; - argv++; + if ((argc < 2) || (**(argv + 1) == '-')) { + usage(chroot_usage); + } + argc--; + argv++; - if (chroot (*argv) || (chdir ("/"))) { - fprintf(stderr, "chroot: cannot change root directory to %s: %s\n", - *argv, strerror(errno)); - exit( FALSE); - } + if (chroot(*argv) || (chdir("/"))) { + fprintf(stderr, "chroot: cannot change root directory to %s: %s\n", + *argv, strerror(errno)); + exit(FALSE); + } - argc--; - argv++; - if (argc >= 1) { - fprintf(stderr, "command: %s\n", *argv); - execvp (*argv, argv); - } - else { - char *prog; - prog = getenv ("SHELL"); - if (!prog) - prog = "/bin/sh"; - execlp (prog, prog, NULL); - } - fprintf(stderr, "chroot: cannot execute %s: %s\n", - *argv, strerror(errno)); - exit( FALSE); -} + argc--; + argv++; + if (argc >= 1) { + fprintf(stderr, "command: %s\n", *argv); + execvp(*argv, argv); + } else { + char *prog; + prog = getenv("SHELL"); + if (!prog) + prog = "/bin/sh"; + execlp(prog, prog, NULL); + } + fprintf(stderr, "chroot: cannot execute %s: %s\n", + *argv, strerror(errno)); + exit(FALSE); +} diff --git a/coreutils/date.c b/coreutils/date.c index a3528921d..b4c3e7153 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini date implementation for busybox * @@ -38,12 +39,13 @@ an RFC 822 complient date output for shell scripting mail commands */ -static const char date_usage[] = "date [OPTION]... [+FORMAT]\n" -" or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n\n" -"Display the current time in the given FORMAT, or set the system date.\n" -"\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n" -"\t-s\t\tset time described by STRING\n" -"\t-u\t\tprint or set Coordinated Universal Time\n"; +static const char date_usage[] = "date [OPTION]... [+FORMAT]\n" + " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n\n" + "Display the current time in the given FORMAT, or set the system date.\n" + "\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n" + "\t-s\t\tset time described by STRING\n" + + "\t-u\t\tprint or set Coordinated Universal Time\n"; /* Input parsing code is always bulky - used heavy duty libc stuff as @@ -51,240 +53,233 @@ static const char date_usage[] = "date [OPTION]... [+FORMAT]\n" /* Default input handling to save suprising some people */ -struct tm * -date_conv_time(struct tm *tm_time, const char *t_string) { - int nr; - - nr = sscanf(t_string, "%2d%2d%2d%2d%d", - &(tm_time->tm_mon), - &(tm_time->tm_mday), - &(tm_time->tm_hour), - &(tm_time->tm_min), - &(tm_time->tm_year)); - - if(nr < 4 || nr > 5) { - fprintf(stderr, invalid_date, "date", t_string); - exit( FALSE); - } - - /* correct for century - minor Y2K problem here? */ - if(tm_time->tm_year >= 1900) - tm_time->tm_year -= 1900; - /* adjust date */ - tm_time->tm_mon -= 1; - - return(tm_time); +struct tm *date_conv_time(struct tm *tm_time, const char *t_string) +{ + int nr; + + nr = sscanf(t_string, "%2d%2d%2d%2d%d", + &(tm_time->tm_mon), + &(tm_time->tm_mday), + &(tm_time->tm_hour), + &(tm_time->tm_min), &(tm_time->tm_year)); + + if (nr < 4 || nr > 5) { + fprintf(stderr, invalid_date, "date", t_string); + exit(FALSE); + } + + /* correct for century - minor Y2K problem here? */ + if (tm_time->tm_year >= 1900) + tm_time->tm_year -= 1900; + /* adjust date */ + tm_time->tm_mon -= 1; + + return (tm_time); } /* The new stuff for LRP */ -struct tm * -date_conv_ftime(struct tm *tm_time, const char *t_string) { - struct tm itm_time, jtm_time, ktm_time, \ - ltm_time, mtm_time, ntm_time; - - itm_time = *tm_time; - jtm_time = *tm_time; - ktm_time = *tm_time; - ltm_time = *tm_time; - mtm_time = *tm_time; - ntm_time = *tm_time; - - /* Parse input and assign appropriately to tm_time */ - - if(sscanf(t_string, "%d:%d:%d", - &itm_time.tm_hour, - &itm_time.tm_min, - &itm_time.tm_sec) == 3 ) { - - *tm_time = itm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d:%d", - &jtm_time.tm_hour, - &jtm_time.tm_min) == 2) { - - *tm_time = jtm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d.%d-%d:%d:%d", - &ktm_time.tm_mon, - &ktm_time.tm_mday, - &ktm_time.tm_hour, - &ktm_time.tm_min, - &ktm_time.tm_sec) == 5) { - - ktm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = ktm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d.%d-%d:%d", - <m_time.tm_mon, - <m_time.tm_mday, - <m_time.tm_hour, - <m_time.tm_min) == 4) { - - ltm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = ltm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d.%d.%d-%d:%d:%d", - &mtm_time.tm_year, - &mtm_time.tm_mon, - &mtm_time.tm_mday, - &mtm_time.tm_hour, - &mtm_time.tm_min, - &mtm_time.tm_sec) == 6) { - - mtm_time.tm_year -= 1900; /* Adjust years */ - mtm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = mtm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d.%d.%d-%d:%d", - &ntm_time.tm_year, - &ntm_time.tm_mon, - &ntm_time.tm_mday, - &ntm_time.tm_hour, - &ntm_time.tm_min) == 5) { - ntm_time.tm_year -= 1900; /* Adjust years */ - ntm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = ntm_time; - return(tm_time); - - } - - fprintf(stderr, invalid_date, "date", t_string); - - exit( FALSE); +struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string) +{ + struct tm itm_time, jtm_time, ktm_time, ltm_time, mtm_time, ntm_time; + + itm_time = *tm_time; + jtm_time = *tm_time; + ktm_time = *tm_time; + ltm_time = *tm_time; + mtm_time = *tm_time; + ntm_time = *tm_time; + + /* Parse input and assign appropriately to tm_time */ + + if (sscanf(t_string, "%d:%d:%d", + &itm_time.tm_hour, &itm_time.tm_min, &itm_time.tm_sec) == 3) { + + *tm_time = itm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d:%d", + &jtm_time.tm_hour, &jtm_time.tm_min) == 2) { + + *tm_time = jtm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d.%d-%d:%d:%d", + &ktm_time.tm_mon, + &ktm_time.tm_mday, + &ktm_time.tm_hour, + &ktm_time.tm_min, &ktm_time.tm_sec) == 5) { + + ktm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + *tm_time = ktm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d.%d-%d:%d", + <m_time.tm_mon, + <m_time.tm_mday, + <m_time.tm_hour, <m_time.tm_min) == 4) { + + ltm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + *tm_time = ltm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d.%d.%d-%d:%d:%d", + &mtm_time.tm_year, + &mtm_time.tm_mon, + &mtm_time.tm_mday, + &mtm_time.tm_hour, + &mtm_time.tm_min, &mtm_time.tm_sec) == 6) { + + mtm_time.tm_year -= 1900; /* Adjust years */ + mtm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + *tm_time = mtm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d.%d.%d-%d:%d", + &ntm_time.tm_year, + &ntm_time.tm_mon, + &ntm_time.tm_mday, + &ntm_time.tm_hour, &ntm_time.tm_min) == 5) { + ntm_time.tm_year -= 1900; /* Adjust years */ + ntm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + *tm_time = ntm_time; + return (tm_time); + + } + + fprintf(stderr, invalid_date, "date", t_string); + + exit(FALSE); } -int -date_main(int argc, char * * argv) +int date_main(int argc, char **argv) { - char *date_str = NULL; - char *date_fmt = NULL; - char *t_buff; - int i; - int set_time = 0; - int rfc822 = 0; - int utc = 0; - int use_arg = 0; - time_t tm; - struct tm tm_time; - - /* Interpret command line args */ - i = --argc; - argv++; - while (i > 0 && **argv) { - if (**argv == '-') { - while (i>0 && *++(*argv)) switch (**argv) { - case 'R': - rfc822 = 1; - break; - case 's': - set_time = 1; - if(date_str != NULL) usage ( date_usage); - date_str = optarg; - break; - case 'u': - utc = 1; - if (putenv ("TZ=UTC0") != 0) { - fprintf(stderr, memory_exhausted, "date"); - exit( FALSE); + char *date_str = NULL; + char *date_fmt = NULL; + char *t_buff; + int i; + int set_time = 0; + int rfc822 = 0; + int utc = 0; + int use_arg = 0; + time_t tm; + struct tm tm_time; + + /* Interpret command line args */ + i = --argc; + argv++; + while (i > 0 && **argv) { + if (**argv == '-') { + while (i > 0 && *++(*argv)) + switch (**argv) { + case 'R': + rfc822 = 1; + break; + case 's': + set_time = 1; + if (date_str != NULL) + usage(date_usage); + date_str = optarg; + break; + case 'u': + utc = 1; + if (putenv("TZ=UTC0") != 0) { + fprintf(stderr, memory_exhausted, "date"); + exit(FALSE); + } + /* Look ma, no break. Don't fix it either. */ + case 'd': + use_arg = 1; + if (date_str != NULL) + usage(date_usage); + date_str = optarg; + break; + case '-': + usage(date_usage); + } + } else { + if ((date_fmt == NULL) && (strcmp(*argv, "+") == 0)) + date_fmt = *argv; + else if (date_str == NULL) { + set_time = 1; + date_str = *argv; + } else { + usage(date_usage); + } } - /* Look ma, no break. Don't fix it either. */ - case 'd': - use_arg = 1; - if(date_str != NULL) usage ( date_usage); - date_str = optarg; - break; - case '-': - usage ( date_usage); - } - } else { - if ( (date_fmt == NULL) && (strcmp(*argv, "+")==0) ) - date_fmt=*argv; - else if (date_str == NULL) { - set_time = 1; - date_str=*argv; - } else { - usage ( date_usage); - } + i--; + argv++; } - i--; - argv++; - } - - - /* Now we have parsed all the information except the date format - which depends on whether the clock is being set or read */ - - time(&tm); - memcpy(&tm_time, localtime(&tm), sizeof(tm_time)); - /* Zero out fields - take her back to midnight!*/ - if(date_str != NULL) { - tm_time.tm_sec = 0; - tm_time.tm_min = 0; - tm_time.tm_hour = 0; - } - - /* Process any date input to UNIX time since 1 Jan 1970 */ - if(date_str != NULL) { - - if(strchr(date_str, ':') != NULL) { - date_conv_ftime(&tm_time, date_str); - } else { - date_conv_time(&tm_time, date_str); - } - - /* Correct any day of week and day of year etc fields */ - tm = mktime(&tm_time); - if (tm < 0 ) { - fprintf(stderr, invalid_date, "date", date_str); - exit( FALSE); - } - - /* if setting time, set it */ - if(set_time) { - if( stime(&tm) < 0) { - fprintf(stderr, "date: can't set date.\n"); - exit( FALSE); - } - } - } - - /* Display output */ - - /* Deal with format string */ - if(date_fmt == NULL) { - date_fmt = (rfc822 - ? (utc - ? "%a, %_d %b %Y %H:%M:%S GMT" - : "%a, %_d %b %Y %H:%M:%S %z") - : "%a %b %e %H:%M:%S %Z %Y"); - - } else if ( *date_fmt == '\0' ) { - /* Imitate what GNU 'date' does with NO format string! */ - printf ("\n"); - exit( TRUE); - } - - /* Handle special conversions */ - - if( strncmp( date_fmt, "%f", 2) == 0 ) { - date_fmt = "%Y.%m.%d-%H:%M:%S"; - } - - /* Print OUTPUT (after ALL that!) */ - t_buff = malloc(201); - strftime(t_buff, 200, date_fmt, &tm_time); - printf("%s\n", t_buff); - - exit( TRUE); + + + /* Now we have parsed all the information except the date format + which depends on whether the clock is being set or read */ + + time(&tm); + memcpy(&tm_time, localtime(&tm), sizeof(tm_time)); + /* Zero out fields - take her back to midnight! */ + if (date_str != NULL) { + tm_time.tm_sec = 0; + tm_time.tm_min = 0; + tm_time.tm_hour = 0; + } + + /* Process any date input to UNIX time since 1 Jan 1970 */ + if (date_str != NULL) { + + if (strchr(date_str, ':') != NULL) { + date_conv_ftime(&tm_time, date_str); + } else { + date_conv_time(&tm_time, date_str); + } + + /* Correct any day of week and day of year etc fields */ + tm = mktime(&tm_time); + if (tm < 0) { + fprintf(stderr, invalid_date, "date", date_str); + exit(FALSE); + } + + /* if setting time, set it */ + if (set_time) { + if (stime(&tm) < 0) { + fprintf(stderr, "date: can't set date.\n"); + exit(FALSE); + } + } + } + + /* Display output */ + + /* Deal with format string */ + if (date_fmt == NULL) { + date_fmt = (rfc822 + ? (utc + ? "%a, %_d %b %Y %H:%M:%S GMT" + : "%a, %_d %b %Y %H:%M:%S %z") + : "%a %b %e %H:%M:%S %Z %Y"); + + } else if (*date_fmt == '\0') { + /* Imitate what GNU 'date' does with NO format string! */ + printf("\n"); + exit(TRUE); + } + + /* Handle special conversions */ + + if (strncmp(date_fmt, "%f", 2) == 0) { + date_fmt = "%Y.%m.%d-%H:%M:%S"; + } + + /* Print OUTPUT (after ALL that!) */ + t_buff = malloc(201); + strftime(t_buff, 200, date_fmt, &tm_time); + printf("%s\n", t_buff); + + exit(TRUE); } diff --git a/coreutils/dd.c b/coreutils/dd.c index 3e1024a60..0d5b3e8ab 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini dd implementation for busybox * @@ -40,164 +41,159 @@ typedef unsigned long long int uintmax_t; #endif static const char dd_usage[] = -"dd [if=name] [of=name] [bs=n] [count=n] [skip=n] [seek=n]\n\n" -"Copy a file, converting and formatting according to options\n\n" -"\tif=FILE\tread from FILE instead of stdin\n" -"\tof=FILE\twrite to FILE instead of stdout\n" -"\tbs=n\tread and write n bytes at a time\n" -"\tcount=n\tcopy only n input blocks\n" -"\tskip=n\tskip n input blocks\n" -"\tseek=n\tskip n output blocks\n" -"\n" -"Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"; + "dd [if=name] [of=name] [bs=n] [count=n] [skip=n] [seek=n]\n\n" + "Copy a file, converting and formatting according to options\n\n" + "\tif=FILE\tread from FILE instead of stdin\n" + "\tof=FILE\twrite to FILE instead of stdout\n" + "\tbs=n\tread and write n bytes at a time\n" + "\tcount=n\tcopy only n input blocks\n" + "\tskip=n\tskip n input blocks\n" + "\tseek=n\tskip n output blocks\n" + "\n" + "Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"; -extern int dd_main (int argc, char **argv) + +extern int dd_main(int argc, char **argv) { - const char *inFile = NULL; - const char *outFile = NULL; - char *cp; - int inFd; - int outFd; - int inCc = 0; - int outCc; - long blockSize = 512; - uintmax_t skipBlocks = 0; - uintmax_t seekBlocks = 0; - uintmax_t count = (uintmax_t)-1; - uintmax_t intotal; - uintmax_t outTotal; - unsigned char *buf; - - argc--; - argv++; - - /* Parse any options */ - while (argc) { - if (inFile == NULL && (strncmp(*argv, "if", 2) == 0)) - inFile=((strchr(*argv, '='))+1); - else if (outFile == NULL && (strncmp(*argv, "of", 2) == 0)) - outFile=((strchr(*argv, '='))+1); - else if (strncmp("count", *argv, 5) == 0) { - count = getNum ((strchr(*argv, '='))+1); - if (count <= 0) { - fprintf (stderr, "Bad count value %s\n", *argv); - goto usage; - } - } - else if (strncmp(*argv, "bs", 2) == 0) { - blockSize = getNum ((strchr(*argv, '='))+1); - if (blockSize <= 0) { - fprintf (stderr, "Bad block size value %s\n", *argv); - goto usage; - } - } - else if (strncmp(*argv, "skip", 4) == 0) { - skipBlocks = getNum ((strchr(*argv, '='))+1); - if (skipBlocks <= 0) { - fprintf (stderr, "Bad skip value %s\n", *argv); - goto usage; - } + const char *inFile = NULL; + const char *outFile = NULL; + char *cp; + int inFd; + int outFd; + int inCc = 0; + int outCc; + long blockSize = 512; + uintmax_t skipBlocks = 0; + uintmax_t seekBlocks = 0; + uintmax_t count = (uintmax_t) - 1; + uintmax_t intotal; + uintmax_t outTotal; + unsigned char *buf; + + argc--; + argv++; + /* Parse any options */ + while (argc) { + if (inFile == NULL && (strncmp(*argv, "if", 2) == 0)) + inFile = ((strchr(*argv, '=')) + 1); + else if (outFile == NULL && (strncmp(*argv, "of", 2) == 0)) + outFile = ((strchr(*argv, '=')) + 1); + else if (strncmp("count", *argv, 5) == 0) { + count = getNum((strchr(*argv, '=')) + 1); + if (count <= 0) { + fprintf(stderr, "Bad count value %s\n", *argv); + goto usage; + } + } else if (strncmp(*argv, "bs", 2) == 0) { + blockSize = getNum((strchr(*argv, '=')) + 1); + if (blockSize <= 0) { + fprintf(stderr, "Bad block size value %s\n", *argv); + goto usage; + } + } else if (strncmp(*argv, "skip", 4) == 0) { + skipBlocks = getNum((strchr(*argv, '=')) + 1); + if (skipBlocks <= 0) { + fprintf(stderr, "Bad skip value %s\n", *argv); + goto usage; + } + + } else if (strncmp(*argv, "seek", 4) == 0) { + seekBlocks = getNum((strchr(*argv, '=')) + 1); + if (seekBlocks <= 0) { + fprintf(stderr, "Bad seek value %s\n", *argv); + goto usage; + } + + } else { + goto usage; + } + argc--; + argv++; } - else if (strncmp(*argv, "seek", 4) == 0) { - seekBlocks = getNum ((strchr(*argv, '='))+1); - if (seekBlocks <= 0) { - fprintf (stderr, "Bad seek value %s\n", *argv); - goto usage; - } + buf = malloc(blockSize); + if (buf == NULL) { + fprintf(stderr, "Cannot allocate buffer\n"); + exit(FALSE); } - else { - goto usage; + + intotal = 0; + outTotal = 0; + + if (inFile == NULL) + inFd = fileno(stdin); + else + inFd = open(inFile, 0); + + if (inFd < 0) { + perror(inFile); + free(buf); + exit(FALSE); } - argc--; - argv++; - } - - buf = malloc (blockSize); - if (buf == NULL) { - fprintf (stderr, "Cannot allocate buffer\n"); - exit( FALSE); - } - - intotal = 0; - outTotal = 0; - - if (inFile == NULL) - inFd = fileno(stdin); - else - inFd = open (inFile, 0); - - if (inFd < 0) { - perror (inFile); - free (buf); - exit( FALSE); - } - - if (outFile == NULL) - outFd = fileno(stdout); - else - outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666); - - if (outFd < 0) { - perror (outFile); - close (inFd); - free (buf); - exit( FALSE); - } - - lseek(inFd, skipBlocks*blockSize, SEEK_SET); - lseek(outFd, seekBlocks*blockSize, SEEK_SET); - // - //TODO: Convert to using fullRead & fullWrite - // from utility.c - // -Erik - while (outTotal < count * blockSize) { - inCc = read (inFd, buf, blockSize); - if (inCc < 0) { - perror (inFile); - goto cleanup; - } else if (inCc == 0) { - goto cleanup; + + if (outFile == NULL) + outFd = fileno(stdout); + else + outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666); + + if (outFd < 0) { + perror(outFile); + close(inFd); + free(buf); + exit(FALSE); } - intotal += inCc; - cp = buf; - - while (intotal > outTotal) { - if (outTotal + inCc > count * blockSize) - inCc = count * blockSize - outTotal; - outCc = write (outFd, cp, inCc); - if (outCc < 0) { - perror (outFile); - goto cleanup; - } else if (outCc == 0) { - goto cleanup; - } - - inCc -= outCc; - cp += outCc; - outTotal += outCc; + + lseek(inFd, skipBlocks * blockSize, SEEK_SET); + lseek(outFd, seekBlocks * blockSize, SEEK_SET); + // + //TODO: Convert to using fullRead & fullWrite + // from utility.c + // -Erik + while (outTotal < count * blockSize) { + inCc = read(inFd, buf, blockSize); + if (inCc < 0) { + perror(inFile); + goto cleanup; + } else if (inCc == 0) { + goto cleanup; + } + intotal += inCc; + cp = buf; + + while (intotal > outTotal) { + if (outTotal + inCc > count * blockSize) + inCc = count * blockSize - outTotal; + outCc = write(outFd, cp, inCc); + if (outCc < 0) { + perror(outFile); + goto cleanup; + } else if (outCc == 0) { + goto cleanup; + } + + inCc -= outCc; + cp += outCc; + outTotal += outCc; + } } - } - if (inCc < 0) - perror (inFile); + if (inCc < 0) + perror(inFile); cleanup: - close (inFd); - close (outFd); - free (buf); - - printf ("%ld+%d records in\n", (long)(intotal / blockSize), - (intotal % blockSize) != 0); - printf ("%ld+%d records out\n", (long)(outTotal / blockSize), - (outTotal % blockSize) != 0); - exit( TRUE); + close(inFd); + close(outFd); + free(buf); + + printf("%ld+%d records in\n", (long) (intotal / blockSize), + (intotal % blockSize) != 0); + printf("%ld+%d records out\n", (long) (outTotal / blockSize), + (outTotal % blockSize) != 0); + exit(TRUE); usage: - usage( dd_usage); + usage(dd_usage); } - - diff --git a/coreutils/df.c b/coreutils/df.c index 24c94a246..43d5d26e7 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini df implementation for busybox * @@ -29,81 +30,81 @@ #include <fstab.h> static const char df_usage[] = "df [filesystem ...]\n" - "\n" "\tPrint the filesystem space used and space available.\n"; -extern const char mtab_file[]; /* Defined in utility.c */ + "\n" "\tPrint the filesystem space used and space available.\n"; + +extern const char mtab_file[]; /* Defined in utility.c */ static int df(char *device, const char *mountPoint) { - struct statfs s; - long blocks_used; - long blocks_percent_used; - struct fstab* fstabItem; - - if (statfs(mountPoint, &s) != 0) { - perror(mountPoint); - return FALSE; - } + struct statfs s; + long blocks_used; + long blocks_percent_used; + struct fstab *fstabItem; - if (s.f_blocks > 0) { - blocks_used = s.f_blocks - s.f_bfree; - blocks_percent_used = (long) - (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5); - /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */ - if (strcmp (device, "/dev/root") == 0) { - fstabItem = getfsfile ("/"); - if (fstabItem != NULL) - device = fstabItem->fs_spec; + if (statfs(mountPoint, &s) != 0) { + perror(mountPoint); + return FALSE; } - printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", - device, - (long) (s.f_blocks * (s.f_bsize / 1024.0)), - (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)), - (long) (s.f_bavail * (s.f_bsize / 1024.0)), - blocks_percent_used, mountPoint); - } + if (s.f_blocks > 0) { + blocks_used = s.f_blocks - s.f_bfree; + blocks_percent_used = (long) + (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5); + /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */ + if (strcmp(device, "/dev/root") == 0) { + fstabItem = getfsfile("/"); + if (fstabItem != NULL) + device = fstabItem->fs_spec; + } + printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", + device, + (long) (s.f_blocks * (s.f_bsize / 1024.0)), + (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)), + (long) (s.f_bavail * (s.f_bsize / 1024.0)), + blocks_percent_used, mountPoint); + + } - return TRUE; + return TRUE; } extern int df_main(int argc, char **argv) { - printf("%-20s %-14s %s %s %s %s\n", "Filesystem", - "1k-blocks", "Used", "Available", "Use%", "Mounted on"); + printf("%-20s %-14s %s %s %s %s\n", "Filesystem", + "1k-blocks", "Used", "Available", "Use%", "Mounted on"); - if (argc > 1) { - struct mntent *mountEntry; - int status; + if (argc > 1) { + struct mntent *mountEntry; + int status; - while (argc > 1) { - if ((mountEntry = findMountPoint(argv[1], mtab_file)) == - 0) { - fprintf(stderr, "%s: can't find mount point.\n", argv[1]); - exit( FALSE); - } - status = df(mountEntry->mnt_fsname, mountEntry->mnt_dir); - if (status != 0) - exit( status); - argc--; - argv++; - } - exit( TRUE); - } else { - FILE *mountTable; - struct mntent *mountEntry; + while (argc > 1) { + if ((mountEntry = findMountPoint(argv[1], mtab_file)) == 0) { + fprintf(stderr, "%s: can't find mount point.\n", argv[1]); + exit(FALSE); + } + status = df(mountEntry->mnt_fsname, mountEntry->mnt_dir); + if (status != 0) + exit(status); + argc--; + argv++; + } + exit(TRUE); + } else { + FILE *mountTable; + struct mntent *mountEntry; - mountTable = setmntent(mtab_file, "r"); - if (mountTable == 0) { - perror(mtab_file); - exit(FALSE); - } + mountTable = setmntent(mtab_file, "r"); + if (mountTable == 0) { + perror(mtab_file); + exit(FALSE); + } - while ((mountEntry = getmntent(mountTable))) { - df(mountEntry->mnt_fsname, mountEntry->mnt_dir); + while ((mountEntry = getmntent(mountTable))) { + df(mountEntry->mnt_fsname, mountEntry->mnt_dir); + } + endmntent(mountTable); } - endmntent(mountTable); - } - exit( TRUE); + exit(TRUE); } diff --git a/coreutils/du.c b/coreutils/du.c index e2cf3f7c0..7151e3a9c 100644 --- a/coreutils/du.c +++ b/coreutils/du.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini du implementation for busybox * @@ -31,119 +32,121 @@ #include <dirent.h> #include <stdio.h> #include <errno.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ -typedef void (Display)(long, char *); +typedef void (Display) (long, char *); static const char du_usage[] = -"du [OPTION]... [FILE]...\n\n" -"\t-s\tdisplay only a total for each argument\n" -; -static int du_depth = 0; + "du [OPTION]... [FILE]...\n\n" + "\t-s\tdisplay only a total for each argument\n"; -static Display *print; +static int du_depth = 0; -static void -print_normal(long size, char *filename) +static Display *print; + +static void print_normal(long size, char *filename) { - fprintf(stdout, "%-7ld %s\n", size, filename); + fprintf(stdout, "%-7ld %s\n", size, filename); } -static void -print_summary(long size, char *filename) +static void print_summary(long size, char *filename) { - if (du_depth == 1) { - print_normal(size, filename); - } + if (du_depth == 1) { + print_normal(size, filename); + } } /* tiny recursive du */ -static long -du(char *filename) +static long du(char *filename) { - struct stat statbuf; - long sum; - - if ((lstat(filename, &statbuf)) != 0) { - fprintf(stdout, "du: %s: %s\n", filename, strerror(errno)); - return 0; - } - - du_depth++; - sum = statbuf.st_blocks; - - if (S_ISDIR(statbuf.st_mode)) { - DIR *dir; - struct dirent *entry; - - dir = opendir(filename); - if (!dir) { return 0; } - while ((entry = readdir(dir))) { - char newfile[PATH_MAX + 1]; - char *name = entry->d_name; - - if ( (strcmp(name, "..") == 0) - || (strcmp(name, ".") == 0)) - { continue; } - - if (strlen(filename) + strlen(name) + 1 > PATH_MAX) { - fprintf(stderr, name_too_long, "du"); - return 0; - } - sprintf(newfile, "%s/%s", filename, name); - - sum += du(newfile); + struct stat statbuf; + long sum; + + if ((lstat(filename, &statbuf)) != 0) { + fprintf(stdout, "du: %s: %s\n", filename, strerror(errno)); + return 0; } - closedir(dir); - print(sum, filename); - } - du_depth--; - return sum; + + du_depth++; + sum = statbuf.st_blocks; + + if (S_ISDIR(statbuf.st_mode)) { + DIR *dir; + struct dirent *entry; + + dir = opendir(filename); + if (!dir) { + return 0; + } + while ((entry = readdir(dir))) { + char newfile[PATH_MAX + 1]; + char *name = entry->d_name; + + if ((strcmp(name, "..") == 0) + || (strcmp(name, ".") == 0)) { + continue; + } + + if (strlen(filename) + strlen(name) + 1 > PATH_MAX) { + fprintf(stderr, name_too_long, "du"); + return 0; + } + sprintf(newfile, "%s/%s", filename, name); + + sum += du(newfile); + } + closedir(dir); + print(sum, filename); + } + du_depth--; + return sum; } -int -du_main(int argc, char **argv) +int du_main(int argc, char **argv) { - int i; - char opt; - - /* default behaviour */ - print = print_normal; - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 's': - print = print_summary; - break; - case 'h': - usage(du_usage); - break; - default: - fprintf(stderr, "du: invalid option -- %c\n", opt); - usage(du_usage); - } - } else { - break; + int i; + char opt; + + /* default behaviour */ + print = print_normal; + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 's': + print = print_summary; + break; + case 'h': + usage(du_usage); + break; + default: + fprintf(stderr, "du: invalid option -- %c\n", opt); + usage(du_usage); + } + } else { + break; + } } - } - /* go through remaining args (if any) */ - if (i >= argc) { - du("."); - } else { - long sum; - for ( ; i < argc; i++) { - sum = du(argv[i]); - if ((sum) && (isDirectory(argv[i], FALSE))) { print_normal(sum, argv[i]); } + /* go through remaining args (if any) */ + if (i >= argc) { + du("."); + } else { + long sum; + + for (; i < argc; i++) { + sum = du(argv[i]); + if ((sum) && (isDirectory(argv[i], FALSE))) { + print_normal(sum, argv[i]); + } + } } - } - exit(0); + exit(0); } -/* $Id: du.c,v 1.10 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: du.c,v 1.11 2000/02/08 19:58:47 erik Exp $ */ diff --git a/coreutils/head.c b/coreutils/head.c index b80d06580..82a73de2a 100644 --- a/coreutils/head.c +++ b/coreutils/head.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini head implementation for busybox * @@ -26,83 +27,86 @@ #include <stdio.h> const char head_usage[] = -"head [OPTION] [FILE]...\n\n" -"Print first 10 lines of each FILE to standard output.\n" -"With more than one FILE, precede each with a header giving the\n" -"file name. With no FILE, or when FILE is -, read standard input.\n\n" -"Options:\n" -"\t-n NUM\t\tPrint first NUM lines instead of first 10\n"; + "head [OPTION] [FILE]...\n\n" + "Print first 10 lines of each FILE to standard output.\n" + "With more than one FILE, precede each with a header giving the\n" + "file name. With no FILE, or when FILE is -, read standard input.\n\n" -int -head(int len, FILE *src) + "Options:\n" "\t-n NUM\t\tPrint first NUM lines instead of first 10\n"; + +int head(int len, FILE * src) { - int i; - char buffer[1024]; + int i; + char buffer[1024]; - for (i = 0; i < len; i++) { - fgets(buffer, 1024, src); - if (feof(src)) { break; } - fputs(buffer, stdout); - } - return 0; + for (i = 0; i < len; i++) { + fgets(buffer, 1024, src); + if (feof(src)) { + break; + } + fputs(buffer, stdout); + } + return 0; } /* BusyBoxed head(1) */ -int -head_main(int argc, char **argv) +int head_main(int argc, char **argv) { - char opt; - int len = 10, tmplen, i; + char opt; + int len = 10, tmplen, i; - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'n': - tmplen = 0; - if (++i < argc) - tmplen = atoi(argv[i]); - if (tmplen < 1) - usage(head_usage); - len = tmplen; - break; - case '-': - case 'h': - usage(head_usage); - default: - fprintf(stderr, "head: invalid option -- %c\n", opt); - usage(head_usage); - } - } else { - break; + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 'n': + tmplen = 0; + if (++i < argc) + tmplen = atoi(argv[i]); + if (tmplen < 1) + usage(head_usage); + len = tmplen; + break; + case '-': + case 'h': + usage(head_usage); + default: + fprintf(stderr, "head: invalid option -- %c\n", opt); + usage(head_usage); + } + } else { + break; + } } - } - /* get rest of argv[] or stdin if nothing's left */ - if (i >= argc) { - head(len, stdin); + /* get rest of argv[] or stdin if nothing's left */ + if (i >= argc) { + head(len, stdin); - } else { - int need_headers = ((argc - i) > 1); - for ( ; i < argc; i++) { - FILE *src; - src = fopen(argv[i], "r"); - if (!src) { - fprintf(stderr,"head: %s: %s\n", argv[i], strerror(errno)); - } else { - /* emulating GNU behaviour */ - if (need_headers) { - fprintf(stdout, "==> %s <==\n", argv[i]); - } - head(len, src); - if (i < argc - 1) { - fprintf(stdout, "\n"); + } else { + int need_headers = ((argc - i) > 1); + + for (; i < argc; i++) { + FILE *src; + + src = fopen(argv[i], "r"); + if (!src) { + fprintf(stderr, "head: %s: %s\n", argv[i], + strerror(errno)); + } else { + /* emulating GNU behaviour */ + if (need_headers) { + fprintf(stdout, "==> %s <==\n", argv[i]); + } + head(len, src); + if (i < argc - 1) { + fprintf(stdout, "\n"); + } + } } - } } - } - exit(0); + exit(0); } -/* $Id: head.c,v 1.7 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: head.c,v 1.8 2000/02/08 19:58:47 erik Exp $ */ diff --git a/coreutils/hostid.c b/coreutils/hostid.c index f8d5862ae..9e503e598 100644 --- a/coreutils/hostid.c +++ b/coreutils/hostid.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini hostid implementation for busybox * @@ -22,7 +23,8 @@ #include "internal.h" #include <stdio.h> -extern int hostid_main(int argc, char **argv) { - printf ("%lx\n", gethostid()); - exit( TRUE); +extern int hostid_main(int argc, char **argv) +{ + printf("%lx\n", gethostid()); + exit(TRUE); } diff --git a/coreutils/length.c b/coreutils/length.c index 2c83cdfd2..00e5a171b 100644 --- a/coreutils/length.c +++ b/coreutils/length.c @@ -1,14 +1,14 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" #include <stdlib.h> #include <string.h> #include <stdio.h> -extern int -length_main(int argc, char * * argv) +extern int length_main(int argc, char **argv) { - if ( argc != 2 || **(argv+1) == '-' ) { - usage("length string\n"); - } - printf("%d\n", strlen(argv[1])); - return( TRUE); + if (argc != 2 || **(argv + 1) == '-') { + usage("length string\n"); + } + printf("%d\n", strlen(argv[1])); + return (TRUE); } diff --git a/coreutils/ln.c b/coreutils/ln.c index f20b340ea..bc51cb0d5 100644 --- a/coreutils/ln.c +++ b/coreutils/ln.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini ln implementation for busybox * @@ -30,15 +31,16 @@ #include <stdio.h> #include <dirent.h> #include <errno.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ static const char ln_usage[] = - "ln [OPTION] TARGET... LINK_NAME|DIRECTORY\n\n" - "Create a link named LINK_NAME or DIRECTORY to the specified TARGET\n\n" - "Options:\n" - "\t-s\tmake symbolic links instead of hard links\n" - "\t-f\tremove existing destination files\n" - "\t-n\tno dereference symlinks - treat like normal file\n"; + "ln [OPTION] TARGET... LINK_NAME|DIRECTORY\n\n" + "Create a link named LINK_NAME or DIRECTORY to the specified TARGET\n\n" + "Options:\n" + "\t-s\tmake symbolic links instead of hard links\n" + + "\t-f\tremove existing destination files\n" + "\t-n\tno dereference symlinks - treat like normal file\n"; static int symlinkFlag = FALSE; static int removeoldFlag = FALSE; @@ -46,83 +48,83 @@ static int followLinks = TRUE; extern int ln_main(int argc, char **argv) { - char *linkName; - int linkIntoDirFlag; - - if (argc < 3) { - usage (ln_usage); - } - argc--; - argv++; - - /* Parse any options */ - while (**argv == '-') { - while (*++(*argv)) - switch (**argv) { - case 's': - symlinkFlag = TRUE; - break; - case 'f': - removeoldFlag = TRUE; - break; - case 'n': - followLinks = FALSE; - break; - default: - usage (ln_usage); - } + char *linkName; + int linkIntoDirFlag; + + if (argc < 3) { + usage(ln_usage); + } argc--; argv++; - } - - linkName = argv[argc - 1]; - - if (strlen(linkName) > PATH_MAX) { - fprintf(stderr, name_too_long, "ln"); - exit FALSE; - } - linkIntoDirFlag = isDirectory(linkName, TRUE); - - if ((argc > 3) && !linkIntoDirFlag) { - fprintf(stderr, not_a_directory, "ln", linkName); - exit FALSE; - } + /* Parse any options */ + while (**argv == '-') { + while (*++(*argv)) + switch (**argv) { + case 's': + symlinkFlag = TRUE; + break; + case 'f': + removeoldFlag = TRUE; + break; + case 'n': + followLinks = FALSE; + break; + default: + usage(ln_usage); + } + argc--; + argv++; + } - while (argc-- >= 2) { - char srcName[PATH_MAX + 1]; - int nChars, status; + linkName = argv[argc - 1]; - if (strlen(*argv) > PATH_MAX) { - fprintf(stderr, name_too_long, "ln"); - exit FALSE; + if (strlen(linkName) > PATH_MAX) { + fprintf(stderr, name_too_long, "ln"); + exit FALSE; } - if (followLinks == FALSE) { - strcpy(srcName, *argv); - } else { - /* Warning! This can silently truncate if > PATH_MAX, but - I don't think that there can be one > PATH_MAX anyway. */ - nChars = readlink(*argv, srcName, PATH_MAX); - srcName[nChars] = '\0'; - } + linkIntoDirFlag = isDirectory(linkName, TRUE); - if (removeoldFlag == TRUE) { - status = ( unlink(linkName) && errno != ENOENT ); - if (status != 0) { - perror(linkName); + if ((argc > 3) && !linkIntoDirFlag) { + fprintf(stderr, not_a_directory, "ln", linkName); exit FALSE; - } } - if (symlinkFlag == TRUE) - status = symlink(*argv, linkName); - else - status = link(*argv, linkName); - if (status != 0) { - perror(linkName); - exit FALSE; + while (argc-- >= 2) { + char srcName[PATH_MAX + 1]; + int nChars, status; + + if (strlen(*argv) > PATH_MAX) { + fprintf(stderr, name_too_long, "ln"); + exit FALSE; + } + + if (followLinks == FALSE) { + strcpy(srcName, *argv); + } else { + /* Warning! This can silently truncate if > PATH_MAX, but + I don't think that there can be one > PATH_MAX anyway. */ + nChars = readlink(*argv, srcName, PATH_MAX); + srcName[nChars] = '\0'; + } + + if (removeoldFlag == TRUE) { + status = (unlink(linkName) && errno != ENOENT); + if (status != 0) { + perror(linkName); + exit FALSE; + } + } + + if (symlinkFlag == TRUE) + status = symlink(*argv, linkName); + else + status = link(*argv, linkName); + if (status != 0) { + perror(linkName); + exit FALSE; + } } - } - exit TRUE; + exit TRUE; } diff --git a/coreutils/logname.c b/coreutils/logname.c index 5c8275ab4..182f40ed2 100644 --- a/coreutils/logname.c +++ b/coreutils/logname.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini logname implementation for busybox * @@ -23,18 +24,21 @@ #include <stdio.h> static const char logname_usage[] = "logname\n\n" -"Print the name of the current user.\n"; -extern int logname_main(int argc, char **argv) { + "Print the name of the current user.\n"; + +extern int logname_main(int argc, char **argv) +{ char *cp; - if (argc > 1) usage (logname_usage); + if (argc > 1) + usage(logname_usage); - cp = getlogin (); + cp = getlogin(); if (cp) { - puts (cp); - exit (TRUE); - } - fprintf (stderr, "%s: no login name\n", argv[0]); - exit (FALSE); + puts(cp); + exit(TRUE); + } + fprintf(stderr, "%s: no login name\n", argv[0]); + exit(FALSE); } diff --git a/coreutils/ls.c b/coreutils/ls.c index 450ea1814..f23c1e086 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * tiny-ls.c version 0.1.0: A minimalist 'ls' * Copyright (C) 1996 Brian Candler <B.Candler@pobox.com> @@ -40,18 +41,18 @@ * 1. requires lstat (BSD) - how do you do it without? */ -#define TERMINAL_WIDTH 80 /* use 79 if your terminal has linefold bug */ -#define COLUMN_WIDTH 14 /* default if AUTOWIDTH not defined */ -#define COLUMN_GAP 2 /* includes the file type char, if present */ +#define TERMINAL_WIDTH 80 /* use 79 if your terminal has linefold bug */ +#define COLUMN_WIDTH 14 /* default if AUTOWIDTH not defined */ +#define COLUMN_GAP 2 /* includes the file type char, if present */ #define HAS_REWINDDIR /************************************************************************/ #include "internal.h" #if !defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) -# include <linux/types.h> +# include <linux/types.h> #else -# include <sys/types.h> +# include <sys/types.h> #endif #include <sys/stat.h> #include <stdio.h> @@ -75,28 +76,28 @@ #endif #define FMT_AUTO 0 -#define FMT_LONG 1 /* one record per line, extended info */ -#define FMT_SINGLE 2 /* one record per line */ -#define FMT_ROWS 3 /* print across rows */ -#define FMT_COLUMNS 3 /* fill columns (same, since we don't sort) */ +#define FMT_LONG 1 /* one record per line, extended info */ +#define FMT_SINGLE 2 /* one record per line */ +#define FMT_ROWS 3 /* print across rows */ +#define FMT_COLUMNS 3 /* fill columns (same, since we don't sort) */ #define TIME_MOD 0 #define TIME_CHANGE 1 #define TIME_ACCESS 2 -#define DISP_FTYPE 1 /* show character for file type */ -#define DISP_EXEC 2 /* show '*' if regular executable file */ -#define DISP_HIDDEN 4 /* show files starting . (except . and ..) */ -#define DISP_DOT 8 /* show . and .. */ -#define DISP_NUMERIC 16 /* numeric uid and gid */ -#define DISP_FULLTIME 32 /* show extended time display */ -#define DIR_NOLIST 64 /* show directory as itself, not contents */ -#define DISP_DIRNAME 128 /* show directory name (for internal use) */ -#define DIR_RECURSE 256 /* -R (not yet implemented) */ +#define DISP_FTYPE 1 /* show character for file type */ +#define DISP_EXEC 2 /* show '*' if regular executable file */ +#define DISP_HIDDEN 4 /* show files starting . (except . and ..) */ +#define DISP_DOT 8 /* show . and .. */ +#define DISP_NUMERIC 16 /* numeric uid and gid */ +#define DISP_FULLTIME 32 /* show extended time display */ +#define DIR_NOLIST 64 /* show directory as itself, not contents */ +#define DISP_DIRNAME 128 /* show directory name (for internal use) */ +#define DIR_RECURSE 256 /* -R (not yet implemented) */ -static unsigned char display_fmt = FMT_AUTO; -static unsigned short opts = 0; -static unsigned short column = 0; +static unsigned char display_fmt = FMT_AUTO; +static unsigned short opts = 0; +static unsigned short column = 0; #ifdef BB_FEATURE_AUTOWIDTH static unsigned short terminal_width = 0, column_width = 0; @@ -113,13 +114,14 @@ static unsigned char time_fmt = TIME_MOD; static void writenum(long val, short minwidth) { - char scratch[128]; + char scratch[128]; char *p = scratch + sizeof(scratch); short len = 0; short neg = (val < 0); - - if (neg) val = -val; + + if (neg) + val = -val; do *--p = (val % 10) + '0', len++, val /= 10; while (val); @@ -142,8 +144,9 @@ static void newline(void) static void tab(short col) { static const char spaces[] = " "; - #define nspaces ((sizeof spaces)-1) /* null terminator! */ - + +#define nspaces ((sizeof spaces)-1) /* null terminator! */ + short n = col - column; if (n > 0) { @@ -155,7 +158,7 @@ static void tab(short col) /* must be 1...(sizeof spaces) left */ wr(spaces, n); } - #undef nspaces +#undef nspaces } #ifdef BB_FEATURE_LS_FILETYPES @@ -163,8 +166,8 @@ static char append_char(mode_t mode) { if (!(opts & DISP_FTYPE)) return '\0'; - if ((opts & DISP_EXEC) && S_ISREG(mode) && (mode & (S_IXUSR|S_IXGRP|S_IXOTH))) - return '*'; + if ((opts & DISP_EXEC) && S_ISREG(mode) + && (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) return '*'; return APPCHAR(mode); } #endif @@ -176,89 +179,93 @@ static char append_char(mode_t mode) ** **/ -static void list_single(const char *name, struct stat *info, const char *fullname) +static void list_single(const char *name, struct stat *info, + const char *fullname) { char scratch[PATH_MAX + 1]; short len = strlen(name); + #ifdef BB_FEATURE_LS_FILETYPES char append = append_char(info->st_mode); #endif - + if (display_fmt == FMT_LONG) { - mode_t mode = info->st_mode; + mode_t mode = info->st_mode; + newline(); wr(modeString(mode), 10); - column=10; - writenum((long)info->st_nlink,(short)5); + column = 10; + writenum((long) info->st_nlink, (short) 5); fputs(" ", stdout); #ifdef BB_FEATURE_LS_USERNAME if (!(opts & DISP_NUMERIC)) { - memset ( scratch, 0, sizeof (scratch)); - my_getpwuid( scratch, info->st_uid); + memset(scratch, 0, sizeof(scratch)); + my_getpwuid(scratch, info->st_uid); if (*scratch) { - fputs(scratch, stdout); - if ( strlen( scratch) <= 8 ) - wr(" ", 9-strlen( scratch)); - } - else { - writenum((long) info->st_uid,(short)8); + fputs(scratch, stdout); + if (strlen(scratch) <= 8) + wr(" ", 9 - strlen(scratch)); + } else { + writenum((long) info->st_uid, (short) 8); fputs(" ", stdout); } } else #endif { - writenum((long) info->st_uid,(short)8); - fputs(" ", stdout); + writenum((long) info->st_uid, (short) 8); + fputs(" ", stdout); } #ifdef BB_FEATURE_LS_USERNAME if (!(opts & DISP_NUMERIC)) { - memset ( scratch, 0, sizeof (scratch)); - my_getgrgid( scratch, info->st_gid); + memset(scratch, 0, sizeof(scratch)); + my_getgrgid(scratch, info->st_gid); if (*scratch) { - fputs(scratch, stdout); - if ( strlen( scratch) <= 8 ) - wr(" ", 8-strlen( scratch)); - } - else - writenum((long) info->st_gid,(short)8); + fputs(scratch, stdout); + if (strlen(scratch) <= 8) + wr(" ", 8 - strlen(scratch)); + } else + writenum((long) info->st_gid, (short) 8); } else #endif - writenum((long) info->st_gid,(short)8); + writenum((long) info->st_gid, (short) 8); //tab(26); if (S_ISBLK(mode) || S_ISCHR(mode)) { - writenum((long)MAJOR(info->st_rdev),(short)3); + writenum((long) MAJOR(info->st_rdev), (short) 3); fputs(", ", stdout); - writenum((long)MINOR(info->st_rdev),(short)3); - } - else - writenum((long)info->st_size,(short)8); + writenum((long) MINOR(info->st_rdev), (short) 3); + } else + writenum((long) info->st_size, (short) 8); fputs(" ", stdout); //tab(32); #ifdef BB_FEATURE_LS_TIMESTAMPS { time_t cal; char *string; - - switch(time_fmt) { + + switch (time_fmt) { case TIME_CHANGE: - cal=info->st_ctime; break; + cal = info->st_ctime; + break; case TIME_ACCESS: - cal=info->st_atime; break; + cal = info->st_atime; + break; default: - cal=info->st_mtime; break; + cal = info->st_mtime; + break; } - string=ctime(&cal); + string = ctime(&cal); if (opts & DISP_FULLTIME) - wr(string,24); + wr(string, 24); else { time_t age = time(NULL) - cal; - wr(string+4,7); /* mmm_dd_ */ - if(age < 3600L*24*365/2 && age > -15*60) + + wr(string + 4, 7); /* mmm_dd_ */ + if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) /* hh:mm if less than 6 months old */ - wr(string+11,5); + wr(string + 11, 5); else /* _yyyy otherwise */ - wr(string+19,5); + wr(string + 19, 5); } wr(" ", 1); } @@ -269,7 +276,8 @@ static void list_single(const char *name, struct stat *info, const char *fullnam if (S_ISLNK(mode)) { wr(" -> ", 4); len = readlink(fullname, scratch, sizeof scratch); - if (len > 0) fwrite(scratch, 1, len, stdout); + if (len > 0) + fwrite(scratch, 1, len, stdout); #ifdef BB_FEATURE_LS_FILETYPES /* show type of destination */ if (opts & DISP_FTYPE) { @@ -287,18 +295,17 @@ static void list_single(const char *name, struct stat *info, const char *fullnam #endif } else { static short nexttab = 0; - + /* sort out column alignment */ - if (column == 0) - ; /* nothing to do */ + if (column == 0); /* nothing to do */ else if (display_fmt == FMT_SINGLE) newline(); else { if (nexttab + column_width > terminal_width #ifndef BB_FEATURE_AUTOWIDTH - || nexttab + len >= terminal_width + || nexttab + len >= terminal_width #endif - ) + ) newline(); else tab(nexttab); @@ -336,32 +343,33 @@ static int list_item(const char *name) struct stat info; DIR *dir; struct dirent *entry; - char fullname[MAXNAMLEN+1], *fnend; - + char fullname[MAXNAMLEN + 1], *fnend; + if (lstat(name, &info)) goto listerr; - - if (!S_ISDIR(info.st_mode) || - (opts & DIR_NOLIST)) { + + if (!S_ISDIR(info.st_mode) || (opts & DIR_NOLIST)) { list_single(name, &info, name); return 0; } /* Otherwise, it's a directory we want to list the contents of */ - if (opts & DISP_DIRNAME) { /* identify the directory */ + if (opts & DISP_DIRNAME) { /* identify the directory */ if (column) wr("\n\n", 2), column = 0; wr(name, strlen(name)); wr(":\n", 2); } - + dir = opendir(name); - if (!dir) goto listerr; + if (!dir) + goto listerr; #ifdef BB_FEATURE_AUTOWIDTH column_width = 0; while ((entry = readdir(dir)) != NULL) { short w = strlen(entry->d_name); + if (column_width < w) column_width = w; } @@ -370,39 +378,40 @@ static int list_item(const char *name) #else closedir(dir); dir = opendir(name); - if (!dir) goto listerr; + if (!dir) + goto listerr; #endif #endif /* List the contents */ - - strcpy(fullname,name); /* *** ignore '.' by itself */ - fnend=fullname+strlen(fullname); + + strcpy(fullname, name); /* *** ignore '.' by itself */ + fnend = fullname + strlen(fullname); if (fnend[-1] != '/') *fnend++ = '/'; - + while ((entry = readdir(dir)) != NULL) { - const char *en=entry->d_name; + const char *en = entry->d_name; + if (en[0] == '.') { - if (!en[1] || (en[1] == '.' && !en[2])) { /* . or .. */ + if (!en[1] || (en[1] == '.' && !en[2])) { /* . or .. */ if (!(opts & DISP_DOT)) continue; - } - else if (!(opts & DISP_HIDDEN)) + } else if (!(opts & DISP_HIDDEN)) continue; } /* FIXME: avoid stat if not required */ strcpy(fnend, entry->d_name); if (lstat(fullname, &info)) - goto direrr; /* (shouldn't fail) */ + goto direrr; /* (shouldn't fail) */ list_single(entry->d_name, &info, fullname); } closedir(dir); return 0; -direrr: - closedir(dir); -listerr: + direrr: + closedir(dir); + listerr: newline(); perror(name); return 1; @@ -432,50 +441,79 @@ static const char ls_usage[] = "ls [-1a" #endif "] [filenames...]\n"; -extern int -ls_main(int argc, char * * argv) +extern int ls_main(int argc, char **argv) { - int argi=1, i; - + int argi = 1, i; + /* process options */ while (argi < argc && argv[argi][0] == '-') { const char *p = &argv[argi][1]; - - if (!*p) goto print_usage_message; /* "-" by itself not allowed */ + + if (!*p) + goto print_usage_message; /* "-" by itself not allowed */ if (*p == '-') { - if (!p[1]) { /* "--" forces end of options */ + if (!p[1]) { /* "--" forces end of options */ argi++; break; } /* it's a long option name - we don't support them */ goto print_usage_message; } - + while (*p) switch (*p++) { - case 'l': display_fmt = FMT_LONG; break; - case '1': display_fmt = FMT_SINGLE; break; - case 'x': display_fmt = FMT_ROWS; break; - case 'C': display_fmt = FMT_COLUMNS; break; + case 'l': + display_fmt = FMT_LONG; + break; + case '1': + display_fmt = FMT_SINGLE; + break; + case 'x': + display_fmt = FMT_ROWS; + break; + case 'C': + display_fmt = FMT_COLUMNS; + break; #ifdef BB_FEATURE_LS_FILETYPES - case 'p': opts |= DISP_FTYPE; break; - case 'F': opts |= DISP_FTYPE|DISP_EXEC; break; + case 'p': + opts |= DISP_FTYPE; + break; + case 'F': + opts |= DISP_FTYPE | DISP_EXEC; + break; #endif - case 'A': opts |= DISP_HIDDEN; break; - case 'a': opts |= DISP_HIDDEN|DISP_DOT; break; - case 'n': opts |= DISP_NUMERIC; break; - case 'd': opts |= DIR_NOLIST; break; + case 'A': + opts |= DISP_HIDDEN; + break; + case 'a': + opts |= DISP_HIDDEN | DISP_DOT; + break; + case 'n': + opts |= DISP_NUMERIC; + break; + case 'd': + opts |= DIR_NOLIST; + break; #ifdef FEATURE_RECURSIVE - case 'R': opts |= DIR_RECURSE; break; + case 'R': + opts |= DIR_RECURSE; + break; #endif #ifdef BB_FEATURE_LS_TIMESTAMPS - case 'u': time_fmt = TIME_ACCESS; break; - case 'c': time_fmt = TIME_CHANGE; break; - case 'e': opts |= DISP_FULLTIME; break; + case 'u': + time_fmt = TIME_ACCESS; + break; + case 'c': + time_fmt = TIME_CHANGE; + break; + case 'e': + opts |= DISP_FULLTIME; + break; #endif - default: goto print_usage_message; + default: + goto print_usage_message; } - + argi++; } @@ -483,29 +521,30 @@ ls_main(int argc, char * * argv) if (display_fmt == FMT_AUTO) display_fmt = isatty(fileno(stdout)) ? FMT_COLUMNS : FMT_SINGLE; if (argi < argc - 1) - opts |= DISP_DIRNAME; /* 2 or more items? label directories */ + opts |= DISP_DIRNAME; /* 2 or more items? label directories */ #ifdef BB_FEATURE_AUTOWIDTH /* could add a -w option and/or TIOCGWINSZ call */ - if (terminal_width < 1) terminal_width = TERMINAL_WIDTH; - + if (terminal_width < 1) + terminal_width = TERMINAL_WIDTH; + for (i = argi; i < argc; i++) { int len = strlen(argv[i]); + if (column_width < len) column_width = len; } #endif /* process files specified, or current directory if none */ - i=0; + i = 0; if (argi == argc) i = list_item("."); while (argi < argc) i |= list_item(argv[argi++]); newline(); - exit( i); + exit(i); -print_usage_message: - usage (ls_usage); - exit( FALSE); + print_usage_message: + usage(ls_usage); + exit(FALSE); } - diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c index 8e3f51bfb..70fdbdfb5 100644 --- a/coreutils/mkdir.c +++ b/coreutils/mkdir.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini mkdir implementation for busybox * @@ -28,14 +29,15 @@ #include <stdio.h> #include <errno.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ static const char mkdir_usage[] = -"mkdir [OPTION] DIRECTORY...\n\n" -"Create the DIRECTORY(ies), if they do not already exist\n\n" -"Options:\n" -"\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n" -"\t-p\tno error if existing, make parent directories as needed\n"; + "mkdir [OPTION] DIRECTORY...\n\n" + "Create the DIRECTORY(ies), if they do not already exist\n\n" + "Options:\n" + + "\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n" + "\t-p\tno error if existing, make parent directories as needed\n"; static int parentFlag = FALSE; @@ -44,71 +46,70 @@ static mode_t mode = 0777; extern int mkdir_main(int argc, char **argv) { - int i = FALSE; - argc--; - argv++; + int i = FALSE; - /* Parse any options */ - while (argc > 0 && **argv == '-') { - while (i == FALSE && *++(*argv)) { - switch (**argv) { - case 'm': - if (--argc == 0) - usage( mkdir_usage); - /* Find the specified modes */ - mode = 0; - if (parse_mode(*(++argv), &mode) == FALSE ) { - fprintf(stderr, "Unknown mode: %s\n", *argv); - exit FALSE; - } - /* Set the umask for this process so it doesn't - * screw up whatever the user just entered. */ - umask(0); - i = TRUE; - break; - case 'p': - parentFlag = TRUE; - break; - default: - usage( mkdir_usage); - } - } argc--; argv++; - } - - if (argc < 1) { - usage( mkdir_usage); - } - while (argc > 0) { - int status; - struct stat statBuf; - char buf[PATH_MAX + 1]; - if (strlen(*argv) > PATH_MAX - 1) { - fprintf(stderr, name_too_long, "mkdir"); - exit FALSE; - } - strcpy (buf, *argv); - status = stat(buf, &statBuf); - if (parentFlag == FALSE && status != -1 && errno != ENOENT) { - fprintf(stderr, "%s: File exists\n", buf); - exit FALSE; - } - if (parentFlag == TRUE) { - strcat( buf, "/"); - createPath(buf, mode); + /* Parse any options */ + while (argc > 0 && **argv == '-') { + while (i == FALSE && *++(*argv)) { + switch (**argv) { + case 'm': + if (--argc == 0) + usage(mkdir_usage); + /* Find the specified modes */ + mode = 0; + if (parse_mode(*(++argv), &mode) == FALSE) { + fprintf(stderr, "Unknown mode: %s\n", *argv); + exit FALSE; + } + /* Set the umask for this process so it doesn't + * screw up whatever the user just entered. */ + umask(0); + i = TRUE; + break; + case 'p': + parentFlag = TRUE; + break; + default: + usage(mkdir_usage); + } + } + argc--; + argv++; } - else { - if (mkdir (buf, mode) != 0 && parentFlag == FALSE) { - perror(buf); - exit FALSE; - } + + if (argc < 1) { + usage(mkdir_usage); } - argc--; - argv++; - } - exit TRUE; -} + while (argc > 0) { + int status; + struct stat statBuf; + char buf[PATH_MAX + 1]; + if (strlen(*argv) > PATH_MAX - 1) { + fprintf(stderr, name_too_long, "mkdir"); + exit FALSE; + } + strcpy(buf, *argv); + status = stat(buf, &statBuf); + if (parentFlag == FALSE && status != -1 && errno != ENOENT) { + fprintf(stderr, "%s: File exists\n", buf); + exit FALSE; + } + if (parentFlag == TRUE) { + strcat(buf, "/"); + createPath(buf, mode); + } else { + if (mkdir(buf, mode) != 0 && parentFlag == FALSE) { + perror(buf); + exit FALSE; + } + } + argc--; + argv++; + } + exit TRUE; +} diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c index 676592ac7..c74402d4c 100644 --- a/coreutils/mkfifo.c +++ b/coreutils/mkfifo.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini mkfifo implementation for busybox * @@ -26,36 +27,43 @@ #include <errno.h> static const char mkfifo_usage[] = "mkfifo [OPTIONS] name\n\n" -"Create the named fifo\n\n" -"Options:\n" -"\t-m\tcreate the fifo with the specified mode; default = a=rw-umask\n"; + "Create the named fifo\n\n" + + "Options:\n" + "\t-m\tcreate the fifo with the specified mode; default = a=rw-umask\n"; extern int mkfifo_main(int argc, char **argv) { - char *thisarg; - mode_t mode = 0666; - argc--; - argv++; + char *thisarg; + mode_t mode = 0666; + + argc--; + argv++; - /* Parse any options */ - while (argc > 1) { - if (**argv != '-') usage(mkfifo_usage); - thisarg = *argv; thisarg++; - switch (*thisarg) { - case 'm': - argc--; argv++; - parse_mode(*argv, &mode); - break; - default: - usage (mkfifo_usage); - } - argc--; argv++; - } - if (argc < 1) usage (mkfifo_usage); - if (mkfifo(*argv, mode) < 0) { - perror("mkfifo"); - exit(255); - } else { - exit(TRUE); - } + /* Parse any options */ + while (argc > 1) { + if (**argv != '-') + usage(mkfifo_usage); + thisarg = *argv; + thisarg++; + switch (*thisarg) { + case 'm': + argc--; + argv++; + parse_mode(*argv, &mode); + break; + default: + usage(mkfifo_usage); + } + argc--; + argv++; + } + if (argc < 1) + usage(mkfifo_usage); + if (mkfifo(*argv, mode) < 0) { + perror("mkfifo"); + exit(255); + } else { + exit(TRUE); + } } diff --git a/coreutils/mknod.c b/coreutils/mknod.c index 5822cd3ad..b11a81f2a 100644 --- a/coreutils/mknod.c +++ b/coreutils/mknod.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini mknod implementation for busybox * @@ -28,22 +29,22 @@ #include <unistd.h> static const char mknod_usage[] = "mknod NAME TYPE MAJOR MINOR\n\n" -"Make block or character special files.\n\n" -"TYPEs include:\n" -"\tb:\tMake a block (buffered) device.\n" -"\tc or u:\tMake a character (un-buffered) device.\n" -"\tp:\tMake a named pipe. Major and minor are ignored for named pipes.\n"; + "Make block or character special files.\n\n" + "TYPEs include:\n" + "\tb:\tMake a block (buffered) device.\n" -int -mknod_main(int argc, char** argv) + "\tc or u:\tMake a character (un-buffered) device.\n" + "\tp:\tMake a named pipe. Major and minor are ignored for named pipes.\n"; + +int mknod_main(int argc, char **argv) { - mode_t mode = 0; - dev_t dev = 0; + mode_t mode = 0; + dev_t dev = 0; - if ( argc != 5 || **(argv+1) == '-' ) { - usage (mknod_usage); + if (argc != 5 || **(argv + 1) == '-') { + usage(mknod_usage); } - switch(argv[2][0]) { + switch (argv[2][0]) { case 'c': case 'u': mode = S_IFCHR; @@ -55,21 +56,21 @@ mknod_main(int argc, char** argv) mode = S_IFIFO; break; default: - usage (mknod_usage); + usage(mknod_usage); } - if ( mode == S_IFCHR || mode == S_IFBLK ) { + if (mode == S_IFCHR || mode == S_IFBLK) { dev = (atoi(argv[3]) << 8) | atoi(argv[4]); - if ( argc != 5 ) { - usage (mknod_usage); + if (argc != 5) { + usage(mknod_usage); } } mode |= 0666; - if ( mknod(argv[1], mode, dev) != 0 ) { + if (mknod(argv[1], mode, dev) != 0) { perror(argv[1]); - return( FALSE); + return (FALSE); } - return( TRUE); + return (TRUE); } diff --git a/coreutils/printf.c b/coreutils/printf.c index 5fd5ea303..41ab2e442 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* printf - format and print data Copyright (C) 90, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. @@ -42,7 +43,7 @@ to convert all of the given arguments. David MacKenzie <djm@gnu.ai.mit.edu> */ - + // 19990508 Busy Boxed! Dave Cinege @@ -84,11 +85,11 @@ #if !defined(S_ISSOCK) && defined(S_IFSOCK) # define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) #endif -#if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */ +#if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */ # define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB) # define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC) #endif -#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */ +#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */ # define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) #endif @@ -121,407 +122,358 @@ #define hextobin(c) ((c)>='a'&&(c)<='f' ? (c)-'a'+10 : (c)>='A'&&(c)<='F' ? (c)-'A'+10 : (c)-'0') #define octtobin(c) ((c) - '0') -static double xstrtod __P ((char *s)); -static int print_esc __P ((char *escstart)); -static int print_formatted __P ((char *format, int argc, char **argv)); -static long xstrtol __P ((char *s)); -static unsigned long xstrtoul __P ((char *s)); -static void print_direc __P ((char *start, size_t length, int field_width, int precision, char *argument)); -static void print_esc_char __P ((int c)); -static void print_esc_string __P ((char *str)); -static void verify __P ((char *s, char *end)); +static double xstrtod __P((char *s)); +static int print_esc __P((char *escstart)); +static int print_formatted __P((char *format, int argc, char **argv)); +static long xstrtol __P((char *s)); +static unsigned long xstrtoul __P((char *s)); +static void print_direc +__P( + + (char *start, size_t length, int field_width, int precision, + char *argument)); +static void print_esc_char __P((int c)); +static void print_esc_string __P((char *str)); +static void verify __P((char *s, char *end)); /* The value to return to the calling program. */ static int exit_status; -static const char printf_usage[] = "printf format [argument...]\n"; +static const char printf_usage[] = "printf format [argument...]\n"; -int -printf_main(int argc, char** argv) +int printf_main(int argc, char **argv) { - char *format; - int args_used; - - exit_status = 0; - if ( argc <= 1 || **(argv+1) == '-' ) { - usage (printf_usage); - } - - format = argv[1]; - argc -= 2; - argv += 2; - - do - { - args_used = print_formatted (format, argc, argv); - argc -= args_used; - argv += args_used; - } - while (args_used > 0 && argc > 0); + char *format; + int args_used; + + exit_status = 0; + if (argc <= 1 || **(argv + 1) == '-') { + usage(printf_usage); + } + + format = argv[1]; + argc -= 2; + argv += 2; + + do { + args_used = print_formatted(format, argc, argv); + argc -= args_used; + argv += args_used; + } + while (args_used > 0 && argc > 0); /* if (argc > 0) fprintf(stderr, "excess args ignored"); */ - exit (exit_status); + exit(exit_status); } /* Print the text in FORMAT, using ARGV (with ARGC elements) for arguments to any `%' directives. Return the number of elements of ARGV used. */ -static int -print_formatted (char *format, int argc, char **argv) +static int print_formatted(char *format, int argc, char **argv) { - int save_argc = argc; /* Preserve original value. */ - char *f; /* Pointer into `format'. */ - char *direc_start; /* Start of % directive. */ - size_t direc_length; /* Length of % directive. */ - int field_width; /* Arg to first '*', or -1 if none. */ - int precision; /* Arg to second '*', or -1 if none. */ - - for (f = format; *f; ++f) - { - switch (*f) - { - case '%': - direc_start = f++; - direc_length = 1; - field_width = precision = -1; - if (*f == '%') - { - putchar ('%'); - break; - } - if (*f == 'b') - { - if (argc > 0) - { - print_esc_string (*argv); - ++argv; - --argc; - } - break; - } - if (strchr ("-+ #", *f)) - { - ++f; - ++direc_length; - } - if (*f == '*') - { - ++f; - ++direc_length; - if (argc > 0) - { - field_width = xstrtoul (*argv); - ++argv; - --argc; + int save_argc = argc; /* Preserve original value. */ + char *f; /* Pointer into `format'. */ + char *direc_start; /* Start of % directive. */ + size_t direc_length; /* Length of % directive. */ + int field_width; /* Arg to first '*', or -1 if none. */ + int precision; /* Arg to second '*', or -1 if none. */ + + for (f = format; *f; ++f) { + switch (*f) { + case '%': + direc_start = f++; + direc_length = 1; + field_width = precision = -1; + if (*f == '%') { + putchar('%'); + break; + } + if (*f == 'b') { + if (argc > 0) { + print_esc_string(*argv); + ++argv; + --argc; + } + break; + } + if (strchr("-+ #", *f)) { + ++f; + ++direc_length; + } + if (*f == '*') { + ++f; + ++direc_length; + if (argc > 0) { + field_width = xstrtoul(*argv); + ++argv; + --argc; + } else + field_width = 0; + } else + while (ISDIGIT(*f)) { + ++f; + ++direc_length; + } + if (*f == '.') { + ++f; + ++direc_length; + if (*f == '*') { + ++f; + ++direc_length; + if (argc > 0) { + precision = xstrtoul(*argv); + ++argv; + --argc; + } else + precision = 0; + } else + while (ISDIGIT(*f)) { + ++f; + ++direc_length; + } + } + if (*f == 'l' || *f == 'L' || *f == 'h') { + ++f; + ++direc_length; + } + /* + if (!strchr ("diouxXfeEgGcs", *f)) + fprintf(stderr, "%%%c: invalid directive", *f); + */ + ++direc_length; + if (argc > 0) { + print_direc(direc_start, direc_length, field_width, + precision, *argv); + ++argv; + --argc; + } else + print_direc(direc_start, direc_length, field_width, + precision, ""); + break; + + case '\\': + f += print_esc(f); + break; + + default: + putchar(*f); } - else - field_width = 0; - } - else - while (ISDIGIT (*f)) - { - ++f; - ++direc_length; - } - if (*f == '.') - { - ++f; - ++direc_length; - if (*f == '*') - { - ++f; - ++direc_length; - if (argc > 0) - { - precision = xstrtoul (*argv); - ++argv; - --argc; - } - else - precision = 0; - } - else - while (ISDIGIT (*f)) - { - ++f; - ++direc_length; - } - } - if (*f == 'l' || *f == 'L' || *f == 'h') - { - ++f; - ++direc_length; - } - /* - if (!strchr ("diouxXfeEgGcs", *f)) - fprintf(stderr, "%%%c: invalid directive", *f); - */ - ++direc_length; - if (argc > 0) - { - print_direc (direc_start, direc_length, field_width, - precision, *argv); - ++argv; - --argc; - } - else - print_direc (direc_start, direc_length, field_width, - precision, ""); - break; - - case '\\': - f += print_esc (f); - break; - - default: - putchar (*f); } - } - return save_argc - argc; + return save_argc - argc; } /* Print a \ escape sequence starting at ESCSTART. Return the number of characters in the escape sequence besides the backslash. */ -static int -print_esc (char *escstart) +static int print_esc(char *escstart) { - register char *p = escstart + 1; - int esc_value = 0; /* Value of \nnn escape. */ - int esc_length; /* Length of \nnn escape. */ - - /* \0ooo and \xhhh escapes have maximum length of 3 chars. */ - if (*p == 'x') - { - for (esc_length = 0, ++p; - esc_length < 3 && ISXDIGIT (*p); - ++esc_length, ++p) - esc_value = esc_value * 16 + hextobin (*p); + register char *p = escstart + 1; + int esc_value = 0; /* Value of \nnn escape. */ + int esc_length; /* Length of \nnn escape. */ + + /* \0ooo and \xhhh escapes have maximum length of 3 chars. */ + if (*p == 'x') { + for (esc_length = 0, ++p; + esc_length < 3 && ISXDIGIT(*p); ++esc_length, ++p) + esc_value = esc_value * 16 + hextobin(*p); /* if (esc_length == 0) fprintf(stderr, "missing hex in esc"); */ - putchar (esc_value); - } - else if (*p == '0') - { - for (esc_length = 0, ++p; - esc_length < 3 && isodigit (*p); - ++esc_length, ++p) - esc_value = esc_value * 8 + octtobin (*p); - putchar (esc_value); - } - else if (strchr ("\"\\abcfnrtv", *p)) - print_esc_char (*p++); + putchar(esc_value); + } else if (*p == '0') { + for (esc_length = 0, ++p; + esc_length < 3 && isodigit(*p); ++esc_length, ++p) + esc_value = esc_value * 8 + octtobin(*p); + putchar(esc_value); + } else if (strchr("\"\\abcfnrtv", *p)) + print_esc_char(*p++); /* else fprintf(stderr, "\\%c: invalid esc", *p); */ - return p - escstart - 1; + return p - escstart - 1; } /* Output a single-character \ escape. */ -static void -print_esc_char (int c) +static void print_esc_char(int c) { - switch (c) - { - case 'a': /* Alert. */ - putchar (7); - break; - case 'b': /* Backspace. */ - putchar (8); - break; - case 'c': /* Cancel the rest of the output. */ - exit (0); - break; - case 'f': /* Form feed. */ - putchar (12); - break; - case 'n': /* New line. */ - putchar (10); - break; - case 'r': /* Carriage return. */ - putchar (13); - break; - case 't': /* Horizontal tab. */ - putchar (9); - break; - case 'v': /* Vertical tab. */ - putchar (11); - break; - default: - putchar (c); - break; - } + switch (c) { + case 'a': /* Alert. */ + putchar(7); + break; + case 'b': /* Backspace. */ + putchar(8); + break; + case 'c': /* Cancel the rest of the output. */ + exit(0); + break; + case 'f': /* Form feed. */ + putchar(12); + break; + case 'n': /* New line. */ + putchar(10); + break; + case 'r': /* Carriage return. */ + putchar(13); + break; + case 't': /* Horizontal tab. */ + putchar(9); + break; + case 'v': /* Vertical tab. */ + putchar(11); + break; + default: + putchar(c); + break; + } } /* Print string STR, evaluating \ escapes. */ -static void -print_esc_string (char *str) +static void print_esc_string(char *str) { - for (; *str; str++) - if (*str == '\\') - str += print_esc (str); - else - putchar (*str); + for (; *str; str++) + if (*str == '\\') + str += print_esc(str); + else + putchar(*str); } static void -print_direc (char *start, size_t length, int field_width, int precision, char *argument) +print_direc(char *start, size_t length, int field_width, int precision, + char *argument) { - char *p; /* Null-terminated copy of % directive. */ - - p = xmalloc ((unsigned) (length + 1)); - strncpy (p, start, length); - p[length] = 0; - - switch (p[length - 1]) - { - case 'd': - case 'i': - if (field_width < 0) - { - if (precision < 0) - printf (p, xstrtol (argument)); - else - printf (p, precision, xstrtol (argument)); - } - else - { - if (precision < 0) - printf (p, field_width, xstrtol (argument)); - else - printf (p, field_width, precision, xstrtol (argument)); - } - break; - - case 'o': - case 'u': - case 'x': - case 'X': - if (field_width < 0) - { - if (precision < 0) - printf (p, xstrtoul (argument)); - else - printf (p, precision, xstrtoul (argument)); - } - else - { - if (precision < 0) - printf (p, field_width, xstrtoul (argument)); - else - printf (p, field_width, precision, xstrtoul (argument)); - } - break; - - case 'f': - case 'e': - case 'E': - case 'g': - case 'G': - if (field_width < 0) - { - if (precision < 0) - printf (p, xstrtod (argument)); - else - printf (p, precision, xstrtod (argument)); - } - else - { - if (precision < 0) - printf (p, field_width, xstrtod (argument)); - else - printf (p, field_width, precision, xstrtod (argument)); - } - break; - - case 'c': - printf (p, *argument); - break; - - case 's': - if (field_width < 0) - { - if (precision < 0) - printf (p, argument); - else - printf (p, precision, argument); - } - else - { - if (precision < 0) - printf (p, field_width, argument); - else - printf (p, field_width, precision, argument); + char *p; /* Null-terminated copy of % directive. */ + + p = xmalloc((unsigned) (length + 1)); + strncpy(p, start, length); + p[length] = 0; + + switch (p[length - 1]) { + case 'd': + case 'i': + if (field_width < 0) { + if (precision < 0) + printf(p, xstrtol(argument)); + else + printf(p, precision, xstrtol(argument)); + } else { + if (precision < 0) + printf(p, field_width, xstrtol(argument)); + else + printf(p, field_width, precision, xstrtol(argument)); + } + break; + + case 'o': + case 'u': + case 'x': + case 'X': + if (field_width < 0) { + if (precision < 0) + printf(p, xstrtoul(argument)); + else + printf(p, precision, xstrtoul(argument)); + } else { + if (precision < 0) + printf(p, field_width, xstrtoul(argument)); + else + printf(p, field_width, precision, xstrtoul(argument)); + } + break; + + case 'f': + case 'e': + case 'E': + case 'g': + case 'G': + if (field_width < 0) { + if (precision < 0) + printf(p, xstrtod(argument)); + else + printf(p, precision, xstrtod(argument)); + } else { + if (precision < 0) + printf(p, field_width, xstrtod(argument)); + else + printf(p, field_width, precision, xstrtod(argument)); + } + break; + + case 'c': + printf(p, *argument); + break; + + case 's': + if (field_width < 0) { + if (precision < 0) + printf(p, argument); + else + printf(p, precision, argument); + } else { + if (precision < 0) + printf(p, field_width, argument); + else + printf(p, field_width, precision, argument); + } + break; } - break; - } - free (p); + free(p); } -static unsigned long -xstrtoul (char *s) +static unsigned long xstrtoul(char *s) { - char *end; - unsigned long val; + char *end; + unsigned long val; - errno = 0; - val = strtoul (s, &end, 0); - verify (s, end); - return val; + errno = 0; + val = strtoul(s, &end, 0); + verify(s, end); + return val; } -static long -xstrtol (char *s) +static long xstrtol(char *s) { - char *end; - long val; + char *end; + long val; - errno = 0; - val = strtol (s, &end, 0); - verify (s, end); - return val; + errno = 0; + val = strtol(s, &end, 0); + verify(s, end); + return val; } -static double -xstrtod (char *s) +static double xstrtod(char *s) { - char *end; - double val; + char *end; + double val; - errno = 0; - val = strtod (s, &end); - verify (s, end); - return val; + errno = 0; + val = strtod(s, &end); + verify(s, end); + return val; } -static void -verify (char *s, char *end) +static void verify(char *s, char *end) { - if (errno) - { - fprintf(stderr, "%s", s); - exit_status = 1; - } - else if (*end) - { - /* - if (s == end) - fprintf(stderr, "%s: expected numeric", s); - else - fprintf(stderr, "%s: not completely converted", s); - */ - exit_status = 1; - } + if (errno) { + fprintf(stderr, "%s", s); + exit_status = 1; + } else if (*end) { + /* + if (s == end) + fprintf(stderr, "%s: expected numeric", s); + else + fprintf(stderr, "%s: not completely converted", s); + */ + exit_status = 1; + } } - diff --git a/coreutils/pwd.c b/coreutils/pwd.c index bacabd77a..00163178b 100644 --- a/coreutils/pwd.c +++ b/coreutils/pwd.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini pwd implementation for busybox * @@ -25,16 +26,15 @@ #include <dirent.h> #include <sys/param.h> -extern int -pwd_main(int argc, char * * argv) +extern int pwd_main(int argc, char **argv) { - char buf[PATH_MAX + 1]; + char buf[PATH_MAX + 1]; - if ( getcwd(buf, sizeof(buf)) == NULL ) { + if (getcwd(buf, sizeof(buf)) == NULL) { perror("get working directory"); - exit( FALSE); + exit(FALSE); } printf("%s\n", buf); - exit( TRUE); + exit(TRUE); } diff --git a/coreutils/rm.c b/coreutils/rm.c index ee434fb39..41afedaf9 100644 --- a/coreutils/rm.c +++ b/coreutils/rm.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini rm implementation for busybox * @@ -28,11 +29,12 @@ #include <dirent.h> #include <errno.h> -static const char* rm_usage = "rm [OPTION]... FILE...\n\n" -"Remove (unlink) the FILE(s).\n\n" -"Options:\n" -"\t-f\t\tremove existing destinations, never prompt\n" -"\t-r or -R\tremove the contents of directories recursively\n"; +static const char *rm_usage = "rm [OPTION]... FILE...\n\n" + "Remove (unlink) the FILE(s).\n\n" + "Options:\n" + + "\t-f\t\tremove existing destinations, never prompt\n" + "\t-r or -R\tremove the contents of directories recursively\n"; static int recursiveFlag = FALSE; @@ -40,63 +42,63 @@ static int forceFlag = FALSE; static const char *srcName; -static int fileAction(const char *fileName, struct stat* statbuf) +static int fileAction(const char *fileName, struct stat *statbuf) { - if (unlink( fileName) < 0 ) { - perror( fileName); - return ( FALSE); - } - return ( TRUE); + if (unlink(fileName) < 0) { + perror(fileName); + return (FALSE); + } + return (TRUE); } -static int dirAction(const char *fileName, struct stat* statbuf) +static int dirAction(const char *fileName, struct stat *statbuf) { - if (rmdir( fileName) < 0 ) { - perror( fileName); - return ( FALSE); - } - return ( TRUE); + if (rmdir(fileName) < 0) { + perror(fileName); + return (FALSE); + } + return (TRUE); } extern int rm_main(int argc, char **argv) { - struct stat statbuf; + struct stat statbuf; - if (argc < 2) { - usage( rm_usage); - } - argc--; - argv++; - - /* Parse any options */ - while (**argv == '-') { - while (*++(*argv)) - switch (**argv) { - case 'R': - case 'r': - recursiveFlag = TRUE; - break; - case 'f': - forceFlag = TRUE; - break; - default: - usage( rm_usage); - } + if (argc < 2) { + usage(rm_usage); + } argc--; argv++; - } - while (argc-- > 0) { - srcName = *(argv++); - if (forceFlag == TRUE && lstat(srcName, &statbuf) != 0 && errno == ENOENT) { - /* do not reports errors for non-existent files if -f, just skip them */ + /* Parse any options */ + while (**argv == '-') { + while (*++(*argv)) + switch (**argv) { + case 'R': + case 'r': + recursiveFlag = TRUE; + break; + case 'f': + forceFlag = TRUE; + break; + default: + usage(rm_usage); + } + argc--; + argv++; } - else { - if (recursiveAction( srcName, recursiveFlag, FALSE, - TRUE, fileAction, dirAction) == FALSE) { - exit( FALSE); - } + + while (argc-- > 0) { + srcName = *(argv++); + if (forceFlag == TRUE && lstat(srcName, &statbuf) != 0 + && errno == ENOENT) { + /* do not reports errors for non-existent files if -f, just skip them */ + } else { + if (recursiveAction(srcName, recursiveFlag, FALSE, + TRUE, fileAction, dirAction) == FALSE) { + exit(FALSE); + } + } } - } - exit( TRUE); + exit(TRUE); } diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c index 013fef1a4..f49569749 100644 --- a/coreutils/rmdir.c +++ b/coreutils/rmdir.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini rmdir implementation for busybox * @@ -28,15 +29,16 @@ extern int rmdir_main(int argc, char **argv) { - if ( argc==1 || **(argv+1) == '-' ) { - usage( "rmdir [OPTION]... DIRECTORY...\n\nRemove the DIRECTORY(ies), if they are empty.\n"); - } + if (argc == 1 || **(argv + 1) == '-') { + usage + ("rmdir [OPTION]... DIRECTORY...\n\nRemove the DIRECTORY(ies), if they are empty.\n"); + } - while (--argc > 0) { - if ( rmdir(*(++argv)) == -1 ) { - fprintf(stderr, "%s: %s\n", *argv, strerror(errno)); - exit(FALSE); + while (--argc > 0) { + if (rmdir(*(++argv)) == -1) { + fprintf(stderr, "%s: %s\n", *argv, strerror(errno)); + exit(FALSE); + } } - } - exit(TRUE); + exit(TRUE); } diff --git a/coreutils/sleep.c b/coreutils/sleep.c index bfbb78f61..9687b8446 100644 --- a/coreutils/sleep.c +++ b/coreutils/sleep.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini sleep implementation for busybox * @@ -23,19 +24,17 @@ #include "internal.h" #include <stdio.h> -const char sleep_usage[] = "sleep N\n\n" -"Pause for N seconds.\n"; +const char sleep_usage[] = "sleep N\n\n" "Pause for N seconds.\n"; -extern int -sleep_main(int argc, char * * argv) +extern int sleep_main(int argc, char **argv) { - if ( (argc < 2) || (**(argv+1) == '-') ) { - usage( sleep_usage ); + if ((argc < 2) || (**(argv + 1) == '-')) { + usage(sleep_usage); } - if ( sleep(atoi(*(++argv))) != 0 ) { - perror( "sleep"); - exit (FALSE); + if (sleep(atoi(*(++argv))) != 0) { + perror("sleep"); + exit(FALSE); } else - exit (TRUE); + exit(TRUE); } diff --git a/coreutils/sort.c b/coreutils/sort.c index d529ce722..609c5e08c 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini sort implementation for busybox * @@ -28,29 +29,27 @@ #include <stdio.h> #include <errno.h> -static const char sort_usage[] = -"sort [OPTION]... [FILE]...\n\n" -; +static const char sort_usage[] = "sort [OPTION]... [FILE]...\n\n"; /* typedefs _______________________________________________________________ */ /* line node */ typedef struct Line { - char *data; /* line data */ - struct Line *next; /* pointer to next line node */ + char *data; /* line data */ + struct Line *next; /* pointer to next line node */ } Line; /* singly-linked list of lines */ typedef struct { - int len; /* number of Lines */ - Line **sorted; /* array fed to qsort */ + int len; /* number of Lines */ + Line **sorted; /* array fed to qsort */ - Line *head; /* head of List */ - Line *current; /* current Line */ + Line *head; /* head of List */ + Line *current; /* current Line */ } List; /* comparison function */ -typedef int (Compare)(const void *, const void *); +typedef int (Compare) (const void *, const void *); /* methods ________________________________________________________________ */ @@ -58,175 +57,176 @@ typedef int (Compare)(const void *, const void *); static const int max = 1024; /* mallocate Line */ -static Line * -line_alloc() +static Line *line_alloc() { - Line *self; - self = malloc(1 * sizeof(Line)); - return self; + Line *self; + + self = malloc(1 * sizeof(Line)); + return self; } /* Initialize Line with string */ -static Line * -line_init(Line *self, const char *string) +static Line *line_init(Line * self, const char *string) { - self->data = malloc((strlen(string) + 1) * sizeof(char)); - if (self->data == NULL) { return NULL; } - strcpy(self->data, string); - self->next = NULL; - return self; + self->data = malloc((strlen(string) + 1) * sizeof(char)); + + if (self->data == NULL) { + return NULL; + } + strcpy(self->data, string); + self->next = NULL; + return self; } /* Construct Line from FILE* */ -static Line * -line_newFromFile(FILE *src) +static Line *line_newFromFile(FILE * src) { - char buffer[max]; - Line *self; - - if (fgets(buffer, max, src)) { - self = line_alloc(); - if (self == NULL) { return NULL; } - line_init(self, buffer); - return self; - } - return NULL; + char buffer[max]; + Line *self; + + if (fgets(buffer, max, src)) { + self = line_alloc(); + if (self == NULL) { + return NULL; + } + line_init(self, buffer); + return self; + } + return NULL; } /* Line destructor */ -static Line * -line_release(Line *self) +static Line *line_release(Line * self) { - if (self->data) { - free(self->data); - free(self); - } - return self; + if (self->data) { + free(self->data); + free(self); + } + return self; } /* Comparison */ /* ascii order */ -static int -compare_ascii(const void *a, const void *b) +static int compare_ascii(const void *a, const void *b) { - Line **doh; - Line *x, *y; + Line **doh; + Line *x, *y; - doh = (Line **) a; - x = *doh; - doh = (Line **) b; - y = *doh; + doh = (Line **) a; + x = *doh; + doh = (Line **) b; + y = *doh; - // fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data); - return strcmp(x->data, y->data); + // fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data); + return strcmp(x->data, y->data); } /* numeric order */ -static int -compare_numeric(const void *a, const void *b) +static int compare_numeric(const void *a, const void *b) { - Line **doh; - Line *x, *y; - int xint, yint; + Line **doh; + Line *x, *y; + int xint, yint; - doh = (Line **) a; - x = *doh; - doh = (Line **) b; - y = *doh; + doh = (Line **) a; + x = *doh; + doh = (Line **) b; + y = *doh; - xint = strtoul(x->data, NULL, 10); - yint = strtoul(y->data, NULL, 10); + xint = strtoul(x->data, NULL, 10); + yint = strtoul(y->data, NULL, 10); - return (xint - yint); + return (xint - yint); } /* List */ /* */ -static List * -list_init(List *self) +static List *list_init(List * self) { - self->len = 0; - self->sorted = NULL; - self->head = NULL; - self->current = NULL; - return self; + self->len = 0; + self->sorted = NULL; + self->head = NULL; + self->current = NULL; + return self; } /* for simplicity, the List gains ownership of the line */ -static List * -list_insert(List *self, Line *line) +static List *list_insert(List * self, Line * line) { - if (line == NULL) { return NULL; } - - /* first insertion */ - if (self->head == NULL) { - self->head = line; - self->current = line; - - /* all subsequent insertions */ - } else { - self->current->next = line; - self->current = line; - } - self->len++; - return self; + if (line == NULL) { + return NULL; + } + + /* first insertion */ + if (self->head == NULL) { + self->head = line; + self->current = line; + + /* all subsequent insertions */ + } else { + self->current->next = line; + self->current = line; + } + self->len++; + return self; } /* order the list according to compare() */ -static List * -list_sort(List *self, Compare *compare) +static List *list_sort(List * self, Compare * compare) { - int i; - Line *line; - - /* mallocate array of Line*s */ - self->sorted = (Line **) malloc(self->len * sizeof(Line*)); - if (self->sorted == NULL) { return NULL; } - - /* fill array w/ List's contents */ - i = 0; - line = self->head; - while (line) { - self->sorted[i++] = line; - line = line->next; - } - - /* apply qsort */ - qsort(self->sorted, self->len, sizeof(Line*), compare); - return self; + int i; + Line *line; + + /* mallocate array of Line*s */ + self->sorted = (Line **) malloc(self->len * sizeof(Line *)); + if (self->sorted == NULL) { + return NULL; + } + + /* fill array w/ List's contents */ + i = 0; + line = self->head; + while (line) { + self->sorted[i++] = line; + line = line->next; + } + + /* apply qsort */ + qsort(self->sorted, self->len, sizeof(Line *), compare); + return self; } /* precondition: list must be sorted */ -static List * -list_writeToFile(List *self, FILE* dst) +static List *list_writeToFile(List * self, FILE * dst) { - int i; - Line **line = self->sorted; - - if (self->sorted == NULL) { return NULL; } - for (i = 0; i < self->len; i++) { - fprintf(dst, "%s", line[i]->data); - } - return self; + int i; + Line **line = self->sorted; + + if (self->sorted == NULL) { + return NULL; + } + for (i = 0; i < self->len; i++) { + fprintf(dst, "%s", line[i]->data); + } + return self; } /* deallocate */ -static void -list_release(List *self) +static void list_release(List * self) { - Line *i; - Line *die; - - i = self->head; - while (i) { - die = i; - i = die->next; - line_release(die); - } + Line *i; + Line *die; + + i = self->head; + while (i) { + die = i; + i = die->next; + line_release(die); + } } @@ -237,76 +237,77 @@ list_release(List *self) * and finally print it */ -int -sort_main(int argc, char **argv) +int sort_main(int argc, char **argv) { - int i; - char opt; - List list; - Line *l; - Compare *compare; - - /* init */ - compare = compare_ascii; - list_init(&list); - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'g': - /* what's the diff between -g && -n? */ - compare = compare_numeric; - break; - case 'h': - usage(sort_usage); - break; - case 'n': - /* what's the diff between -g && -n? */ - compare = compare_numeric; - break; - case 'r': - /* reverse */ - break; - default: - fprintf(stderr, "sort: invalid option -- %c\n", opt); - usage(sort_usage); - } - } else { - break; + int i; + char opt; + List list; + Line *l; + Compare *compare; + + /* init */ + compare = compare_ascii; + list_init(&list); + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 'g': + /* what's the diff between -g && -n? */ + compare = compare_numeric; + break; + case 'h': + usage(sort_usage); + break; + case 'n': + /* what's the diff between -g && -n? */ + compare = compare_numeric; + break; + case 'r': + /* reverse */ + break; + default: + fprintf(stderr, "sort: invalid option -- %c\n", opt); + usage(sort_usage); + } + } else { + break; + } } - } - /* this could be factored better */ + /* this could be factored better */ - /* work w/ stdin */ - if (i >= argc) { - while ( (l = line_newFromFile(stdin))) { - list_insert(&list, l); - } - list_sort(&list, compare); - list_writeToFile(&list, stdout); - list_release(&list); - - /* work w/ what's left in argv[] */ - } else { - FILE *src; - - for ( ; i < argc; i++) { - src = fopen(argv[i], "r"); - if (src == NULL) { break; } - while ( (l = line_newFromFile(src))) { - list_insert(&list, l); - } - fclose(src); + /* work w/ stdin */ + if (i >= argc) { + while ((l = line_newFromFile(stdin))) { + list_insert(&list, l); + } + list_sort(&list, compare); + list_writeToFile(&list, stdout); + list_release(&list); + + /* work w/ what's left in argv[] */ + } else { + FILE *src; + + for (; i < argc; i++) { + src = fopen(argv[i], "r"); + if (src == NULL) { + break; + } + while ((l = line_newFromFile(src))) { + list_insert(&list, l); + } + fclose(src); + } + list_sort(&list, compare); + list_writeToFile(&list, stdout); + list_release(&list); } - list_sort(&list, compare); - list_writeToFile(&list, stdout); - list_release(&list); - } - exit(0); + exit(0); } -/* $Id: sort.c,v 1.10 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: sort.c,v 1.11 2000/02/08 19:58:47 erik Exp $ */ diff --git a/coreutils/sync.c b/coreutils/sync.c index 145ed1eda..f8160c8dc 100644 --- a/coreutils/sync.c +++ b/coreutils/sync.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini sync implementation for busybox * @@ -23,12 +24,10 @@ #include "internal.h" #include <stdio.h> -extern int -sync_main(int argc, char * * argv) +extern int sync_main(int argc, char **argv) { - if ( argc>1 && **(argv+1) == '-' ) { - usage( "sync\n\nWrite all buffered filesystem blocks to disk.\n"); - } - exit( sync()); + if (argc > 1 && **(argv + 1) == '-') { + usage("sync\n\nWrite all buffered filesystem blocks to disk.\n"); + } + exit(sync()); } - diff --git a/coreutils/tail.c b/coreutils/tail.c index 0ab8f11b0..31705afa2 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" /* This file contains _two_ implementations of tail. One is * a bit more full featured, but costs 6k. The other (i.e. the @@ -68,22 +69,23 @@ static int forever; static int print_headers; const char tail_usage[] = - "tail [OPTION] [FILE]...\n\n" - "Print last 10 lines of each FILE to standard output.\n" - "With more than one FILE, precede each with a header giving the\n" - "file name. With no FILE, or when FILE is -, read standard input.\n\n" - "Options:\n" - "\t-n NUM\t\tPrint last NUM lines instead of first 10\n" - "\t-f\t\tOutput data as the file grows. This version\n" - "\t\t\tof 'tail -f' supports only one file at a time.\n"; + "tail [OPTION] [FILE]...\n\n" + "Print last 10 lines of each FILE to standard output.\n" + "With more than one FILE, precede each with a header giving the\n" + "file name. With no FILE, or when FILE is -, read standard input.\n\n" + "Options:\n" + "\t-n NUM\t\tPrint last NUM lines instead of first 10\n" + + "\t-f\t\tOutput data as the file grows. This version\n" + "\t\t\tof 'tail -f' supports only one file at a time.\n"; static void write_header(const char *filename) { - static int first_file = 1; + static int first_file = 1; - printf("%s==> %s <==\n", (first_file ? "" : "\n"), filename); - first_file = 0; + printf("%s==> %s <==\n", (first_file ? "" : "\n"), filename); + first_file = 0; } /* Print the last N_LINES lines from the end of file FD. @@ -97,57 +99,57 @@ static void write_header(const char *filename) static int file_lines(const char *filename, int fd, long int n_lines, off_t pos) { - char buffer[BUFSIZ]; - int bytes_read; - int i; /* Index into `buffer' for scanning. */ - - if (n_lines == 0) - return 0; + char buffer[BUFSIZ]; + int bytes_read; + int i; /* Index into `buffer' for scanning. */ - /* Set `bytes_read' to the size of the last, probably partial, buffer; - 0 < `bytes_read' <= `BUFSIZ'. */ - bytes_read = pos % BUFSIZ; - if (bytes_read == 0) - bytes_read = BUFSIZ; - /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all - reads will be on block boundaries, which might increase efficiency. */ - pos -= bytes_read; - lseek(fd, pos, SEEK_SET); - bytes_read = fullRead(fd, buffer, bytes_read); - if (bytes_read == -1) - error("read error"); - - /* Count the incomplete line on files that don't end with a newline. */ - if (bytes_read && buffer[bytes_read - 1] != '\n') - --n_lines; - - do { - /* Scan backward, counting the newlines in this bufferfull. */ - for (i = bytes_read - 1; i >= 0; i--) { - /* Have we counted the requested number of newlines yet? */ - if (buffer[i] == '\n' && n_lines-- == 0) { - /* If this newline wasn't the last character in the buffer, - print the text after it. */ - if (i != bytes_read - 1) - XWRITE(STDOUT_FILENO, &buffer[i + 1], - bytes_read - (i + 1)); + if (n_lines == 0) return 0; - } - } - /* Not enough newlines in that bufferfull. */ - if (pos == 0) { - /* Not enough lines in the file; print the entire file. */ - lseek(fd, (off_t) 0, SEEK_SET); - return 0; - } - pos -= BUFSIZ; + + /* Set `bytes_read' to the size of the last, probably partial, buffer; + 0 < `bytes_read' <= `BUFSIZ'. */ + bytes_read = pos % BUFSIZ; + if (bytes_read == 0) + bytes_read = BUFSIZ; + /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all + reads will be on block boundaries, which might increase efficiency. */ + pos -= bytes_read; lseek(fd, pos, SEEK_SET); - } - while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0); - if (bytes_read == -1) - error("read error"); + bytes_read = fullRead(fd, buffer, bytes_read); + if (bytes_read == -1) + error("read error"); + + /* Count the incomplete line on files that don't end with a newline. */ + if (bytes_read && buffer[bytes_read - 1] != '\n') + --n_lines; + + do { + /* Scan backward, counting the newlines in this bufferfull. */ + for (i = bytes_read - 1; i >= 0; i--) { + /* Have we counted the requested number of newlines yet? */ + if (buffer[i] == '\n' && n_lines-- == 0) { + /* If this newline wasn't the last character in the buffer, + print the text after it. */ + if (i != bytes_read - 1) + XWRITE(STDOUT_FILENO, &buffer[i + 1], + bytes_read - (i + 1)); + return 0; + } + } + /* Not enough newlines in that bufferfull. */ + if (pos == 0) { + /* Not enough lines in the file; print the entire file. */ + lseek(fd, (off_t) 0, SEEK_SET); + return 0; + } + pos -= BUFSIZ; + lseek(fd, pos, SEEK_SET); + } + while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0); + if (bytes_read == -1) + error("read error"); - return 0; + return 0; } /* Print the last N_LINES lines from the end of the standard input, @@ -157,100 +159,100 @@ file_lines(const char *filename, int fd, long int n_lines, off_t pos) static int pipe_lines(const char *filename, int fd, long int n_lines) { - struct linebuffer { - int nbytes, nlines; - char buffer[BUFSIZ]; - struct linebuffer *next; - }; - typedef struct linebuffer LBUFFER; - LBUFFER *first, *last, *tmp; - int i; /* Index into buffers. */ - int total_lines = 0; /* Total number of newlines in all buffers. */ - int errors = 0; - - first = last = (LBUFFER *) xmalloc(sizeof(LBUFFER)); - first->nbytes = first->nlines = 0; - first->next = NULL; - tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); - - /* Input is always read into a fresh buffer. */ - while ((tmp->nbytes = fullRead(fd, tmp->buffer, BUFSIZ)) > 0) { - tmp->nlines = 0; - tmp->next = NULL; - - /* Count the number of newlines just read. */ - for (i = 0; i < tmp->nbytes; i++) - if (tmp->buffer[i] == '\n') - ++tmp->nlines; - total_lines += tmp->nlines; - - /* If there is enough room in the last buffer read, just append the new - one to it. This is because when reading from a pipe, `nbytes' can - often be very small. */ - if (tmp->nbytes + last->nbytes < BUFSIZ) { - memcpy(&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); - last->nbytes += tmp->nbytes; - last->nlines += tmp->nlines; - } else { - /* If there's not enough room, link the new buffer onto the end of - the list, then either free up the oldest buffer for the next - read if that would leave enough lines, or else malloc a new one. - Some compaction mechanism is possible but probably not - worthwhile. */ - last = last->next = tmp; - if (total_lines - first->nlines > n_lines) { - tmp = first; - total_lines -= first->nlines; - first = first->next; - } else - tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + struct linebuffer { + int nbytes, nlines; + char buffer[BUFSIZ]; + struct linebuffer *next; + }; + typedef struct linebuffer LBUFFER; + LBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_lines = 0; /* Total number of newlines in all buffers. */ + int errors = 0; + + first = last = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + first->nbytes = first->nlines = 0; + first->next = NULL; + tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = fullRead(fd, tmp->buffer, BUFSIZ)) > 0) { + tmp->nlines = 0; + tmp->next = NULL; + + /* Count the number of newlines just read. */ + for (i = 0; i < tmp->nbytes; i++) + if (tmp->buffer[i] == '\n') + ++tmp->nlines; + total_lines += tmp->nlines; + + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) { + memcpy(&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + last->nlines += tmp->nlines; + } else { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough lines, or else malloc a new one. + Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_lines - first->nlines > n_lines) { + tmp = first; + total_lines -= first->nlines; + first = first->next; + } else + tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + } } - } - if (tmp->nbytes == -1) - error("read error"); - - free((char *) tmp); - - /* This prevents a core dump when the pipe contains no newlines. */ - if (n_lines == 0) - goto free_lbuffers; - - /* Count the incomplete line on files that don't end with a newline. */ - if (last->buffer[last->nbytes - 1] != '\n') { - ++last->nlines; - ++total_lines; - } - - /* Run through the list, printing lines. First, skip over unneeded - buffers. */ - for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) - total_lines -= tmp->nlines; - - /* Find the correct beginning, then print the rest of the file. */ - if (total_lines > n_lines) { - char *cp; - - /* Skip `total_lines' - `n_lines' newlines. We made sure that - `total_lines' - `n_lines' <= `tmp->nlines'. */ - cp = tmp->buffer; - for (i = total_lines - n_lines; i; --i) - while (*cp++ != '\n') - /* Do nothing. */ ; - i = cp - tmp->buffer; - } else - i = 0; - XWRITE(STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); - - for (tmp = tmp->next; tmp; tmp = tmp->next) - XWRITE(STDOUT_FILENO, tmp->buffer, tmp->nbytes); + if (tmp->nbytes == -1) + error("read error"); + + free((char *) tmp); + + /* This prevents a core dump when the pipe contains no newlines. */ + if (n_lines == 0) + goto free_lbuffers; + + /* Count the incomplete line on files that don't end with a newline. */ + if (last->buffer[last->nbytes - 1] != '\n') { + ++last->nlines; + ++total_lines; + } + + /* Run through the list, printing lines. First, skip over unneeded + buffers. */ + for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) + total_lines -= tmp->nlines; + + /* Find the correct beginning, then print the rest of the file. */ + if (total_lines > n_lines) { + char *cp; + + /* Skip `total_lines' - `n_lines' newlines. We made sure that + `total_lines' - `n_lines' <= `tmp->nlines'. */ + cp = tmp->buffer; + for (i = total_lines - n_lines; i; --i) + while (*cp++ != '\n') + /* Do nothing. */ ; + i = cp - tmp->buffer; + } else + i = 0; + XWRITE(STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE(STDOUT_FILENO, tmp->buffer, tmp->nbytes); free_lbuffers: - while (first) { - tmp = first->next; - free((char *) first); - first = tmp; - } - return errors; + while (first) { + tmp = first->next; + free((char *) first); + first = tmp; + } + return errors; } /* Display file FILENAME from the current position in FD to the end. @@ -259,25 +261,25 @@ static int pipe_lines(const char *filename, int fd, long int n_lines) static long dump_remainder(const char *filename, int fd) { - char buffer[BUFSIZ]; - int bytes_read; - long total; + char buffer[BUFSIZ]; + int bytes_read; + long total; - total = 0; + total = 0; output: - while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) { - XWRITE(STDOUT_FILENO, buffer, bytes_read); - total += bytes_read; - } - if (bytes_read == -1) - error("read error"); - if (forever) { - fflush(stdout); - sleep(1); - goto output; - } - - return total; + while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) { + XWRITE(STDOUT_FILENO, buffer, bytes_read); + total += bytes_read; + } + if (bytes_read == -1) + error("read error"); + if (forever) { + fflush(stdout); + sleep(1); + goto output; + } + + return total; } /* Output the last N_LINES lines of file FILENAME open for reading in FD. @@ -285,31 +287,31 @@ static long dump_remainder(const char *filename, int fd) static int tail_lines(const char *filename, int fd, long int n_lines) { - struct stat stats; - off_t length; - - if (print_headers) - write_header(filename); - - if (fstat(fd, &stats)) - error("fstat error"); - - /* Use file_lines only if FD refers to a regular file with - its file pointer positioned at beginning of file. */ - /* FIXME: adding the lseek conjunct is a kludge. - Once there's a reasonable test suite, fix the true culprit: - file_lines. file_lines shouldn't presume that the input - file pointer is initially positioned to beginning of file. */ - if (S_ISREG(stats.st_mode) - && lseek(fd, (off_t) 0, SEEK_CUR) == (off_t) 0) { - length = lseek(fd, (off_t) 0, SEEK_END); - if (length != 0 && file_lines(filename, fd, n_lines, length)) - return 1; - dump_remainder(filename, fd); - } else - return pipe_lines(filename, fd, n_lines); - - return 0; + struct stat stats; + off_t length; + + if (print_headers) + write_header(filename); + + if (fstat(fd, &stats)) + error("fstat error"); + + /* Use file_lines only if FD refers to a regular file with + its file pointer positioned at beginning of file. */ + /* FIXME: adding the lseek conjunct is a kludge. + Once there's a reasonable test suite, fix the true culprit: + file_lines. file_lines shouldn't presume that the input + file pointer is initially positioned to beginning of file. */ + if (S_ISREG(stats.st_mode) + && lseek(fd, (off_t) 0, SEEK_CUR) == (off_t) 0) { + length = lseek(fd, (off_t) 0, SEEK_END); + if (length != 0 && file_lines(filename, fd, n_lines, length)) + return 1; + dump_remainder(filename, fd); + } else + return pipe_lines(filename, fd, n_lines); + + return 0; } /* Display the last N_UNITS lines of file FILENAME. @@ -318,78 +320,78 @@ static int tail_lines(const char *filename, int fd, long int n_lines) static int tail_file(const char *filename, off_t n_units) { - int fd, errors; - - if (!strcmp(filename, "-")) { - filename = "standard input"; - errors = tail_lines(filename, 0, (long) n_units); - } else { - /* Not standard input. */ - fd = open(filename, O_RDONLY); - if (fd == -1) - error("open error"); - - errors = tail_lines(filename, fd, (long) n_units); - close(fd); - } - - return errors; + int fd, errors; + + if (!strcmp(filename, "-")) { + filename = "standard input"; + errors = tail_lines(filename, 0, (long) n_units); + } else { + /* Not standard input. */ + fd = open(filename, O_RDONLY); + if (fd == -1) + error("open error"); + + errors = tail_lines(filename, fd, (long) n_units); + close(fd); + } + + return errors; } extern int tail_main(int argc, char **argv) { - int exit_status = 0; - int n_units = DEFAULT_N_LINES; - int n_tmp, i; - char opt; - - forever = print_headers = 0; - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'f': - forever = 1; - break; - case 'n': - n_tmp = 0; - if (++i < argc) - n_tmp = atoi(argv[i]); - if (n_tmp < 1) - usage(tail_usage); - n_units = n_tmp; - break; - case '-': - case 'h': - usage(tail_usage); - default: - fprintf(stderr, "tail: invalid option -- %c\n", opt); - usage(tail_usage); - } - } else { - break; + int exit_status = 0; + int n_units = DEFAULT_N_LINES; + int n_tmp, i; + char opt; + + forever = print_headers = 0; + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 'f': + forever = 1; + break; + case 'n': + n_tmp = 0; + if (++i < argc) + n_tmp = atoi(argv[i]); + if (n_tmp < 1) + usage(tail_usage); + n_units = n_tmp; + break; + case '-': + case 'h': + usage(tail_usage); + default: + fprintf(stderr, "tail: invalid option -- %c\n", opt); + usage(tail_usage); + } + } else { + break; + } } - } - if (i + 1 < argc) { - if (forever) { - fprintf(stderr, - "tail: option -f is invalid with multiple files\n"); - usage(tail_usage); + if (i + 1 < argc) { + if (forever) { + fprintf(stderr, + "tail: option -f is invalid with multiple files\n"); + usage(tail_usage); + } + print_headers = 1; } - print_headers = 1; - } - if (i >= argc) { - exit_status |= tail_file("-", n_units); - } else { - for (; i < argc; i++) - exit_status |= tail_file(argv[i], n_units); - } + if (i >= argc) { + exit_status |= tail_file("-", n_units); + } else { + for (; i < argc; i++) + exit_status |= tail_file(argv[i], n_units); + } - exit(exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); + exit(exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); } @@ -441,15 +443,15 @@ extern int tail_main(int argc, char **argv) #define NDEBUG 1 -static void detailed_error(int i, int errnum, char* fmt, ...) +static void detailed_error(int i, int errnum, char *fmt, ...) { - va_list arguments; + va_list arguments; - va_start(arguments, fmt); - vfprintf(stderr, fmt, arguments); - fprintf(stderr, "\n%s\n", strerror( errnum)); - va_end(arguments); - exit(i); + va_start(arguments, fmt); + vfprintf(stderr, fmt, arguments); + fprintf(stderr, "\n%s\n", strerror(errnum)); + va_end(arguments); + exit(i); } @@ -494,9 +496,8 @@ static int from_start; static int print_headers; /* When to print the filename banners. */ -enum header_mode -{ - multiple_files, always, never +enum header_mode { + multiple_files, always, never }; /* The name this program was run with. */ @@ -506,8 +507,7 @@ char *program_name; static int have_read_stdin; -static const char tail_usage[] = -"tail [OPTION]... [FILE]...\n\ +static const char tail_usage[] = "tail [OPTION]... [FILE]...\n\ \n\ Print last 10 lines of each FILE to standard output.\n\ With more than one FILE, precede each with a header giving the file name.\n\ @@ -524,15 +524,13 @@ If the first character of N (bytes or lines) is a `+', output begins with \n\ the Nth item from the start of each file, otherwise, print the last N items\n\ in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2).\n\n"; -static void -write_header (const char *filename, const char *comment) +static void write_header(const char *filename, const char *comment) { - static int first_file = 1; + static int first_file = 1; - printf ("%s==> %s%s%s <==\n", (first_file ? "" : "\n"), filename, - (comment ? ": " : ""), - (comment ? comment : "")); - first_file = 0; + printf("%s==> %s%s%s <==\n", (first_file ? "" : "\n"), filename, + (comment ? ": " : ""), (comment ? comment : "")); + first_file = 0; } /* Print the last N_LINES lines from the end of file FD. @@ -544,67 +542,62 @@ write_header (const char *filename, const char *comment) Return 0 if successful, 1 if an error occurred. */ static int -file_lines (const char *filename, int fd, long int n_lines, off_t pos) +file_lines(const char *filename, int fd, long int n_lines, off_t pos) { - char buffer[BUFSIZ]; - int bytes_read; - int i; /* Index into `buffer' for scanning. */ - - if (n_lines == 0) - return 0; - - /* Set `bytes_read' to the size of the last, probably partial, buffer; - 0 < `bytes_read' <= `BUFSIZ'. */ - bytes_read = pos % BUFSIZ; - if (bytes_read == 0) - bytes_read = BUFSIZ; - /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all - reads will be on block boundaries, which might increase efficiency. */ - pos -= bytes_read; - lseek (fd, pos, SEEK_SET); - bytes_read = fullRead (fd, buffer, bytes_read); - if (bytes_read == -1) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - - /* Count the incomplete line on files that don't end with a newline. */ - if (bytes_read && buffer[bytes_read - 1] != '\n') - --n_lines; - - do - { - /* Scan backward, counting the newlines in this bufferfull. */ - for (i = bytes_read - 1; i >= 0; i--) - { - /* Have we counted the requested number of newlines yet? */ - if (buffer[i] == '\n' && n_lines-- == 0) - { - /* If this newline wasn't the last character in the buffer, - print the text after it. */ - if (i != bytes_read - 1) - XWRITE (STDOUT_FILENO, &buffer[i + 1], bytes_read - (i + 1)); - return 0; - } + char buffer[BUFSIZ]; + int bytes_read; + int i; /* Index into `buffer' for scanning. */ + + if (n_lines == 0) + return 0; + + /* Set `bytes_read' to the size of the last, probably partial, buffer; + 0 < `bytes_read' <= `BUFSIZ'. */ + bytes_read = pos % BUFSIZ; + if (bytes_read == 0) + bytes_read = BUFSIZ; + /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all + reads will be on block boundaries, which might increase efficiency. */ + pos -= bytes_read; + lseek(fd, pos, SEEK_SET); + bytes_read = fullRead(fd, buffer, bytes_read); + if (bytes_read == -1) { + detailed_error(0, errno, "%s", filename); + return 1; + } + + /* Count the incomplete line on files that don't end with a newline. */ + if (bytes_read && buffer[bytes_read - 1] != '\n') + --n_lines; + + do { + /* Scan backward, counting the newlines in this bufferfull. */ + for (i = bytes_read - 1; i >= 0; i--) { + /* Have we counted the requested number of newlines yet? */ + if (buffer[i] == '\n' && n_lines-- == 0) { + /* If this newline wasn't the last character in the buffer, + print the text after it. */ + if (i != bytes_read - 1) + XWRITE(STDOUT_FILENO, &buffer[i + 1], + bytes_read - (i + 1)); + return 0; + } + } + /* Not enough newlines in that bufferfull. */ + if (pos == 0) { + /* Not enough lines in the file; print the entire file. */ + lseek(fd, (off_t) 0, SEEK_SET); + return 0; + } + pos -= BUFSIZ; + lseek(fd, pos, SEEK_SET); } - /* Not enough newlines in that bufferfull. */ - if (pos == 0) - { - /* Not enough lines in the file; print the entire file. */ - lseek (fd, (off_t) 0, SEEK_SET); - return 0; + while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0); + if (bytes_read == -1) { + detailed_error(0, errno, "%s", filename); + return 1; } - pos -= BUFSIZ; - lseek (fd, pos, SEEK_SET); - } - while ((bytes_read = fullRead (fd, buffer, BUFSIZ)) > 0); - if (bytes_read == -1) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - return 0; + return 0; } /* Print the last N_LINES lines from the end of the standard input, @@ -612,301 +605,264 @@ file_lines (const char *filename, int fd, long int n_lines, off_t pos) Buffer the text as a linked list of LBUFFERs, adding them as needed. Return 0 if successful, 1 if an error occured. */ -static int -pipe_lines (const char *filename, int fd, long int n_lines) +static int pipe_lines(const char *filename, int fd, long int n_lines) { - struct linebuffer - { - int nbytes, nlines; - char buffer[BUFSIZ]; - struct linebuffer *next; - }; - typedef struct linebuffer LBUFFER; - LBUFFER *first, *last, *tmp; - int i; /* Index into buffers. */ - int total_lines = 0; /* Total number of newlines in all buffers. */ - int errors = 0; - - first = last = (LBUFFER *) xmalloc (sizeof (LBUFFER)); - first->nbytes = first->nlines = 0; - first->next = NULL; - tmp = (LBUFFER *) xmalloc (sizeof (LBUFFER)); - - /* Input is always read into a fresh buffer. */ - while ((tmp->nbytes = fullRead (fd, tmp->buffer, BUFSIZ)) > 0) - { - tmp->nlines = 0; - tmp->next = NULL; - - /* Count the number of newlines just read. */ - for (i = 0; i < tmp->nbytes; i++) - if (tmp->buffer[i] == '\n') - ++tmp->nlines; - total_lines += tmp->nlines; - - /* If there is enough room in the last buffer read, just append the new - one to it. This is because when reading from a pipe, `nbytes' can - often be very small. */ - if (tmp->nbytes + last->nbytes < BUFSIZ) - { - memcpy (&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); - last->nbytes += tmp->nbytes; - last->nlines += tmp->nlines; + struct linebuffer { + int nbytes, nlines; + char buffer[BUFSIZ]; + struct linebuffer *next; + }; + typedef struct linebuffer LBUFFER; + LBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_lines = 0; /* Total number of newlines in all buffers. */ + int errors = 0; + + first = last = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + first->nbytes = first->nlines = 0; + first->next = NULL; + tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = fullRead(fd, tmp->buffer, BUFSIZ)) > 0) { + tmp->nlines = 0; + tmp->next = NULL; + + /* Count the number of newlines just read. */ + for (i = 0; i < tmp->nbytes; i++) + if (tmp->buffer[i] == '\n') + ++tmp->nlines; + total_lines += tmp->nlines; + + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) { + memcpy(&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + last->nlines += tmp->nlines; + } else { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough lines, or else malloc a new one. + Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_lines - first->nlines > n_lines) { + tmp = first; + total_lines -= first->nlines; + first = first->next; + } else + tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + } + } + if (tmp->nbytes == -1) { + detailed_error(0, errno, "%s", filename); + errors = 1; + free((char *) tmp); + goto free_lbuffers; } - else - { - /* If there's not enough room, link the new buffer onto the end of - the list, then either free up the oldest buffer for the next - read if that would leave enough lines, or else malloc a new one. - Some compaction mechanism is possible but probably not - worthwhile. */ - last = last->next = tmp; - if (total_lines - first->nlines > n_lines) - { - tmp = first; - total_lines -= first->nlines; - first = first->next; - } - else - tmp = (LBUFFER *) xmalloc (sizeof (LBUFFER)); + + free((char *) tmp); + + /* This prevents a core dump when the pipe contains no newlines. */ + if (n_lines == 0) + goto free_lbuffers; + + /* Count the incomplete line on files that don't end with a newline. */ + if (last->buffer[last->nbytes - 1] != '\n') { + ++last->nlines; + ++total_lines; + } + + /* Run through the list, printing lines. First, skip over unneeded + buffers. */ + for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) + total_lines -= tmp->nlines; + + /* Find the correct beginning, then print the rest of the file. */ + if (total_lines > n_lines) { + char *cp; + + /* Skip `total_lines' - `n_lines' newlines. We made sure that + `total_lines' - `n_lines' <= `tmp->nlines'. */ + cp = tmp->buffer; + for (i = total_lines - n_lines; i; --i) + while (*cp++ != '\n') + /* Do nothing. */ ; + i = cp - tmp->buffer; + } else + i = 0; + XWRITE(STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE(STDOUT_FILENO, tmp->buffer, tmp->nbytes); + + free_lbuffers: + while (first) { + tmp = first->next; + free((char *) first); + first = tmp; } - } - if (tmp->nbytes == -1) - { - detailed_error (0, errno, "%s", filename); - errors = 1; - free ((char *) tmp); - goto free_lbuffers; - } - - free ((char *) tmp); - - /* This prevents a core dump when the pipe contains no newlines. */ - if (n_lines == 0) - goto free_lbuffers; - - /* Count the incomplete line on files that don't end with a newline. */ - if (last->buffer[last->nbytes - 1] != '\n') - { - ++last->nlines; - ++total_lines; - } - - /* Run through the list, printing lines. First, skip over unneeded - buffers. */ - for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) - total_lines -= tmp->nlines; - - /* Find the correct beginning, then print the rest of the file. */ - if (total_lines > n_lines) - { - char *cp; - - /* Skip `total_lines' - `n_lines' newlines. We made sure that - `total_lines' - `n_lines' <= `tmp->nlines'. */ - cp = tmp->buffer; - for (i = total_lines - n_lines; i; --i) - while (*cp++ != '\n') - /* Do nothing. */ ; - i = cp - tmp->buffer; - } - else - i = 0; - XWRITE (STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); - - for (tmp = tmp->next; tmp; tmp = tmp->next) - XWRITE (STDOUT_FILENO, tmp->buffer, tmp->nbytes); - -free_lbuffers: - while (first) - { - tmp = first->next; - free ((char *) first); - first = tmp; - } - return errors; + return errors; } /* Print the last N_BYTES characters from the end of pipe FD. This is a stripped down version of pipe_lines. Return 0 if successful, 1 if an error occurred. */ -static int -pipe_bytes (const char *filename, int fd, off_t n_bytes) +static int pipe_bytes(const char *filename, int fd, off_t n_bytes) { - struct charbuffer - { - int nbytes; - char buffer[BUFSIZ]; - struct charbuffer *next; - }; - typedef struct charbuffer CBUFFER; - CBUFFER *first, *last, *tmp; - int i; /* Index into buffers. */ - int total_bytes = 0; /* Total characters in all buffers. */ - int errors = 0; - - first = last = (CBUFFER *) xmalloc (sizeof (CBUFFER)); - first->nbytes = 0; - first->next = NULL; - tmp = (CBUFFER *) xmalloc (sizeof (CBUFFER)); - - /* Input is always read into a fresh buffer. */ - while ((tmp->nbytes = fullRead (fd, tmp->buffer, BUFSIZ)) > 0) - { - tmp->next = NULL; - - total_bytes += tmp->nbytes; - /* If there is enough room in the last buffer read, just append the new - one to it. This is because when reading from a pipe, `nbytes' can - often be very small. */ - if (tmp->nbytes + last->nbytes < BUFSIZ) - { - memcpy (&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); - last->nbytes += tmp->nbytes; + struct charbuffer { + int nbytes; + char buffer[BUFSIZ]; + struct charbuffer *next; + }; + typedef struct charbuffer CBUFFER; + CBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_bytes = 0; /* Total characters in all buffers. */ + int errors = 0; + + first = last = (CBUFFER *) xmalloc(sizeof(CBUFFER)); + first->nbytes = 0; + first->next = NULL; + tmp = (CBUFFER *) xmalloc(sizeof(CBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = fullRead(fd, tmp->buffer, BUFSIZ)) > 0) { + tmp->next = NULL; + + total_bytes += tmp->nbytes; + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) { + memcpy(&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + } else { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough characters, or else malloc a new + one. Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_bytes - first->nbytes > n_bytes) { + tmp = first; + total_bytes -= first->nbytes; + first = first->next; + } else { + tmp = (CBUFFER *) xmalloc(sizeof(CBUFFER)); + } + } } - else - { - /* If there's not enough room, link the new buffer onto the end of - the list, then either free up the oldest buffer for the next - read if that would leave enough characters, or else malloc a new - one. Some compaction mechanism is possible but probably not - worthwhile. */ - last = last->next = tmp; - if (total_bytes - first->nbytes > n_bytes) - { - tmp = first; - total_bytes -= first->nbytes; - first = first->next; - } - else - { - tmp = (CBUFFER *) xmalloc (sizeof (CBUFFER)); - } + if (tmp->nbytes == -1) { + detailed_error(0, errno, "%s", filename); + errors = 1; + free((char *) tmp); + goto free_cbuffers; + } + + free((char *) tmp); + + /* Run through the list, printing characters. First, skip over unneeded + buffers. */ + for (tmp = first; total_bytes - tmp->nbytes > n_bytes; tmp = tmp->next) + total_bytes -= tmp->nbytes; + + /* Find the correct beginning, then print the rest of the file. + We made sure that `total_bytes' - `n_bytes' <= `tmp->nbytes'. */ + if (total_bytes > n_bytes) + i = total_bytes - n_bytes; + else + i = 0; + XWRITE(STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE(STDOUT_FILENO, tmp->buffer, tmp->nbytes); + + free_cbuffers: + while (first) { + tmp = first->next; + free((char *) first); + first = tmp; } - } - if (tmp->nbytes == -1) - { - detailed_error (0, errno, "%s", filename); - errors = 1; - free ((char *) tmp); - goto free_cbuffers; - } - - free ((char *) tmp); - - /* Run through the list, printing characters. First, skip over unneeded - buffers. */ - for (tmp = first; total_bytes - tmp->nbytes > n_bytes; tmp = tmp->next) - total_bytes -= tmp->nbytes; - - /* Find the correct beginning, then print the rest of the file. - We made sure that `total_bytes' - `n_bytes' <= `tmp->nbytes'. */ - if (total_bytes > n_bytes) - i = total_bytes - n_bytes; - else - i = 0; - XWRITE (STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); - - for (tmp = tmp->next; tmp; tmp = tmp->next) - XWRITE (STDOUT_FILENO, tmp->buffer, tmp->nbytes); - -free_cbuffers: - while (first) - { - tmp = first->next; - free ((char *) first); - first = tmp; - } - return errors; + return errors; } /* Skip N_BYTES characters from the start of pipe FD, and print any extra characters that were read beyond that. Return 1 on error, 0 if ok. */ -static int -start_bytes (const char *filename, int fd, off_t n_bytes) +static int start_bytes(const char *filename, int fd, off_t n_bytes) { - char buffer[BUFSIZ]; - int bytes_read = 0; - - while (n_bytes > 0 && (bytes_read = fullRead (fd, buffer, BUFSIZ)) > 0) - n_bytes -= bytes_read; - if (bytes_read == -1) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - else if (n_bytes < 0) - XWRITE (STDOUT_FILENO, &buffer[bytes_read + n_bytes], -n_bytes); - return 0; + char buffer[BUFSIZ]; + int bytes_read = 0; + + while (n_bytes > 0 && (bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) + n_bytes -= bytes_read; + if (bytes_read == -1) { + detailed_error(0, errno, "%s", filename); + return 1; + } else if (n_bytes < 0) + XWRITE(STDOUT_FILENO, &buffer[bytes_read + n_bytes], -n_bytes); + return 0; } /* Skip N_LINES lines at the start of file or pipe FD, and print any extra characters that were read beyond that. Return 1 on error, 0 if ok. */ -static int -start_lines (const char *filename, int fd, long int n_lines) +static int start_lines(const char *filename, int fd, long int n_lines) { - char buffer[BUFSIZ]; - int bytes_read = 0; - int bytes_to_skip = 0; - - while (n_lines && (bytes_read = fullRead (fd, buffer, BUFSIZ)) > 0) - { - bytes_to_skip = 0; - while (bytes_to_skip < bytes_read) - if (buffer[bytes_to_skip++] == '\n' && --n_lines == 0) - break; - } - if (bytes_read == -1) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - else if (bytes_to_skip < bytes_read) - { - XWRITE (STDOUT_FILENO, &buffer[bytes_to_skip], - bytes_read - bytes_to_skip); - } - return 0; + char buffer[BUFSIZ]; + int bytes_read = 0; + int bytes_to_skip = 0; + + while (n_lines && (bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) { + bytes_to_skip = 0; + while (bytes_to_skip < bytes_read) + if (buffer[bytes_to_skip++] == '\n' && --n_lines == 0) + break; + } + if (bytes_read == -1) { + detailed_error(0, errno, "%s", filename); + return 1; + } else if (bytes_to_skip < bytes_read) { + XWRITE(STDOUT_FILENO, &buffer[bytes_to_skip], + bytes_read - bytes_to_skip); + } + return 0; } /* Display file FILENAME from the current position in FD to the end. If `forever' is nonzero, keep reading from the end of the file until killed. Return the number of bytes read from the file. */ -static long -dump_remainder (const char *filename, int fd) +static long dump_remainder(const char *filename, int fd) { - char buffer[BUFSIZ]; - int bytes_read; - long total; - - total = 0; -output: - while ((bytes_read = fullRead (fd, buffer, BUFSIZ)) > 0) - { - XWRITE (STDOUT_FILENO, buffer, bytes_read); - total += bytes_read; - } - if (bytes_read == -1) - detailed_error (EXIT_FAILURE, errno, "%s", filename); - if (forever) - { - fflush (stdout); - sleep (1); - goto output; - } - else - { - if (forever_multiple) - fflush (stdout); - } - - return total; + char buffer[BUFSIZ]; + int bytes_read; + long total; + + total = 0; + output: + while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) { + XWRITE(STDOUT_FILENO, buffer, bytes_read); + total += bytes_read; + } + if (bytes_read == -1) + detailed_error(EXIT_FAILURE, errno, "%s", filename); + if (forever) { + fflush(stdout); + sleep(1); + goto output; + } else { + if (forever_multiple) + fflush(stdout); + } + + return total; } /* Tail NFILES (>1) files forever until killed. The file names are in @@ -916,186 +872,161 @@ output: none of them have changed size in one iteration, we sleep for a second and try again. We do this until the user interrupts us. */ -static void -tail_forever (char **names, int nfiles) +static void tail_forever(char **names, int nfiles) { - int last; - - last = -1; - - while (1) - { - int i; - int changed; - - changed = 0; - for (i = 0; i < nfiles; i++) - { - struct stat stats; - - if (file_descs[i] < 0) - continue; - if (fstat (file_descs[i], &stats) < 0) - { - detailed_error (0, errno, "%s", names[i]); - file_descs[i] = -1; - continue; - } - if (stats.st_size == file_sizes[i]) - continue; - - /* This file has changed size. Print out what we can, and - then keep looping. */ - - changed = 1; - - if (stats.st_size < file_sizes[i]) - { - write_header (names[i], "file truncated"); - last = i; - lseek (file_descs[i], stats.st_size, SEEK_SET); - file_sizes[i] = stats.st_size; - continue; - } - - if (i != last) - { - if (print_headers) - write_header (names[i], NULL); - last = i; - } - file_sizes[i] += dump_remainder (names[i], file_descs[i]); - } + int last; + + last = -1; + + while (1) { + int i; + int changed; + + changed = 0; + for (i = 0; i < nfiles; i++) { + struct stat stats; + + if (file_descs[i] < 0) + continue; + if (fstat(file_descs[i], &stats) < 0) { + detailed_error(0, errno, "%s", names[i]); + file_descs[i] = -1; + continue; + } + if (stats.st_size == file_sizes[i]) + continue; + + /* This file has changed size. Print out what we can, and + then keep looping. */ + + changed = 1; + + if (stats.st_size < file_sizes[i]) { + write_header(names[i], "file truncated"); + last = i; + lseek(file_descs[i], stats.st_size, SEEK_SET); + file_sizes[i] = stats.st_size; + continue; + } + + if (i != last) { + if (print_headers) + write_header(names[i], NULL); + last = i; + } + file_sizes[i] += dump_remainder(names[i], file_descs[i]); + } - /* If none of the files changed size, sleep. */ - if (! changed) - sleep (1); - } + /* If none of the files changed size, sleep. */ + if (!changed) + sleep(1); + } } /* Output the last N_BYTES bytes of file FILENAME open for reading in FD. Return 0 if successful, 1 if an error occurred. */ -static int -tail_bytes (const char *filename, int fd, off_t n_bytes) +static int tail_bytes(const char *filename, int fd, off_t n_bytes) { - struct stat stats; - - /* FIXME: resolve this like in dd.c. */ - /* Use fstat instead of checking for errno == ESPIPE because - lseek doesn't work on some special files but doesn't return an - error, either. */ - if (fstat (fd, &stats)) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - - if (from_start) - { - if (S_ISREG (stats.st_mode)) - lseek (fd, n_bytes, SEEK_CUR); - else if (start_bytes (filename, fd, n_bytes)) - return 1; - dump_remainder (filename, fd); - } - else - { - if (S_ISREG (stats.st_mode)) - { - off_t current_pos, end_pos; - size_t bytes_remaining; - - if ((current_pos = lseek (fd, (off_t) 0, SEEK_CUR)) != -1 - && (end_pos = lseek (fd, (off_t) 0, SEEK_END)) != -1) - { - off_t diff; - /* Be careful here. The current position may actually be - beyond the end of the file. */ - bytes_remaining = (diff = end_pos - current_pos) < 0 ? 0 : diff; - } - else - { - detailed_error (0, errno, "%s", filename); - return 1; - } - - if (bytes_remaining <= n_bytes) - { - /* From the current position to end of file, there are no - more bytes than have been requested. So reposition the - file pointer to the incoming current position and print - everything after that. */ - lseek (fd, current_pos, SEEK_SET); - } - else - { - /* There are more bytes remaining than were requested. - Back up. */ - lseek (fd, -n_bytes, SEEK_END); - } - dump_remainder (filename, fd); + struct stat stats; + + /* FIXME: resolve this like in dd.c. */ + /* Use fstat instead of checking for errno == ESPIPE because + lseek doesn't work on some special files but doesn't return an + error, either. */ + if (fstat(fd, &stats)) { + detailed_error(0, errno, "%s", filename); + return 1; + } + + if (from_start) { + if (S_ISREG(stats.st_mode)) + lseek(fd, n_bytes, SEEK_CUR); + else if (start_bytes(filename, fd, n_bytes)) + return 1; + dump_remainder(filename, fd); + } else { + if (S_ISREG(stats.st_mode)) { + off_t current_pos, end_pos; + size_t bytes_remaining; + + if ((current_pos = lseek(fd, (off_t) 0, SEEK_CUR)) != -1 + && (end_pos = lseek(fd, (off_t) 0, SEEK_END)) != -1) { + off_t diff; + + /* Be careful here. The current position may actually be + beyond the end of the file. */ + bytes_remaining = (diff = + end_pos - current_pos) < 0 ? 0 : diff; + } else { + detailed_error(0, errno, "%s", filename); + return 1; + } + + if (bytes_remaining <= n_bytes) { + /* From the current position to end of file, there are no + more bytes than have been requested. So reposition the + file pointer to the incoming current position and print + everything after that. */ + lseek(fd, current_pos, SEEK_SET); + } else { + /* There are more bytes remaining than were requested. + Back up. */ + lseek(fd, -n_bytes, SEEK_END); + } + dump_remainder(filename, fd); + } else + return pipe_bytes(filename, fd, n_bytes); } - else - return pipe_bytes (filename, fd, n_bytes); - } - return 0; + return 0; } /* Output the last N_LINES lines of file FILENAME open for reading in FD. Return 0 if successful, 1 if an error occurred. */ -static int -tail_lines (const char *filename, int fd, long int n_lines) +static int tail_lines(const char *filename, int fd, long int n_lines) { - struct stat stats; - off_t length; - - if (fstat (fd, &stats)) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - - if (from_start) - { - if (start_lines (filename, fd, n_lines)) - return 1; - dump_remainder (filename, fd); - } - else - { - /* Use file_lines only if FD refers to a regular file with - its file pointer positioned at beginning of file. */ - /* FIXME: adding the lseek conjunct is a kludge. - Once there's a reasonable test suite, fix the true culprit: - file_lines. file_lines shouldn't presume that the input - file pointer is initially positioned to beginning of file. */ - if (S_ISREG (stats.st_mode) - && lseek (fd, (off_t) 0, SEEK_CUR) == (off_t) 0) - { - length = lseek (fd, (off_t) 0, SEEK_END); - if (length != 0 && file_lines (filename, fd, n_lines, length)) - return 1; - dump_remainder (filename, fd); + struct stat stats; + off_t length; + + if (fstat(fd, &stats)) { + detailed_error(0, errno, "%s", filename); + return 1; + } + + if (from_start) { + if (start_lines(filename, fd, n_lines)) + return 1; + dump_remainder(filename, fd); + } else { + /* Use file_lines only if FD refers to a regular file with + its file pointer positioned at beginning of file. */ + /* FIXME: adding the lseek conjunct is a kludge. + Once there's a reasonable test suite, fix the true culprit: + file_lines. file_lines shouldn't presume that the input + file pointer is initially positioned to beginning of file. */ + if (S_ISREG(stats.st_mode) + && lseek(fd, (off_t) 0, SEEK_CUR) == (off_t) 0) { + length = lseek(fd, (off_t) 0, SEEK_END); + if (length != 0 && file_lines(filename, fd, n_lines, length)) + return 1; + dump_remainder(filename, fd); + } else + return pipe_lines(filename, fd, n_lines); } - else - return pipe_lines (filename, fd, n_lines); - } - return 0; + return 0; } /* Display the last N_UNITS units of file FILENAME, open for reading in FD. Return 0 if successful, 1 if an error occurred. */ -static int -tail (const char *filename, int fd, off_t n_units) +static int tail(const char *filename, int fd, off_t n_units) { - if (count_lines) - return tail_lines (filename, fd, (long) n_units); - else - return tail_bytes (filename, fd, n_units); + if (count_lines) + return tail_lines(filename, fd, (long) n_units); + else + return tail_bytes(filename, fd, n_units); } /* Display the last N_UNITS units of file FILENAME. @@ -1103,207 +1034,183 @@ tail (const char *filename, int fd, off_t n_units) FILENUM is this file's index in the list of files the user gave. Return 0 if successful, 1 if an error occurred. */ -static int -tail_file (const char *filename, off_t n_units, int filenum) +static int tail_file(const char *filename, off_t n_units, int filenum) { - int fd, errors; - struct stat stats; - - if (!strcmp (filename, "-")) - { - have_read_stdin = 1; - filename = "standard input"; - if (print_headers) - write_header (filename, NULL); - errors = tail (filename, 0, n_units); - if (forever_multiple) - { - if (fstat (0, &stats) < 0) - { - detailed_error (0, errno, "standard input"); - errors = 1; - } - else if (!S_ISREG (stats.st_mode)) - { - detailed_error (0, 0, - "standard input: cannot follow end of non-regular file"); - errors = 1; - } - if (errors) - file_descs[filenum] = -1; - else - { - file_descs[filenum] = 0; - file_sizes[filenum] = stats.st_size; - } - } - } - else - { - /* Not standard input. */ - fd = open (filename, O_RDONLY); - if (fd == -1) - { - if (forever_multiple) - file_descs[filenum] = -1; - detailed_error (0, errno, "%s", filename); - errors = 1; - } - else - { - if (print_headers) - write_header (filename, NULL); - errors = tail (filename, fd, n_units); - if (forever_multiple) - { - if (fstat (fd, &stats) < 0) - { - detailed_error (0, errno, "%s", filename); - errors = 1; - } - else if (!S_ISREG (stats.st_mode)) - { - detailed_error (0, 0, "%s: cannot follow end of non-regular file", - filename); - errors = 1; - } - if (errors) - { - close (fd); - file_descs[filenum] = -1; - } - else - { - file_descs[filenum] = fd; - file_sizes[filenum] = stats.st_size; + int fd, errors; + struct stat stats; + + if (!strcmp(filename, "-")) { + have_read_stdin = 1; + filename = "standard input"; + if (print_headers) + write_header(filename, NULL); + errors = tail(filename, 0, n_units); + if (forever_multiple) { + if (fstat(0, &stats) < 0) { + detailed_error(0, errno, "standard input"); + errors = 1; + } else if (!S_ISREG(stats.st_mode)) { + detailed_error(0, 0, + "standard input: cannot follow end of non-regular file"); + errors = 1; + } + if (errors) + file_descs[filenum] = -1; + else { + file_descs[filenum] = 0; + file_sizes[filenum] = stats.st_size; + } } - } - else - { - if (close (fd)) - { - detailed_error (0, errno, "%s", filename); - errors = 1; + } else { + /* Not standard input. */ + fd = open(filename, O_RDONLY); + if (fd == -1) { + if (forever_multiple) + file_descs[filenum] = -1; + detailed_error(0, errno, "%s", filename); + errors = 1; + } else { + if (print_headers) + write_header(filename, NULL); + errors = tail(filename, fd, n_units); + if (forever_multiple) { + if (fstat(fd, &stats) < 0) { + detailed_error(0, errno, "%s", filename); + errors = 1; + } else if (!S_ISREG(stats.st_mode)) { + detailed_error(0, 0, + "%s: cannot follow end of non-regular file", + filename); + errors = 1; + } + if (errors) { + close(fd); + file_descs[filenum] = -1; + } else { + file_descs[filenum] = fd; + file_sizes[filenum] = stats.st_size; + } + } else { + if (close(fd)) { + detailed_error(0, errno, "%s", filename); + errors = 1; + } + } } - } } - } - return errors; + return errors; } -extern int -tail_main (int argc, char **argv) +extern int tail_main(int argc, char **argv) { - int stopit = 0; - enum header_mode header_mode = multiple_files; - int exit_status = 0; - /* If from_start, the number of items to skip before printing; otherwise, - the number of items at the end of the file to print. Initially, -1 - means the value has not been set. */ - off_t n_units = -1; - int n_files; - char **file; - - program_name = argv[0]; - have_read_stdin = 0; - count_lines = 1; - forever = forever_multiple = from_start = print_headers = 0; - - /* Parse any options */ - //fprintf(stderr, "argc=%d, argv=%s\n", argc, *argv); - while (--argc > 0 && ( **(++argv) == '-' || **argv == '+' )) { - if (**argv == '+') { - from_start = 1; + int stopit = 0; + enum header_mode header_mode = multiple_files; + int exit_status = 0; + + /* If from_start, the number of items to skip before printing; otherwise, + the number of items at the end of the file to print. Initially, -1 + means the value has not been set. */ + off_t n_units = -1; + int n_files; + char **file; + + program_name = argv[0]; + have_read_stdin = 0; + count_lines = 1; + forever = forever_multiple = from_start = print_headers = 0; + + /* Parse any options */ + //fprintf(stderr, "argc=%d, argv=%s\n", argc, *argv); + while (--argc > 0 && (**(++argv) == '-' || **argv == '+')) { + if (**argv == '+') { + from_start = 1; + } + stopit = 0; + while (stopit == 0 && *(++(*argv))) { + switch (**argv) { + case 'c': + count_lines = 0; + + if (--argc < 1) { + usage(tail_usage); + } + n_units = getNum(*(++argv)); + stopit = 1; + break; + + case 'f': + forever = 1; + break; + + case 'n': + count_lines = 1; + + if (--argc < 1) { + usage(tail_usage); + } + n_units = atol(*(++argv)); + stopit = 1; + break; + + case 'q': + header_mode = never; + break; + + case 'v': + header_mode = always; + break; + + default: + usage(tail_usage); + } + } + } + + + if (n_units == -1) + n_units = DEFAULT_N_LINES; + + /* To start printing with item N_UNITS from the start of the file, skip + N_UNITS - 1 items. `tail +0' is actually meaningless, but for Unix + compatibility it's treated the same as `tail +1'. */ + if (from_start) { + if (n_units) + --n_units; } - stopit = 0; - while (stopit == 0 && *(++(*argv))) { - switch (**argv) { - case 'c': - count_lines = 0; - - if (--argc < 1) { - usage(tail_usage); - } - n_units = getNum(*(++argv)); - stopit = 1; - break; - - case 'f': - forever = 1; - break; - - case 'n': - count_lines = 1; - - if (--argc < 1) { - usage(tail_usage); - } - n_units = atol(*(++argv)); - stopit = 1; - break; - - case 'q': - header_mode = never; - break; - - case 'v': - header_mode = always; - break; - - default: - usage (tail_usage); - } + + n_files = argc; + file = argv; + + if (n_files > 1 && forever) { + forever_multiple = 1; + forever = 0; + file_descs = (int *) xmalloc(n_files * sizeof(int)); + + file_sizes = (off_t *) xmalloc(n_files * sizeof(off_t)); } - } - - - if (n_units == -1) - n_units = DEFAULT_N_LINES; - - /* To start printing with item N_UNITS from the start of the file, skip - N_UNITS - 1 items. `tail +0' is actually meaningless, but for Unix - compatibility it's treated the same as `tail +1'. */ - if (from_start) - { - if (n_units) - --n_units; - } - - n_files = argc; - file = argv; - - if (n_files > 1 && forever) - { - forever_multiple = 1; - forever = 0; - file_descs = (int *) xmalloc (n_files * sizeof (int)); - file_sizes = (off_t *) xmalloc (n_files * sizeof (off_t)); - } - - if (header_mode == always - || (header_mode == multiple_files && n_files > 1)) - print_headers = 1; - - if (n_files == 0) - { - exit_status |= tail_file ("-", n_units, 0); - } - else - { - int i; - for (i = 0; i < n_files; i++) - exit_status |= tail_file (file[i], n_units, i); - - if (forever_multiple) - tail_forever (file, n_files); - } - - if (have_read_stdin && close (0) < 0) - detailed_error (EXIT_FAILURE, errno, "-"); - if (fclose (stdout) == EOF) - detailed_error (EXIT_FAILURE, errno, "write error"); - exit (exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); + + if (header_mode == always + || (header_mode == multiple_files && n_files > 1)) + print_headers = 1; + + if (n_files == 0) { + exit_status |= tail_file("-", n_units, 0); + } else { + int i; + + for (i = 0; i < n_files; i++) + exit_status |= tail_file(file[i], n_units, i); + + if (forever_multiple) + tail_forever(file, n_files); + } + + if (have_read_stdin && close(0) < 0) + detailed_error(EXIT_FAILURE, errno, "-"); + if (fclose(stdout) == EOF) + detailed_error(EXIT_FAILURE, errno, "write error"); + exit(exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); } diff --git a/coreutils/tee.c b/coreutils/tee.c index 4c5c691c6..2f746f96d 100644 --- a/coreutils/tee.c +++ b/coreutils/tee.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini tee implementation for busybox * @@ -25,102 +26,100 @@ #include <stdio.h> static const char tee_usage[] = - "tee [OPTION]... [FILE]...\n\n" - "Copy standard input to each FILE, and also to standard output.\n\n" - "Options:\n" - "\t-a\tappend to the given FILEs, do not overwrite\n" + "tee [OPTION]... [FILE]...\n\n" + "Copy standard input to each FILE, and also to standard output.\n\n" + "Options:\n" "\t-a\tappend to the given FILEs, do not overwrite\n" #if 0 - "\t-i\tignore interrupt signals\n" + "\t-i\tignore interrupt signals\n" #endif - ; +; /* FileList _______________________________________________________________ */ #define FL_MAX 1024 static FILE *FileList[FL_MAX]; -static int FL_end; +static int FL_end; + +typedef void (FL_Function) (FILE * file, char c); -typedef void (FL_Function)(FILE *file, char c); - /* apply a function to everything in FileList */ -static void -FL_apply(FL_Function *f, char c) +static void FL_apply(FL_Function * f, char c) { - int i; - for (i = 0; i <= FL_end; i++) { - f(FileList[i], c); - } + int i; + + for (i = 0; i <= FL_end; i++) { + f(FileList[i], c); + } } /* FL_Function for writing to files*/ -static void -tee_fwrite(FILE *file, char c) +static void tee_fwrite(FILE * file, char c) { - fputc(c, file); + fputc(c, file); } /* FL_Function for closing files */ -static void -tee_fclose(FILE *file, char c) +static void tee_fclose(FILE * file, char c) { - fclose(file); + fclose(file); } /* ________________________________________________________________________ */ /* BusyBoxed tee(1) */ -int -tee_main(int argc, char **argv) +int tee_main(int argc, char **argv) { - int i; - char c; - char opt; - char opt_fopen[2] = "w"; - FILE *file; - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'a': - opt_fopen[0] = 'a'; - break; + int i; + char c; + char opt; + char opt_fopen[2] = "w"; + FILE *file; + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 'a': + opt_fopen[0] = 'a'; + break; #if 0 - case 'i': - fprintf(stderr, "ignore interrupt not implemented\n"); - break; + case 'i': + fprintf(stderr, "ignore interrupt not implemented\n"); + break; #endif - default: - usage(tee_usage); - } - } else { - break; + default: + usage(tee_usage); + } + } else { + break; + } } - } - - /* init FILE pointers */ - FL_end = 0; - FileList[0] = stdout; - for ( ; i < argc; i++) { - /* add a file to FileList */ - file = fopen(argv[i], opt_fopen); - if (!file) { continue; } - if (FL_end < FL_MAX) { - FileList[++FL_end] = file; + + /* init FILE pointers */ + FL_end = 0; + FileList[0] = stdout; + for (; i < argc; i++) { + /* add a file to FileList */ + file = fopen(argv[i], opt_fopen); + if (!file) { + continue; + } + if (FL_end < FL_MAX) { + FileList[++FL_end] = file; + } } - } - /* read and redirect */ - while ((c = (char) getchar()) && (!feof(stdin))) { - FL_apply(tee_fwrite, c); - } + /* read and redirect */ + while ((c = (char) getchar()) && (!feof(stdin))) { + FL_apply(tee_fwrite, c); + } - /* clean up */ - FL_apply(tee_fclose, 0); - exit(0); + /* clean up */ + FL_apply(tee_fclose, 0); + exit(0); } -/* $Id: tee.c,v 1.5 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: tee.c,v 1.6 2000/02/08 19:58:47 erik Exp $ */ diff --git a/coreutils/touch.c b/coreutils/touch.c index d2d3e9484..a0f21acdd 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini touch implementation for busybox * @@ -31,56 +32,50 @@ static const char touch_usage[] = "touch [-c] file [file ...]\n\n" -"Update the last-modified date on the given file[s].\n"; + "Update the last-modified date on the given file[s].\n"; -extern int -touch_main(int argc, char **argv) -{ - int fd; - int create=TRUE; - if (argc < 2) { - usage( touch_usage); - } - argc--; - argv++; +extern int touch_main(int argc, char **argv) +{ + int fd; + int create = TRUE; - /* Parse options */ - while (**argv == '-') { - while (*++(*argv)) switch (**argv) { - case 'c': - create = FALSE; - break; - default: - usage( touch_usage); - exit( FALSE); + if (argc < 2) { + usage(touch_usage); } argc--; argv++; - } - fd = open (*argv, (create==FALSE)? O_RDWR : O_RDWR | O_CREAT, 0644); - if (fd < 0 ) { - if (create==FALSE && errno == ENOENT) - exit( TRUE); - else { - perror("touch"); - exit( FALSE); + /* Parse options */ + while (**argv == '-') { + while (*++(*argv)) + switch (**argv) { + case 'c': + create = FALSE; + break; + default: + usage(touch_usage); + exit(FALSE); + } + argc--; + argv++; } - } - close( fd); - if (utime (*argv, NULL)) { - perror("touch"); - exit( FALSE); - } - else - exit( TRUE); -} - - - - - + fd = open(*argv, (create == FALSE) ? O_RDWR : O_RDWR | O_CREAT, 0644); + if (fd < 0) { + if (create == FALSE && errno == ENOENT) + exit(TRUE); + else { + perror("touch"); + exit(FALSE); + } + } + close(fd); + if (utime(*argv, NULL)) { + perror("touch"); + exit(FALSE); + } else + exit(TRUE); +} diff --git a/coreutils/tty.c b/coreutils/tty.c index 83abaffb5..8ac1c1fcd 100644 --- a/coreutils/tty.c +++ b/coreutils/tty.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini tty implementation for busybox * @@ -24,19 +25,23 @@ #include <sys/types.h> static const char tty_usage[] = "tty\n\n" -"Print the file name of the terminal connected to standard input.\n" -"\t-s\tprint nothing, only return an exit status\n"; + "Print the file name of the terminal connected to standard input.\n" -extern int tty_main(int argc, char **argv) { + "\t-s\tprint nothing, only return an exit status\n"; + +extern int tty_main(int argc, char **argv) +{ char *tty; if (argc > 1) { - if (argv[1][0] != '-' || argv[1][1] != 's') usage (tty_usage); - } - else { - tty = ttyname (0); - if (tty) puts (tty); - else puts ("not a tty"); + if (argv[1][0] != '-' || argv[1][1] != 's') + usage(tty_usage); + } else { + tty = ttyname(0); + if (tty) + puts(tty); + else + puts("not a tty"); } - exit (isatty (0) ? TRUE : FALSE); + exit(isatty(0) ? TRUE : FALSE); } diff --git a/coreutils/uname.c b/coreutils/uname.c index 9083edb04..9a1cb808a 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* uname -- print system information Copyright (C) 1989-1999 Free Software Foundation, Inc. @@ -41,16 +42,17 @@ static const char uname_usage[] = - "uname [OPTION]...\n\n" - "Print certain system information. With no OPTION, same as -s.\n\n" - "Options:\n" - "\t-a\tprint all information\n" - "\t-m\tthe machine (hardware) type\n" - "\t-n\tprint the machine's network node hostname\n" - "\t-r\tprint the operating system release\n" - "\t-s\tprint the operating system name\n" - "\t-p\tprint the host processor type\n" - "\t-v\tprint the operating system version\n"; + "uname [OPTION]...\n\n" + "Print certain system information. With no OPTION, same as -s.\n\n" + "Options:\n" + "\t-a\tprint all information\n" + "\t-m\tthe machine (hardware) type\n" + "\t-n\tprint the machine's network node hostname\n" + "\t-r\tprint the operating system release\n" + "\t-s\tprint the operating system name\n" + + "\t-p\tprint the host processor type\n" + "\t-v\tprint the operating system version\n"; static void print_element(unsigned int mask, char *element); @@ -80,77 +82,78 @@ static unsigned char toprint; int uname_main(int argc, char **argv) { - struct utsname name; - char processor[256]; + struct utsname name; + char processor[256]; + #if defined(__sparc__) && defined(__linux__) - char *fake_sparc = getenv("FAKE_SPARC"); + char *fake_sparc = getenv("FAKE_SPARC"); #endif - toprint = 0; - - /* Parse any options */ - //fprintf(stderr, "argc=%d, argv=%s\n", argc, *argv); - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 's': - toprint |= PRINT_SYSNAME; - break; - case 'n': - toprint |= PRINT_NODENAME; - break; - case 'r': - toprint |= PRINT_RELEASE; - break; - case 'v': - toprint |= PRINT_VERSION; - break; - case 'm': - toprint |= PRINT_MACHINE; - break; - case 'p': - toprint |= PRINT_PROCESSOR; - break; - case 'a': - toprint = (PRINT_SYSNAME | PRINT_NODENAME | PRINT_RELEASE | - PRINT_PROCESSOR | PRINT_VERSION | - PRINT_MACHINE); - break; - default: - usage(uname_usage); - } + toprint = 0; + + /* Parse any options */ + //fprintf(stderr, "argc=%d, argv=%s\n", argc, *argv); + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 's': + toprint |= PRINT_SYSNAME; + break; + case 'n': + toprint |= PRINT_NODENAME; + break; + case 'r': + toprint |= PRINT_RELEASE; + break; + case 'v': + toprint |= PRINT_VERSION; + break; + case 'm': + toprint |= PRINT_MACHINE; + break; + case 'p': + toprint |= PRINT_PROCESSOR; + break; + case 'a': + toprint = (PRINT_SYSNAME | PRINT_NODENAME | PRINT_RELEASE | + PRINT_PROCESSOR | PRINT_VERSION | + PRINT_MACHINE); + break; + default: + usage(uname_usage); + } + } } - } - if (toprint == 0) - toprint = PRINT_SYSNAME; + if (toprint == 0) + toprint = PRINT_SYSNAME; - if (uname(&name) == -1) - perror("cannot get system name"); + if (uname(&name) == -1) + perror("cannot get system name"); #if defined (HAVE_SYSINFO) && defined (SI_ARCHITECTURE) - if (sysinfo(SI_ARCHITECTURE, processor, sizeof(processor)) == -1) - perror("cannot get processor type"); + if (sysinfo(SI_ARCHITECTURE, processor, sizeof(processor)) == -1) + perror("cannot get processor type"); } #else - strcpy(processor, "unknown"); + strcpy(processor, "unknown"); #endif #if defined(__sparc__) && defined(__linux__) - if (fake_sparc != NULL - && (fake_sparc[0] == 'y' - || fake_sparc[0] == 'Y')) strcpy(name.machine, "sparc"); + if (fake_sparc != NULL + && (fake_sparc[0] == 'y' + || fake_sparc[0] == 'Y')) strcpy(name.machine, "sparc"); #endif - print_element(PRINT_SYSNAME, name.sysname); - print_element(PRINT_NODENAME, name.nodename); - print_element(PRINT_RELEASE, name.release); - print_element(PRINT_VERSION, name.version); - print_element(PRINT_MACHINE, name.machine); - print_element(PRINT_PROCESSOR, processor); + print_element(PRINT_SYSNAME, name.sysname); + print_element(PRINT_NODENAME, name.nodename); + print_element(PRINT_RELEASE, name.release); + print_element(PRINT_VERSION, name.version); + print_element(PRINT_MACHINE, name.machine); + print_element(PRINT_PROCESSOR, processor); - exit(TRUE); + exit(TRUE); } /* If the name element set in MASK is selected for printing in `toprint', @@ -159,8 +162,8 @@ int uname_main(int argc, char **argv) static void print_element(unsigned int mask, char *element) { - if (toprint & mask) { - toprint &= ~mask; - printf("%s%c", element, toprint ? ' ' : '\n'); - } + if (toprint & mask) { + toprint &= ~mask; + printf("%s%c", element, toprint ? ' ' : '\n'); + } } diff --git a/coreutils/uniq.c b/coreutils/uniq.c index 965d290c2..1e41eaacd 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini uniq implementation for busybox * @@ -27,119 +28,116 @@ #include <errno.h> static const char uniq_usage[] = -"uniq [OPTION]... [INPUT [OUTPUT]]\n" -"Discard all but one of successive identical lines from INPUT (or\n" -"standard input), writing to OUTPUT (or standard output).\n" -"\n" -"\t-h\tdisplay this help and exit\n" -"\n" -"A field is a run of whitespace, then non-whitespace characters.\n" -"Fields are skipped before chars.\n" -; + "uniq [OPTION]... [INPUT [OUTPUT]]\n" + "Discard all but one of successive identical lines from INPUT (or\n" + "standard input), writing to OUTPUT (or standard output).\n" + "\n" + "\t-h\tdisplay this help and exit\n" + + "\n" + "A field is a run of whitespace, then non-whitespace characters.\n" + "Fields are skipped before chars.\n"; /* max chars in line */ #define UNIQ_MAX 4096 -typedef void (Print)(FILE *, const char *); +typedef void (Print) (FILE *, const char *); -typedef int (Decide)(const char *, const char *); +typedef int (Decide) (const char *, const char *); /* container for two lines to be compared */ typedef struct { - char *a; - char *b; - int recurrence; - FILE *in; - FILE *out; - void *func; + char *a; + char *b; + int recurrence; + FILE *in; + FILE *out; + void *func; } Subject; /* set up all the variables of a uniq operation */ -static Subject * -subject_init(Subject *self, FILE *in, FILE *out, void *func) +static Subject *subject_init(Subject * self, FILE * in, FILE * out, + void *func) { - self->a = NULL; - self->b = NULL; - self->in = in; - self->out = out; - self->func = func; - self->recurrence = 0; - return self; + self->a = NULL; + self->b = NULL; + self->in = in; + self->out = out; + self->func = func; + self->recurrence = 0; + return self; } /* point a and b to the appropriate lines; * count the recurrences (if any) of a string; */ -static Subject * -subject_next(Subject *self) +static Subject *subject_next(Subject * self) { - /* tmp line holders */ - static char line[2][UNIQ_MAX]; - static int alternator = 0; - - if (fgets(line[alternator], UNIQ_MAX, self->in)) { - self->a = self->b; - self->b = line[alternator]; - alternator ^= 1; - return self; - } + /* tmp line holders */ + static char line[2][UNIQ_MAX]; + static int alternator = 0; + + if (fgets(line[alternator], UNIQ_MAX, self->in)) { + self->a = self->b; + self->b = line[alternator]; + alternator ^= 1; + return self; + } - return NULL; + return NULL; } -static Subject * -subject_last(Subject *self) +static Subject *subject_last(Subject * self) { - self->a = self->b; - self->b = NULL; - return self; + self->a = self->b; + self->b = NULL; + return self; } -static Subject * -subject_study(Subject *self) +static Subject *subject_study(Subject * self) { - if (self->a == NULL) { - return self; - } - if (self->b == NULL) { - fprintf(self->out, "%s", self->a); + if (self->a == NULL) { + return self; + } + if (self->b == NULL) { + fprintf(self->out, "%s", self->a); + return self; + } + if (strcmp(self->a, self->b) == 0) { + self->recurrence++; + } else { + fprintf(self->out, "%s", self->a); + self->recurrence = 0; + } return self; - } - if (strcmp(self->a, self->b) == 0) { - self->recurrence++; - } else { - fprintf(self->out, "%s", self->a); - self->recurrence = 0; - } - return self; } static int -set_file_pointers(int schema, FILE **in, FILE **out, char **argv) +set_file_pointers(int schema, FILE ** in, FILE ** out, char **argv) { - switch (schema) { + switch (schema) { case 0: - *in = stdin; - *out = stdout; - break; + *in = stdin; + *out = stdout; + break; case 1: - *in = fopen(argv[0], "r"); - *out = stdout; - break; + *in = fopen(argv[0], "r"); + *out = stdout; + break; case 2: - *in = fopen(argv[0], "r"); - *out = fopen(argv[1], "w"); - break; - } - if (*in == NULL) { - fprintf(stderr, "uniq: %s: %s\n", argv[0], strerror(errno)); - return errno; - } - if (*out == NULL) { - fprintf(stderr, "uniq: %s: %s\n", argv[1], strerror(errno)); - return errno; - } - return 0; + *in = fopen(argv[0], "r"); + *out = fopen(argv[1], "w"); + break; + } + if (*in == NULL) { + fprintf(stderr, "uniq: %s: %s\n", argv[0], strerror(errno)); + return errno; + } + if (*out == NULL) { + fprintf(stderr, "uniq: %s: %s\n", argv[1], strerror(errno)); + return errno; + } + return 0; } @@ -152,45 +150,44 @@ set_file_pointers(int schema, FILE **in, FILE **out, char **argv) /* it seems like GNU/uniq only takes one or two files as an option */ /* ________________________________________________________________________ */ -int -uniq_main(int argc, char **argv) +int uniq_main(int argc, char **argv) { - int i; - char opt; - FILE *in, *out; - Subject s; - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case '-': - case 'h': - usage(uniq_usage); - default: - usage(uniq_usage); - } - } else { - break; + int i; + char opt; + FILE *in, *out; + Subject s; + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case '-': + case 'h': + usage(uniq_usage); + default: + usage(uniq_usage); + } + } else { + break; + } } - } - /* 0 src: stdin; dst: stdout */ - /* 1 src: file; dst: stdout */ - /* 2 src: file; dst: file */ - if (set_file_pointers((argc - 1), &in, &out, &argv[i])) { - exit(1); - } + /* 0 src: stdin; dst: stdout */ + /* 1 src: file; dst: stdout */ + /* 2 src: file; dst: file */ + if (set_file_pointers((argc - 1), &in, &out, &argv[i])) { + exit(1); + } - subject_init(&s, in, out, NULL); - while (subject_next(&s)) { + subject_init(&s, in, out, NULL); + while (subject_next(&s)) { + subject_study(&s); + } + subject_last(&s); subject_study(&s); - } - subject_last(&s); - subject_study(&s); - exit(0); + exit(0); } -/* $Id: uniq.c,v 1.6 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: uniq.c,v 1.7 2000/02/08 19:58:47 erik Exp $ */ diff --git a/coreutils/wc.c b/coreutils/wc.c index e69f0d899..8004e6294 100644 --- a/coreutils/wc.c +++ b/coreutils/wc.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini wc implementation for busybox * @@ -23,78 +24,82 @@ #include <stdio.h> static const char wc_usage[] = "wc [OPTION]... [FILE]...\n\n" -"Print line, word, and byte counts for each FILE, and a total line if\n" -"more than one FILE is specified. With no FILE, read standard input.\n" -"\t-c\tprint the byte counts\n" -"\t-l\tprint the newline counts\n" -"\t-L\tprint the length of the longest line\n" -"\t-w\tprint the word counts\n"; + "Print line, word, and byte counts for each FILE, and a total line if\n" + "more than one FILE is specified. With no FILE, read standard input.\n" + "\t-c\tprint the byte counts\n" + "\t-l\tprint the newline counts\n" + + "\t-L\tprint the length of the longest line\n" + "\t-w\tprint the word counts\n"; static int total_lines, total_words, total_chars, max_length; static int print_lines, print_words, print_chars, print_length; -void print_counts (int lines, int words, int chars, int length, - const char *name) { +void print_counts(int lines, int words, int chars, int length, + const char *name) +{ char const *space = ""; + if (print_lines) { - printf ("%7d", lines); + printf("%7d", lines); space = " "; } if (print_words) { - printf ("%s%7d", space, words); + printf("%s%7d", space, words); space = " "; } if (print_chars) { - printf ("%s%7d", space, chars); + printf("%s%7d", space, chars); space = " "; } if (print_length) - printf ("%s%7d", space, length); + printf("%s%7d", space, length); if (*name) - printf (" %s", name); - putchar ('\n'); + printf(" %s", name); + putchar('\n'); } -static void wc_file(FILE *file, const char *name) +static void wc_file(FILE * file, const char *name) { int lines, words, chars, length; int in_word = 0, linepos = 0; int c; + lines = words = chars = length = 0; while ((c = getc(file)) != EOF) { chars++; switch (c) { - case '\n': - lines++; - case '\r': - case '\f': - if (linepos > length) - length = linepos; - linepos = 0; - goto word_separator; - case '\t': - linepos += 8 - (linepos % 8); - goto word_separator; - case ' ': - linepos++; - case '\v': - word_separator: - if (in_word) { - in_word = 0; - words++; - } - break; - default: - linepos++; - in_word = 1; - break; + case '\n': + lines++; + case '\r': + case '\f': + if (linepos > length) + length = linepos; + linepos = 0; + goto word_separator; + case '\t': + linepos += 8 - (linepos % 8); + goto word_separator; + case ' ': + linepos++; + case '\v': + word_separator: + if (in_word) { + in_word = 0; + words++; + } + break; + default: + linepos++; + in_word = 1; + break; } } if (linepos > length) length = linepos; if (in_word) words++; - print_counts (lines, words, chars, length, name); + print_counts(lines, words, chars, length, name); total_lines += lines; total_words += words; total_chars += chars; @@ -104,28 +109,30 @@ static void wc_file(FILE *file, const char *name) fflush(stdout); } -int wc_main(int argc, char **argv) { +int wc_main(int argc, char **argv) +{ FILE *file; + total_lines = total_words = total_chars = max_length = 0; print_lines = print_words = print_chars = print_length = 0; while (--argc && **(++argv) == '-') { while (*++(*argv)) switch (**argv) { - case 'c': - print_chars = 1; - break; - case 'l': - print_lines = 1; - break; - case 'L': - print_length = 1; - break; - case 'w': - print_words = 1; - break; - default: - usage (wc_usage); + case 'c': + print_chars = 1; + break; + case 'l': + print_lines = 1; + break; + case 'L': + print_length = 1; + break; + case 'w': + print_words = 1; + break; + default: + usage(wc_usage); } } @@ -135,16 +142,14 @@ int wc_main(int argc, char **argv) { if (argc == 0) { wc_file(stdin, ""); exit(TRUE); - } - else if (argc == 1) { + } else if (argc == 1) { file = fopen(*argv, "r"); if (file == NULL) { perror(*argv); exit(FALSE); } wc_file(file, *argv); - } - else { + } else { while (argc-- > 0 && *argv != '\0' && strlen(*argv)) { file = fopen(*argv, "r"); if (file == NULL) { @@ -154,8 +159,8 @@ int wc_main(int argc, char **argv) { wc_file(file, *argv); argv++; } - print_counts (total_lines, total_words, total_chars, - max_length, "total"); + print_counts(total_lines, total_words, total_chars, + max_length, "total"); } exit(TRUE); } diff --git a/coreutils/whoami.c b/coreutils/whoami.c index 7fd5d01b2..3677c2fbc 100644 --- a/coreutils/whoami.c +++ b/coreutils/whoami.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini whoami implementation for busybox * @@ -24,21 +25,25 @@ #include <pwd.h> static const char whoami_usage[] = "whoami\n\n" -"Print the user name associated with the current effective user id.\n" -"Same as id -un.\n"; + "Print the user name associated with the current effective user id.\n" -extern int whoami_main(int argc, char **argv) { + "Same as id -un.\n"; + +extern int whoami_main(int argc, char **argv) +{ struct passwd *pw; uid_t uid; - if (argc > 1) usage (whoami_usage); + if (argc > 1) + usage(whoami_usage); - uid = geteuid (); - pw = getpwuid (uid); + uid = geteuid(); + pw = getpwuid(uid); if (pw) { - puts (pw->pw_name); - exit (TRUE); - } - fprintf (stderr, "%s: cannot find username for UID %u\n", argv[0], (unsigned) uid); - exit (FALSE); + puts(pw->pw_name); + exit(TRUE); + } + fprintf(stderr, "%s: cannot find username for UID %u\n", argv[0], + (unsigned) uid); + exit(FALSE); } diff --git a/coreutils/yes.c b/coreutils/yes.c index 96d6257d0..ac67845ac 100644 --- a/coreutils/yes.c +++ b/coreutils/yes.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini yes implementation for busybox * @@ -22,19 +23,22 @@ #include "internal.h" #include <stdio.h> -extern int yes_main(int argc, char **argv) { +extern int yes_main(int argc, char **argv) +{ int i; + if (argc == 1) while (1) - if (puts ("y") == EOF) { - perror ("yes"); + if (puts("y") == EOF) { + perror("yes"); exit(FALSE); } while (1) for (i = 1; i < argc; i++) - if (fputs (argv[i], stdout) == EOF || putchar (i == argc - 1 ? '\n' : ' ') == EOF) { - perror ("yes"); + if (fputs(argv[i], stdout) == EOF + || putchar(i == argc - 1 ? '\n' : ' ') == EOF) { + perror("yes"); exit(FALSE); } exit(TRUE); @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini `cp' and `mv' implementation for BusyBox. * @@ -39,217 +40,205 @@ #define is_cp 0 #define is_mv 1 -static const char *dz; /* dollar zero, .bss */ -static int dz_i; /* index, .bss */ -static const char *cp_mv_usage[] = /* .rodata */ +static const char *dz; /* dollar zero, .bss */ +static int dz_i; /* index, .bss */ +static const char *cp_mv_usage[] = /* .rodata */ { - "cp [OPTION]... SOURCE DEST\n" - " or: cp [OPTION]... SOURCE... DIRECTORY\n\n" - "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" - "\n" - "\t-a\tsame as -dpR\n" - "\t-d\tpreserve links\n" - "\t-p\tpreserve file attributes if possible\n" - "\t-R\tcopy directories recursively\n" - , - "mv SOURCE DEST\n" - " or: mv SOURCE... DIRECTORY\n\n" - "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" - "Warning!! This is not GNU `mv'. It does not preserve hard links.\n" + "cp [OPTION]... SOURCE DEST\n" + " or: cp [OPTION]... SOURCE... DIRECTORY\n\n" + "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" + "\n" + "\t-a\tsame as -dpR\n" + "\t-d\tpreserve links\n" + "\t-p\tpreserve file attributes if possible\n" + "\t-R\tcopy directories recursively\n", + "mv SOURCE DEST\n" + " or: mv SOURCE... DIRECTORY\n\n" + "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" + "Warning!! This is not GNU `mv'. It does not preserve hard links.\n" }; extern int cp_mv_main(int argc, char **argv) { - __label__ name_too_long__exit; - __label__ exit_false; - - int recursiveFlag; - int followLinks; - int preserveFlag; + __label__ name_too_long__exit; + __label__ exit_false; + + int recursiveFlag; + int followLinks; + int preserveFlag; + + const char *baseSrcName; + int srcDirFlag; + + char baseDestName[PATH_MAX + 1]; + size_t baseDestLen; + int destDirFlag; + + void fill_baseDest_buf(char *_buf, size_t * _buflen) { + const char *srcBasename; + if ((srcBasename = strrchr(baseSrcName, '/')) == NULL) { + srcBasename = baseSrcName; + if (_buf[*_buflen - 1] != '/') { + if (++(*_buflen) > PATH_MAX) + goto name_too_long__exit; + strcat(_buf, "/"); + } + } + if (*_buflen + strlen(srcBasename) > PATH_MAX) + goto name_too_long__exit; + strcat(_buf, srcBasename); + return; + } - const char *baseSrcName; - int srcDirFlag; + int fileAction(const char *fileName, struct stat *statbuf) { + __label__ return_false; + char destName[PATH_MAX + 1]; + size_t destLen; + const char *srcBasename; + + strcpy(destName, baseDestName); + destLen = strlen(destName); + + if (srcDirFlag == TRUE) { + if (recursiveFlag == FALSE) { + fprintf(stderr, omitting_directory, "cp", baseSrcName); + return TRUE; + } + srcBasename = (strstr(fileName, baseSrcName) + + strlen(baseSrcName)); + + if (destLen + strlen(srcBasename) > PATH_MAX) { + fprintf(stderr, name_too_long, "cp"); + goto return_false; + } + strcat(destName, srcBasename); + } else if (destDirFlag == TRUE) { + fill_baseDest_buf(&destName[0], &destLen); + } else { + srcBasename = baseSrcName; + } + return copyFile(fileName, destName, preserveFlag, followLinks); - char baseDestName[PATH_MAX + 1]; - size_t baseDestLen; - int destDirFlag; + return_false: + return FALSE; + } - void fill_baseDest_buf(char *_buf, size_t *_buflen) - { - const char *srcBasename; - if ((srcBasename = strrchr(baseSrcName, '/')) == NULL) - { - srcBasename = baseSrcName; - if (_buf[*_buflen - 1] != '/') - { - if (++(*_buflen) > PATH_MAX) - goto name_too_long__exit; - strcat(_buf, "/"); + int rmfileAction(const char *fileName, struct stat *statbuf) { + if (unlink(fileName) < 0) { + perror(fileName); + return FALSE; } - } - if (*_buflen + strlen(srcBasename) > PATH_MAX) - goto name_too_long__exit; - strcat(_buf, srcBasename); - return; + return TRUE; } - int fileAction(const char *fileName, struct stat *statbuf) - { - __label__ return_false; - char destName[PATH_MAX + 1]; - size_t destLen; - const char *srcBasename; - - strcpy(destName, baseDestName); - destLen = strlen(destName); - - if (srcDirFlag == TRUE) - { - if (recursiveFlag == FALSE) - { - fprintf(stderr, omitting_directory, "cp", baseSrcName); - return TRUE; - } - srcBasename = (strstr(fileName, baseSrcName) - + strlen(baseSrcName)); - if (destLen + strlen(srcBasename) > PATH_MAX) - { - fprintf(stderr, name_too_long, "cp"); - goto return_false; + int rmdirAction(const char *fileName, struct stat *statbuf) { + if (rmdir(fileName) < 0) { + perror(fileName); + return FALSE; } - strcat(destName, srcBasename); - } - else if (destDirFlag == TRUE) - { - fill_baseDest_buf(&destName[0], &destLen); - } - else - { - srcBasename = baseSrcName; - } - return copyFile(fileName, destName, preserveFlag, followLinks); - - return_false: - return FALSE; + return TRUE; } - int rmfileAction(const char *fileName, struct stat* statbuf) - { - if (unlink(fileName) < 0 ) { - perror(fileName); - return FALSE; - } - return TRUE; - } - - int rmdirAction(const char *fileName, struct stat* statbuf) - { - if (rmdir(fileName) < 0 ) { - perror(fileName); - return FALSE; - } - return TRUE; - } - - if ((dz = strrchr(*argv, '/')) == NULL) dz = *argv; else dz++; - if (*dz == 'c' && *(dz + 1) == 'p') dz_i = is_cp; else dz_i = is_mv; - if (argc < 3) usage(cp_mv_usage[dz_i]); - argc--; - argv++; - - if (dz_i == is_cp) - { - recursiveFlag = preserveFlag = FALSE; - followLinks = TRUE; - while (**argv == '-') - { - while (*++(*argv)) - { - switch (**argv) - { - case 'a': - followLinks = FALSE; - preserveFlag = TRUE; - recursiveFlag = TRUE; - break; - case 'd': - followLinks = FALSE; - break; - case 'p': - preserveFlag = TRUE; - break; - case 'R': - recursiveFlag = TRUE; - break; - default: - usage(cp_mv_usage[is_cp]); + if ((dz = strrchr(*argv, '/')) == NULL) + dz = *argv; + else + dz++; + if (*dz == 'c' && *(dz + 1) == 'p') + dz_i = is_cp; + else + dz_i = is_mv; + if (argc < 3) + usage(cp_mv_usage[dz_i]); + argc--; + argv++; + + if (dz_i == is_cp) { + recursiveFlag = preserveFlag = FALSE; + followLinks = TRUE; + while (**argv == '-') { + while (*++(*argv)) { + switch (**argv) { + case 'a': + followLinks = FALSE; + preserveFlag = TRUE; + recursiveFlag = TRUE; + break; + case 'd': + followLinks = FALSE; + break; + case 'p': + preserveFlag = TRUE; + break; + case 'R': + recursiveFlag = TRUE; + break; + default: + usage(cp_mv_usage[is_cp]); + } + } + argc--; + argv++; } - } - argc--; - argv++; - } - } - else /* (dz_i == is_mv) */ - { - recursiveFlag = preserveFlag = TRUE; - followLinks = FALSE; - } + } else { /* (dz_i == is_mv) */ - if (strlen(argv[argc - 1]) > PATH_MAX) - { - fprintf(stderr, name_too_long, "cp"); - goto exit_false; - } - strcpy(baseDestName, argv[argc - 1]); - baseDestLen = strlen(baseDestName); - if (baseDestLen == 0) goto exit_false; + recursiveFlag = preserveFlag = TRUE; + followLinks = FALSE; + } - destDirFlag = isDirectory(baseDestName, TRUE); - if ((argc > 3) && destDirFlag == FALSE) - { - fprintf(stderr, not_a_directory, "cp", baseDestName); - goto exit_false; - } + if (strlen(argv[argc - 1]) > PATH_MAX) { + fprintf(stderr, name_too_long, "cp"); + goto exit_false; + } + strcpy(baseDestName, argv[argc - 1]); + baseDestLen = strlen(baseDestName); + if (baseDestLen == 0) + goto exit_false; + + destDirFlag = isDirectory(baseDestName, TRUE); + if ((argc > 3) && destDirFlag == FALSE) { + fprintf(stderr, not_a_directory, "cp", baseDestName); + goto exit_false; + } - while (argc-- > 1) - { - size_t srcLen; - int flags_memo; + while (argc-- > 1) { + size_t srcLen; + int flags_memo; - baseSrcName = *(argv++); + baseSrcName = *(argv++); - if ((srcLen = strlen(baseSrcName)) > PATH_MAX) - goto name_too_long__exit; + if ((srcLen = strlen(baseSrcName)) > PATH_MAX) + goto name_too_long__exit; - if (srcLen == 0) continue; + if (srcLen == 0) + continue; - srcDirFlag = isDirectory(baseSrcName, followLinks); + srcDirFlag = isDirectory(baseSrcName, followLinks); - if ((flags_memo = (recursiveFlag == TRUE && - srcDirFlag == TRUE && destDirFlag == TRUE))) - { - fill_baseDest_buf(&baseDestName[0], &baseDestLen); + if ((flags_memo = (recursiveFlag == TRUE && + srcDirFlag == TRUE && destDirFlag == TRUE))) { + fill_baseDest_buf(&baseDestName[0], &baseDestLen); + } + if (recursiveAction(baseSrcName, + recursiveFlag, followLinks, FALSE, + fileAction, fileAction) == FALSE) + goto exit_false; + + if (dz_i == is_mv && + recursiveAction(baseSrcName, + recursiveFlag, followLinks, TRUE, + rmfileAction, rmdirAction) == FALSE) + goto exit_false; + + if (flags_memo) + *(baseDestName + baseDestLen) = '\0'; } - if (recursiveAction(baseSrcName, - recursiveFlag, followLinks, FALSE, - fileAction, fileAction) - == FALSE) goto exit_false; - - if (dz_i == is_mv && - recursiveAction(baseSrcName, - recursiveFlag, followLinks, TRUE, - rmfileAction, rmdirAction) - == FALSE) goto exit_false; - if (flags_memo) *(baseDestName + baseDestLen) = '\0'; - } + exit TRUE; - exit TRUE; - - name_too_long__exit: - fprintf(stderr, name_too_long, "cp"); - exit_false: - exit FALSE; + name_too_long__exit: + fprintf(stderr, name_too_long, "cp"); + exit_false: + exit FALSE; } // Local Variables: @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini date implementation for busybox * @@ -38,12 +39,13 @@ an RFC 822 complient date output for shell scripting mail commands */ -static const char date_usage[] = "date [OPTION]... [+FORMAT]\n" -" or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n\n" -"Display the current time in the given FORMAT, or set the system date.\n" -"\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n" -"\t-s\t\tset time described by STRING\n" -"\t-u\t\tprint or set Coordinated Universal Time\n"; +static const char date_usage[] = "date [OPTION]... [+FORMAT]\n" + " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n\n" + "Display the current time in the given FORMAT, or set the system date.\n" + "\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n" + "\t-s\t\tset time described by STRING\n" + + "\t-u\t\tprint or set Coordinated Universal Time\n"; /* Input parsing code is always bulky - used heavy duty libc stuff as @@ -51,240 +53,233 @@ static const char date_usage[] = "date [OPTION]... [+FORMAT]\n" /* Default input handling to save suprising some people */ -struct tm * -date_conv_time(struct tm *tm_time, const char *t_string) { - int nr; - - nr = sscanf(t_string, "%2d%2d%2d%2d%d", - &(tm_time->tm_mon), - &(tm_time->tm_mday), - &(tm_time->tm_hour), - &(tm_time->tm_min), - &(tm_time->tm_year)); - - if(nr < 4 || nr > 5) { - fprintf(stderr, invalid_date, "date", t_string); - exit( FALSE); - } - - /* correct for century - minor Y2K problem here? */ - if(tm_time->tm_year >= 1900) - tm_time->tm_year -= 1900; - /* adjust date */ - tm_time->tm_mon -= 1; - - return(tm_time); +struct tm *date_conv_time(struct tm *tm_time, const char *t_string) +{ + int nr; + + nr = sscanf(t_string, "%2d%2d%2d%2d%d", + &(tm_time->tm_mon), + &(tm_time->tm_mday), + &(tm_time->tm_hour), + &(tm_time->tm_min), &(tm_time->tm_year)); + + if (nr < 4 || nr > 5) { + fprintf(stderr, invalid_date, "date", t_string); + exit(FALSE); + } + + /* correct for century - minor Y2K problem here? */ + if (tm_time->tm_year >= 1900) + tm_time->tm_year -= 1900; + /* adjust date */ + tm_time->tm_mon -= 1; + + return (tm_time); } /* The new stuff for LRP */ -struct tm * -date_conv_ftime(struct tm *tm_time, const char *t_string) { - struct tm itm_time, jtm_time, ktm_time, \ - ltm_time, mtm_time, ntm_time; - - itm_time = *tm_time; - jtm_time = *tm_time; - ktm_time = *tm_time; - ltm_time = *tm_time; - mtm_time = *tm_time; - ntm_time = *tm_time; - - /* Parse input and assign appropriately to tm_time */ - - if(sscanf(t_string, "%d:%d:%d", - &itm_time.tm_hour, - &itm_time.tm_min, - &itm_time.tm_sec) == 3 ) { - - *tm_time = itm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d:%d", - &jtm_time.tm_hour, - &jtm_time.tm_min) == 2) { - - *tm_time = jtm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d.%d-%d:%d:%d", - &ktm_time.tm_mon, - &ktm_time.tm_mday, - &ktm_time.tm_hour, - &ktm_time.tm_min, - &ktm_time.tm_sec) == 5) { - - ktm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = ktm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d.%d-%d:%d", - <m_time.tm_mon, - <m_time.tm_mday, - <m_time.tm_hour, - <m_time.tm_min) == 4) { - - ltm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = ltm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d.%d.%d-%d:%d:%d", - &mtm_time.tm_year, - &mtm_time.tm_mon, - &mtm_time.tm_mday, - &mtm_time.tm_hour, - &mtm_time.tm_min, - &mtm_time.tm_sec) == 6) { - - mtm_time.tm_year -= 1900; /* Adjust years */ - mtm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = mtm_time; - return(tm_time); - - } else if (sscanf(t_string, "%d.%d.%d-%d:%d", - &ntm_time.tm_year, - &ntm_time.tm_mon, - &ntm_time.tm_mday, - &ntm_time.tm_hour, - &ntm_time.tm_min) == 5) { - ntm_time.tm_year -= 1900; /* Adjust years */ - ntm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ - *tm_time = ntm_time; - return(tm_time); - - } - - fprintf(stderr, invalid_date, "date", t_string); - - exit( FALSE); +struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string) +{ + struct tm itm_time, jtm_time, ktm_time, ltm_time, mtm_time, ntm_time; + + itm_time = *tm_time; + jtm_time = *tm_time; + ktm_time = *tm_time; + ltm_time = *tm_time; + mtm_time = *tm_time; + ntm_time = *tm_time; + + /* Parse input and assign appropriately to tm_time */ + + if (sscanf(t_string, "%d:%d:%d", + &itm_time.tm_hour, &itm_time.tm_min, &itm_time.tm_sec) == 3) { + + *tm_time = itm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d:%d", + &jtm_time.tm_hour, &jtm_time.tm_min) == 2) { + + *tm_time = jtm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d.%d-%d:%d:%d", + &ktm_time.tm_mon, + &ktm_time.tm_mday, + &ktm_time.tm_hour, + &ktm_time.tm_min, &ktm_time.tm_sec) == 5) { + + ktm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + *tm_time = ktm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d.%d-%d:%d", + <m_time.tm_mon, + <m_time.tm_mday, + <m_time.tm_hour, <m_time.tm_min) == 4) { + + ltm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + *tm_time = ltm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d.%d.%d-%d:%d:%d", + &mtm_time.tm_year, + &mtm_time.tm_mon, + &mtm_time.tm_mday, + &mtm_time.tm_hour, + &mtm_time.tm_min, &mtm_time.tm_sec) == 6) { + + mtm_time.tm_year -= 1900; /* Adjust years */ + mtm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + *tm_time = mtm_time; + return (tm_time); + + } else if (sscanf(t_string, "%d.%d.%d-%d:%d", + &ntm_time.tm_year, + &ntm_time.tm_mon, + &ntm_time.tm_mday, + &ntm_time.tm_hour, &ntm_time.tm_min) == 5) { + ntm_time.tm_year -= 1900; /* Adjust years */ + ntm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ + *tm_time = ntm_time; + return (tm_time); + + } + + fprintf(stderr, invalid_date, "date", t_string); + + exit(FALSE); } -int -date_main(int argc, char * * argv) +int date_main(int argc, char **argv) { - char *date_str = NULL; - char *date_fmt = NULL; - char *t_buff; - int i; - int set_time = 0; - int rfc822 = 0; - int utc = 0; - int use_arg = 0; - time_t tm; - struct tm tm_time; - - /* Interpret command line args */ - i = --argc; - argv++; - while (i > 0 && **argv) { - if (**argv == '-') { - while (i>0 && *++(*argv)) switch (**argv) { - case 'R': - rfc822 = 1; - break; - case 's': - set_time = 1; - if(date_str != NULL) usage ( date_usage); - date_str = optarg; - break; - case 'u': - utc = 1; - if (putenv ("TZ=UTC0") != 0) { - fprintf(stderr, memory_exhausted, "date"); - exit( FALSE); + char *date_str = NULL; + char *date_fmt = NULL; + char *t_buff; + int i; + int set_time = 0; + int rfc822 = 0; + int utc = 0; + int use_arg = 0; + time_t tm; + struct tm tm_time; + + /* Interpret command line args */ + i = --argc; + argv++; + while (i > 0 && **argv) { + if (**argv == '-') { + while (i > 0 && *++(*argv)) + switch (**argv) { + case 'R': + rfc822 = 1; + break; + case 's': + set_time = 1; + if (date_str != NULL) + usage(date_usage); + date_str = optarg; + break; + case 'u': + utc = 1; + if (putenv("TZ=UTC0") != 0) { + fprintf(stderr, memory_exhausted, "date"); + exit(FALSE); + } + /* Look ma, no break. Don't fix it either. */ + case 'd': + use_arg = 1; + if (date_str != NULL) + usage(date_usage); + date_str = optarg; + break; + case '-': + usage(date_usage); + } + } else { + if ((date_fmt == NULL) && (strcmp(*argv, "+") == 0)) + date_fmt = *argv; + else if (date_str == NULL) { + set_time = 1; + date_str = *argv; + } else { + usage(date_usage); + } } - /* Look ma, no break. Don't fix it either. */ - case 'd': - use_arg = 1; - if(date_str != NULL) usage ( date_usage); - date_str = optarg; - break; - case '-': - usage ( date_usage); - } - } else { - if ( (date_fmt == NULL) && (strcmp(*argv, "+")==0) ) - date_fmt=*argv; - else if (date_str == NULL) { - set_time = 1; - date_str=*argv; - } else { - usage ( date_usage); - } + i--; + argv++; } - i--; - argv++; - } - - - /* Now we have parsed all the information except the date format - which depends on whether the clock is being set or read */ - - time(&tm); - memcpy(&tm_time, localtime(&tm), sizeof(tm_time)); - /* Zero out fields - take her back to midnight!*/ - if(date_str != NULL) { - tm_time.tm_sec = 0; - tm_time.tm_min = 0; - tm_time.tm_hour = 0; - } - - /* Process any date input to UNIX time since 1 Jan 1970 */ - if(date_str != NULL) { - - if(strchr(date_str, ':') != NULL) { - date_conv_ftime(&tm_time, date_str); - } else { - date_conv_time(&tm_time, date_str); - } - - /* Correct any day of week and day of year etc fields */ - tm = mktime(&tm_time); - if (tm < 0 ) { - fprintf(stderr, invalid_date, "date", date_str); - exit( FALSE); - } - - /* if setting time, set it */ - if(set_time) { - if( stime(&tm) < 0) { - fprintf(stderr, "date: can't set date.\n"); - exit( FALSE); - } - } - } - - /* Display output */ - - /* Deal with format string */ - if(date_fmt == NULL) { - date_fmt = (rfc822 - ? (utc - ? "%a, %_d %b %Y %H:%M:%S GMT" - : "%a, %_d %b %Y %H:%M:%S %z") - : "%a %b %e %H:%M:%S %Z %Y"); - - } else if ( *date_fmt == '\0' ) { - /* Imitate what GNU 'date' does with NO format string! */ - printf ("\n"); - exit( TRUE); - } - - /* Handle special conversions */ - - if( strncmp( date_fmt, "%f", 2) == 0 ) { - date_fmt = "%Y.%m.%d-%H:%M:%S"; - } - - /* Print OUTPUT (after ALL that!) */ - t_buff = malloc(201); - strftime(t_buff, 200, date_fmt, &tm_time); - printf("%s\n", t_buff); - - exit( TRUE); + + + /* Now we have parsed all the information except the date format + which depends on whether the clock is being set or read */ + + time(&tm); + memcpy(&tm_time, localtime(&tm), sizeof(tm_time)); + /* Zero out fields - take her back to midnight! */ + if (date_str != NULL) { + tm_time.tm_sec = 0; + tm_time.tm_min = 0; + tm_time.tm_hour = 0; + } + + /* Process any date input to UNIX time since 1 Jan 1970 */ + if (date_str != NULL) { + + if (strchr(date_str, ':') != NULL) { + date_conv_ftime(&tm_time, date_str); + } else { + date_conv_time(&tm_time, date_str); + } + + /* Correct any day of week and day of year etc fields */ + tm = mktime(&tm_time); + if (tm < 0) { + fprintf(stderr, invalid_date, "date", date_str); + exit(FALSE); + } + + /* if setting time, set it */ + if (set_time) { + if (stime(&tm) < 0) { + fprintf(stderr, "date: can't set date.\n"); + exit(FALSE); + } + } + } + + /* Display output */ + + /* Deal with format string */ + if (date_fmt == NULL) { + date_fmt = (rfc822 + ? (utc + ? "%a, %_d %b %Y %H:%M:%S GMT" + : "%a, %_d %b %Y %H:%M:%S %z") + : "%a %b %e %H:%M:%S %Z %Y"); + + } else if (*date_fmt == '\0') { + /* Imitate what GNU 'date' does with NO format string! */ + printf("\n"); + exit(TRUE); + } + + /* Handle special conversions */ + + if (strncmp(date_fmt, "%f", 2) == 0) { + date_fmt = "%Y.%m.%d-%H:%M:%S"; + } + + /* Print OUTPUT (after ALL that!) */ + t_buff = malloc(201); + strftime(t_buff, 200, date_fmt, &tm_time); + printf("%s\n", t_buff); + + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini dd implementation for busybox * @@ -40,164 +41,159 @@ typedef unsigned long long int uintmax_t; #endif static const char dd_usage[] = -"dd [if=name] [of=name] [bs=n] [count=n] [skip=n] [seek=n]\n\n" -"Copy a file, converting and formatting according to options\n\n" -"\tif=FILE\tread from FILE instead of stdin\n" -"\tof=FILE\twrite to FILE instead of stdout\n" -"\tbs=n\tread and write n bytes at a time\n" -"\tcount=n\tcopy only n input blocks\n" -"\tskip=n\tskip n input blocks\n" -"\tseek=n\tskip n output blocks\n" -"\n" -"Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"; + "dd [if=name] [of=name] [bs=n] [count=n] [skip=n] [seek=n]\n\n" + "Copy a file, converting and formatting according to options\n\n" + "\tif=FILE\tread from FILE instead of stdin\n" + "\tof=FILE\twrite to FILE instead of stdout\n" + "\tbs=n\tread and write n bytes at a time\n" + "\tcount=n\tcopy only n input blocks\n" + "\tskip=n\tskip n input blocks\n" + "\tseek=n\tskip n output blocks\n" + "\n" + "Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"; -extern int dd_main (int argc, char **argv) + +extern int dd_main(int argc, char **argv) { - const char *inFile = NULL; - const char *outFile = NULL; - char *cp; - int inFd; - int outFd; - int inCc = 0; - int outCc; - long blockSize = 512; - uintmax_t skipBlocks = 0; - uintmax_t seekBlocks = 0; - uintmax_t count = (uintmax_t)-1; - uintmax_t intotal; - uintmax_t outTotal; - unsigned char *buf; - - argc--; - argv++; - - /* Parse any options */ - while (argc) { - if (inFile == NULL && (strncmp(*argv, "if", 2) == 0)) - inFile=((strchr(*argv, '='))+1); - else if (outFile == NULL && (strncmp(*argv, "of", 2) == 0)) - outFile=((strchr(*argv, '='))+1); - else if (strncmp("count", *argv, 5) == 0) { - count = getNum ((strchr(*argv, '='))+1); - if (count <= 0) { - fprintf (stderr, "Bad count value %s\n", *argv); - goto usage; - } - } - else if (strncmp(*argv, "bs", 2) == 0) { - blockSize = getNum ((strchr(*argv, '='))+1); - if (blockSize <= 0) { - fprintf (stderr, "Bad block size value %s\n", *argv); - goto usage; - } - } - else if (strncmp(*argv, "skip", 4) == 0) { - skipBlocks = getNum ((strchr(*argv, '='))+1); - if (skipBlocks <= 0) { - fprintf (stderr, "Bad skip value %s\n", *argv); - goto usage; - } + const char *inFile = NULL; + const char *outFile = NULL; + char *cp; + int inFd; + int outFd; + int inCc = 0; + int outCc; + long blockSize = 512; + uintmax_t skipBlocks = 0; + uintmax_t seekBlocks = 0; + uintmax_t count = (uintmax_t) - 1; + uintmax_t intotal; + uintmax_t outTotal; + unsigned char *buf; + + argc--; + argv++; + /* Parse any options */ + while (argc) { + if (inFile == NULL && (strncmp(*argv, "if", 2) == 0)) + inFile = ((strchr(*argv, '=')) + 1); + else if (outFile == NULL && (strncmp(*argv, "of", 2) == 0)) + outFile = ((strchr(*argv, '=')) + 1); + else if (strncmp("count", *argv, 5) == 0) { + count = getNum((strchr(*argv, '=')) + 1); + if (count <= 0) { + fprintf(stderr, "Bad count value %s\n", *argv); + goto usage; + } + } else if (strncmp(*argv, "bs", 2) == 0) { + blockSize = getNum((strchr(*argv, '=')) + 1); + if (blockSize <= 0) { + fprintf(stderr, "Bad block size value %s\n", *argv); + goto usage; + } + } else if (strncmp(*argv, "skip", 4) == 0) { + skipBlocks = getNum((strchr(*argv, '=')) + 1); + if (skipBlocks <= 0) { + fprintf(stderr, "Bad skip value %s\n", *argv); + goto usage; + } + + } else if (strncmp(*argv, "seek", 4) == 0) { + seekBlocks = getNum((strchr(*argv, '=')) + 1); + if (seekBlocks <= 0) { + fprintf(stderr, "Bad seek value %s\n", *argv); + goto usage; + } + + } else { + goto usage; + } + argc--; + argv++; } - else if (strncmp(*argv, "seek", 4) == 0) { - seekBlocks = getNum ((strchr(*argv, '='))+1); - if (seekBlocks <= 0) { - fprintf (stderr, "Bad seek value %s\n", *argv); - goto usage; - } + buf = malloc(blockSize); + if (buf == NULL) { + fprintf(stderr, "Cannot allocate buffer\n"); + exit(FALSE); } - else { - goto usage; + + intotal = 0; + outTotal = 0; + + if (inFile == NULL) + inFd = fileno(stdin); + else + inFd = open(inFile, 0); + + if (inFd < 0) { + perror(inFile); + free(buf); + exit(FALSE); } - argc--; - argv++; - } - - buf = malloc (blockSize); - if (buf == NULL) { - fprintf (stderr, "Cannot allocate buffer\n"); - exit( FALSE); - } - - intotal = 0; - outTotal = 0; - - if (inFile == NULL) - inFd = fileno(stdin); - else - inFd = open (inFile, 0); - - if (inFd < 0) { - perror (inFile); - free (buf); - exit( FALSE); - } - - if (outFile == NULL) - outFd = fileno(stdout); - else - outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666); - - if (outFd < 0) { - perror (outFile); - close (inFd); - free (buf); - exit( FALSE); - } - - lseek(inFd, skipBlocks*blockSize, SEEK_SET); - lseek(outFd, seekBlocks*blockSize, SEEK_SET); - // - //TODO: Convert to using fullRead & fullWrite - // from utility.c - // -Erik - while (outTotal < count * blockSize) { - inCc = read (inFd, buf, blockSize); - if (inCc < 0) { - perror (inFile); - goto cleanup; - } else if (inCc == 0) { - goto cleanup; + + if (outFile == NULL) + outFd = fileno(stdout); + else + outFd = open(outFile, O_WRONLY | O_CREAT | O_TRUNC, 0666); + + if (outFd < 0) { + perror(outFile); + close(inFd); + free(buf); + exit(FALSE); } - intotal += inCc; - cp = buf; - - while (intotal > outTotal) { - if (outTotal + inCc > count * blockSize) - inCc = count * blockSize - outTotal; - outCc = write (outFd, cp, inCc); - if (outCc < 0) { - perror (outFile); - goto cleanup; - } else if (outCc == 0) { - goto cleanup; - } - - inCc -= outCc; - cp += outCc; - outTotal += outCc; + + lseek(inFd, skipBlocks * blockSize, SEEK_SET); + lseek(outFd, seekBlocks * blockSize, SEEK_SET); + // + //TODO: Convert to using fullRead & fullWrite + // from utility.c + // -Erik + while (outTotal < count * blockSize) { + inCc = read(inFd, buf, blockSize); + if (inCc < 0) { + perror(inFile); + goto cleanup; + } else if (inCc == 0) { + goto cleanup; + } + intotal += inCc; + cp = buf; + + while (intotal > outTotal) { + if (outTotal + inCc > count * blockSize) + inCc = count * blockSize - outTotal; + outCc = write(outFd, cp, inCc); + if (outCc < 0) { + perror(outFile); + goto cleanup; + } else if (outCc == 0) { + goto cleanup; + } + + inCc -= outCc; + cp += outCc; + outTotal += outCc; + } } - } - if (inCc < 0) - perror (inFile); + if (inCc < 0) + perror(inFile); cleanup: - close (inFd); - close (outFd); - free (buf); - - printf ("%ld+%d records in\n", (long)(intotal / blockSize), - (intotal % blockSize) != 0); - printf ("%ld+%d records out\n", (long)(outTotal / blockSize), - (outTotal % blockSize) != 0); - exit( TRUE); + close(inFd); + close(outFd); + free(buf); + + printf("%ld+%d records in\n", (long) (intotal / blockSize), + (intotal % blockSize) != 0); + printf("%ld+%d records out\n", (long) (outTotal / blockSize), + (outTotal % blockSize) != 0); + exit(TRUE); usage: - usage( dd_usage); + usage(dd_usage); } - - diff --git a/deallocvt.c b/deallocvt.c index 1e13ff69c..141062edc 100644 --- a/deallocvt.c +++ b/deallocvt.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s) * Renamed deallocvt. @@ -13,38 +14,39 @@ extern int getfd(void); char *progname; -int -deallocvt_main(int argc, char *argv[]) { - int fd, num, i; +int deallocvt_main(int argc, char *argv[]) +{ + int fd, num, i; - if ( ( argc != 2) || (**(argv+1) == '-' ) ) { - usage ("deallocvt N\n\nDeallocate unused virtual terminal /dev/ttyN\n"); - } + if ((argc != 2) || (**(argv + 1) == '-')) { + usage + ("deallocvt N\n\nDeallocate unused virtual terminal /dev/ttyN\n"); + } - progname = argv[0]; + progname = argv[0]; - fd = get_console_fd("/dev/console"); + fd = get_console_fd("/dev/console"); - if (argc == 1) { - /* deallocate all unused consoles */ - if (ioctl(fd,VT_DISALLOCATE,0)) { - perror("VT_DISALLOCATE"); - exit(1); - } - } else - for (i = 1; i < argc; i++) { - num = atoi(argv[i]); - if (num == 0) - fprintf(stderr, "%s: 0: illegal VT number\n", progname); - else if (num == 1) - fprintf(stderr, "%s: VT 1 cannot be deallocated\n", progname); - else - if (ioctl(fd,VT_DISALLOCATE,num)) { - perror("VT_DISALLOCATE"); - fprintf(stderr, "%s: could not deallocate console %d\n", - progname, num); - exit(1); - } - } - exit(0); + if (argc == 1) { + /* deallocate all unused consoles */ + if (ioctl(fd, VT_DISALLOCATE, 0)) { + perror("VT_DISALLOCATE"); + exit(1); + } + } else + for (i = 1; i < argc; i++) { + num = atoi(argv[i]); + if (num == 0) + fprintf(stderr, "%s: 0: illegal VT number\n", progname); + else if (num == 1) + fprintf(stderr, "%s: VT 1 cannot be deallocated\n", + progname); + else if (ioctl(fd, VT_DISALLOCATE, num)) { + perror("VT_DISALLOCATE"); + fprintf(stderr, "%s: could not deallocate console %d\n", + progname, num); + exit(1); + } + } + exit(0); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini df implementation for busybox * @@ -29,81 +30,81 @@ #include <fstab.h> static const char df_usage[] = "df [filesystem ...]\n" - "\n" "\tPrint the filesystem space used and space available.\n"; -extern const char mtab_file[]; /* Defined in utility.c */ + "\n" "\tPrint the filesystem space used and space available.\n"; + +extern const char mtab_file[]; /* Defined in utility.c */ static int df(char *device, const char *mountPoint) { - struct statfs s; - long blocks_used; - long blocks_percent_used; - struct fstab* fstabItem; - - if (statfs(mountPoint, &s) != 0) { - perror(mountPoint); - return FALSE; - } + struct statfs s; + long blocks_used; + long blocks_percent_used; + struct fstab *fstabItem; - if (s.f_blocks > 0) { - blocks_used = s.f_blocks - s.f_bfree; - blocks_percent_used = (long) - (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5); - /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */ - if (strcmp (device, "/dev/root") == 0) { - fstabItem = getfsfile ("/"); - if (fstabItem != NULL) - device = fstabItem->fs_spec; + if (statfs(mountPoint, &s) != 0) { + perror(mountPoint); + return FALSE; } - printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", - device, - (long) (s.f_blocks * (s.f_bsize / 1024.0)), - (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)), - (long) (s.f_bavail * (s.f_bsize / 1024.0)), - blocks_percent_used, mountPoint); - } + if (s.f_blocks > 0) { + blocks_used = s.f_blocks - s.f_bfree; + blocks_percent_used = (long) + (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5); + /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */ + if (strcmp(device, "/dev/root") == 0) { + fstabItem = getfsfile("/"); + if (fstabItem != NULL) + device = fstabItem->fs_spec; + } + printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", + device, + (long) (s.f_blocks * (s.f_bsize / 1024.0)), + (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)), + (long) (s.f_bavail * (s.f_bsize / 1024.0)), + blocks_percent_used, mountPoint); + + } - return TRUE; + return TRUE; } extern int df_main(int argc, char **argv) { - printf("%-20s %-14s %s %s %s %s\n", "Filesystem", - "1k-blocks", "Used", "Available", "Use%", "Mounted on"); + printf("%-20s %-14s %s %s %s %s\n", "Filesystem", + "1k-blocks", "Used", "Available", "Use%", "Mounted on"); - if (argc > 1) { - struct mntent *mountEntry; - int status; + if (argc > 1) { + struct mntent *mountEntry; + int status; - while (argc > 1) { - if ((mountEntry = findMountPoint(argv[1], mtab_file)) == - 0) { - fprintf(stderr, "%s: can't find mount point.\n", argv[1]); - exit( FALSE); - } - status = df(mountEntry->mnt_fsname, mountEntry->mnt_dir); - if (status != 0) - exit( status); - argc--; - argv++; - } - exit( TRUE); - } else { - FILE *mountTable; - struct mntent *mountEntry; + while (argc > 1) { + if ((mountEntry = findMountPoint(argv[1], mtab_file)) == 0) { + fprintf(stderr, "%s: can't find mount point.\n", argv[1]); + exit(FALSE); + } + status = df(mountEntry->mnt_fsname, mountEntry->mnt_dir); + if (status != 0) + exit(status); + argc--; + argv++; + } + exit(TRUE); + } else { + FILE *mountTable; + struct mntent *mountEntry; - mountTable = setmntent(mtab_file, "r"); - if (mountTable == 0) { - perror(mtab_file); - exit(FALSE); - } + mountTable = setmntent(mtab_file, "r"); + if (mountTable == 0) { + perror(mtab_file); + exit(FALSE); + } - while ((mountEntry = getmntent(mountTable))) { - df(mountEntry->mnt_fsname, mountEntry->mnt_dir); + while ((mountEntry = getmntent(mountTable))) { + df(mountEntry->mnt_fsname, mountEntry->mnt_dir); + } + endmntent(mountTable); } - endmntent(mountTable); - } - exit( TRUE); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* dmesg.c -- Print out the contents of the kernel ring buffer * Created: Sat Oct 9 16:19:47 1993 * Revised: Thu Oct 28 21:52:17 1993 by faith@cs.unc.edu @@ -24,8 +25,8 @@ #ifndef __alpha__ # define __NR_klogctl __NR_syslog - static inline _syscall3(int, klogctl, int, type, char *, b, int, len); -#else /* __alpha__ */ +static inline _syscall3(int, klogctl, int, type, char *, b, int, len); +#else /* __alpha__ */ #define klogctl syslog #endif @@ -35,90 +36,91 @@ static const char dmesg_usage[] = "dmesg [-c] [-n level] [-s bufsize]\n"; -int dmesg_main( int argc, char** argv ) +int dmesg_main(int argc, char **argv) { - char *buf; - int bufsize=8196; - int i; - int n; - int level = 0; - int lastc; - int cmd = 3; - int stopDoingThat; + char *buf; + int bufsize = 8196; + int i; + int n; + int level = 0; + int lastc; + int cmd = 3; + int stopDoingThat; - argc--; - argv++; + argc--; + argv++; - /* Parse any options */ - while (argc && **argv == '-') { - stopDoingThat = FALSE; - while (stopDoingThat == FALSE && *++(*argv)) { - switch (**argv) { - case 'c': - cmd = 4; - break; - case 'n': - cmd = 8; - if (--argc == 0) - goto end; - level = atoi (*(++argv)); - if (--argc > 0) - ++argv; - stopDoingThat = TRUE; - break; - case 's': - if (--argc == 0) - goto end; - bufsize = atoi (*(++argv)); - if (--argc > 0) - ++argv; - stopDoingThat = TRUE; - break; - default: + /* Parse any options */ + while (argc && **argv == '-') { + stopDoingThat = FALSE; + while (stopDoingThat == FALSE && *++(*argv)) { + switch (**argv) { + case 'c': + cmd = 4; + break; + case 'n': + cmd = 8; + if (--argc == 0) + goto end; + level = atoi(*(++argv)); + if (--argc > 0) + ++argv; + stopDoingThat = TRUE; + break; + case 's': + if (--argc == 0) + goto end; + bufsize = atoi(*(++argv)); + if (--argc > 0) + ++argv; + stopDoingThat = TRUE; + break; + default: + goto end; + } + } + } + + if (argc > 1) { goto end; - } } - } - - if (argc > 1) { - goto end; - } - if (cmd == 8) { - n = klogctl( cmd, NULL, level ); - if (n < 0) { - goto klogctl_error; - } - exit( TRUE ); - } + if (cmd == 8) { + n = klogctl(cmd, NULL, level); + if (n < 0) { + goto klogctl_error; + } + exit(TRUE); + } - if (bufsize < 4096) bufsize = 4096; - buf = (char*)malloc(bufsize); - n = klogctl( cmd, buf, bufsize ); - if (n < 0) { - goto klogctl_error; - } + if (bufsize < 4096) + bufsize = 4096; + buf = (char *) malloc(bufsize); + n = klogctl(cmd, buf, bufsize); + if (n < 0) { + goto klogctl_error; + } - lastc = '\n'; - for (i = 0; i < n; i++) { - if ((i == 0 || buf[i - 1] == '\n') && buf[i] == '<') { - i++; - while (buf[i] >= '0' && buf[i] <= '9') - i++; - if (buf[i] == '>') - i++; - } - lastc = buf[i]; - putchar( lastc ); - } - if (lastc != '\n') - putchar( '\n' ); - exit( TRUE); -end: - usage( dmesg_usage); - exit (FALSE); -klogctl_error: - perror( "klogctl" ); - exit( FALSE ); + lastc = '\n'; + for (i = 0; i < n; i++) { + if ((i == 0 || buf[i - 1] == '\n') && buf[i] == '<') { + i++; + while (buf[i] >= '0' && buf[i] <= '9') + i++; + if (buf[i] == '>') + i++; + } + lastc = buf[i]; + putchar(lastc); + } + if (lastc != '\n') + putchar('\n'); + exit(TRUE); + end: + usage(dmesg_usage); + exit(FALSE); + klogctl_error: + perror("klogctl"); + exit(FALSE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini du implementation for busybox * @@ -31,119 +32,121 @@ #include <dirent.h> #include <stdio.h> #include <errno.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ -typedef void (Display)(long, char *); +typedef void (Display) (long, char *); static const char du_usage[] = -"du [OPTION]... [FILE]...\n\n" -"\t-s\tdisplay only a total for each argument\n" -; -static int du_depth = 0; + "du [OPTION]... [FILE]...\n\n" + "\t-s\tdisplay only a total for each argument\n"; -static Display *print; +static int du_depth = 0; -static void -print_normal(long size, char *filename) +static Display *print; + +static void print_normal(long size, char *filename) { - fprintf(stdout, "%-7ld %s\n", size, filename); + fprintf(stdout, "%-7ld %s\n", size, filename); } -static void -print_summary(long size, char *filename) +static void print_summary(long size, char *filename) { - if (du_depth == 1) { - print_normal(size, filename); - } + if (du_depth == 1) { + print_normal(size, filename); + } } /* tiny recursive du */ -static long -du(char *filename) +static long du(char *filename) { - struct stat statbuf; - long sum; - - if ((lstat(filename, &statbuf)) != 0) { - fprintf(stdout, "du: %s: %s\n", filename, strerror(errno)); - return 0; - } - - du_depth++; - sum = statbuf.st_blocks; - - if (S_ISDIR(statbuf.st_mode)) { - DIR *dir; - struct dirent *entry; - - dir = opendir(filename); - if (!dir) { return 0; } - while ((entry = readdir(dir))) { - char newfile[PATH_MAX + 1]; - char *name = entry->d_name; - - if ( (strcmp(name, "..") == 0) - || (strcmp(name, ".") == 0)) - { continue; } - - if (strlen(filename) + strlen(name) + 1 > PATH_MAX) { - fprintf(stderr, name_too_long, "du"); - return 0; - } - sprintf(newfile, "%s/%s", filename, name); - - sum += du(newfile); + struct stat statbuf; + long sum; + + if ((lstat(filename, &statbuf)) != 0) { + fprintf(stdout, "du: %s: %s\n", filename, strerror(errno)); + return 0; } - closedir(dir); - print(sum, filename); - } - du_depth--; - return sum; + + du_depth++; + sum = statbuf.st_blocks; + + if (S_ISDIR(statbuf.st_mode)) { + DIR *dir; + struct dirent *entry; + + dir = opendir(filename); + if (!dir) { + return 0; + } + while ((entry = readdir(dir))) { + char newfile[PATH_MAX + 1]; + char *name = entry->d_name; + + if ((strcmp(name, "..") == 0) + || (strcmp(name, ".") == 0)) { + continue; + } + + if (strlen(filename) + strlen(name) + 1 > PATH_MAX) { + fprintf(stderr, name_too_long, "du"); + return 0; + } + sprintf(newfile, "%s/%s", filename, name); + + sum += du(newfile); + } + closedir(dir); + print(sum, filename); + } + du_depth--; + return sum; } -int -du_main(int argc, char **argv) +int du_main(int argc, char **argv) { - int i; - char opt; - - /* default behaviour */ - print = print_normal; - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 's': - print = print_summary; - break; - case 'h': - usage(du_usage); - break; - default: - fprintf(stderr, "du: invalid option -- %c\n", opt); - usage(du_usage); - } - } else { - break; + int i; + char opt; + + /* default behaviour */ + print = print_normal; + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 's': + print = print_summary; + break; + case 'h': + usage(du_usage); + break; + default: + fprintf(stderr, "du: invalid option -- %c\n", opt); + usage(du_usage); + } + } else { + break; + } } - } - /* go through remaining args (if any) */ - if (i >= argc) { - du("."); - } else { - long sum; - for ( ; i < argc; i++) { - sum = du(argv[i]); - if ((sum) && (isDirectory(argv[i], FALSE))) { print_normal(sum, argv[i]); } + /* go through remaining args (if any) */ + if (i >= argc) { + du("."); + } else { + long sum; + + for (; i < argc; i++) { + sum = du(argv[i]); + if ((sum) && (isDirectory(argv[i], FALSE))) { + print_normal(sum, argv[i]); + } + } } - } - exit(0); + exit(0); } -/* $Id: du.c,v 1.10 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: du.c,v 1.11 2000/02/08 19:58:47 erik Exp $ */ @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com> * @@ -15,37 +16,38 @@ #include <utmp.h> static const char dutmp_usage[] = "dutmp\n" - "\n" - "\tDump file or stdin utmp file format to stdout, pipe delimited.\n" - "\tdutmp /var/run/utmp\n"; + "\n" -extern int dutmp_main (int argc, char **argv) + "\tDump file or stdin utmp file format to stdout, pipe delimited.\n" + "\tdutmp /var/run/utmp\n"; + +extern int dutmp_main(int argc, char **argv) { - FILE *f = stdin; - struct utmp ut; - - if ((argc < 2) || (**(argv + 1) == '-')) { - usage( dutmp_usage); - } - - if ( **(++argv) == 0 ) { - f = fopen (*(++argv), "r"); - if (f < 0 ) { - perror (*argv); - exit (FALSE); - } - } - - while (fread (&ut, 1, sizeof (struct utmp), f)) { - // printf("%d:%d:%s:%s:%s:%s:%d:%d:%ld:%ld:%ld:%x\n", - printf ("%d|%d|%s|%s|%s|%s|%d|%d|%ld|%ld|%ld|%x\n", - ut.ut_type, ut.ut_pid, ut.ut_line, - ut.ut_id, ut.ut_user, ut.ut_host, - ut.ut_exit.e_termination, ut.ut_exit.e_exit, - ut.ut_session, - ut.ut_tv.tv_sec, ut.ut_tv.tv_usec, ut.ut_addr); - } - - exit (TRUE); + FILE *f = stdin; + struct utmp ut; + + if ((argc < 2) || (**(argv + 1) == '-')) { + usage(dutmp_usage); + } + + if (**(++argv) == 0) { + f = fopen(*(++argv), "r"); + if (f < 0) { + perror(*argv); + exit(FALSE); + } + } + + while (fread(&ut, 1, sizeof(struct utmp), f)) { + // printf("%d:%d:%s:%s:%s:%s:%d:%d:%ld:%ld:%ld:%x\n", + printf("%d|%d|%s|%s|%s|%s|%d|%d|%ld|%ld|%ld|%x\n", + ut.ut_type, ut.ut_pid, ut.ut_line, + ut.ut_id, ut.ut_user, ut.ut_host, + ut.ut_exit.e_termination, ut.ut_exit.e_exit, + ut.ut_session, + ut.ut_tv.tv_sec, ut.ut_tv.tv_usec, ut.ut_addr); + } + + exit(TRUE); } diff --git a/editors/sed.c b/editors/sed.c index 25777243d..3a7737e2f 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini sed implementation for busybox * @@ -37,27 +38,27 @@ #include <ctype.h> static const char sed_usage[] = - "sed [-n] -e script [file...]\n\n" - "Allowed sed scripts come in the following form:\n" - "\t'ADDR [!] COMMAND'\n\n" - "\twhere address ADDR can be:\n" - "\t NUMBER Match specified line number\n" - "\t $ Match last line\n" - "\t /REGEXP/ Match specified regexp\n" - "\t (! inverts the meaning of the match)\n\n" - "\tand COMMAND can be:\n" - "\t s/regexp/replacement/[igp]\n" - "\t which attempt to match regexp against the pattern space\n" - "\t and if successful replaces the matched portion with replacement.\n\n" - "\t aTEXT\n" - "\t which appends TEXT after the pattern space\n" - "Options:\n" - "-e\tadd the script to the commands to be executed\n" - "-n\tsuppress automatic printing of pattern space\n\n" + "sed [-n] -e script [file...]\n\n" + "Allowed sed scripts come in the following form:\n" + "\t'ADDR [!] COMMAND'\n\n" + "\twhere address ADDR can be:\n" + "\t NUMBER Match specified line number\n" + "\t $ Match last line\n" + "\t /REGEXP/ Match specified regexp\n" + "\t (! inverts the meaning of the match)\n\n" + "\tand COMMAND can be:\n" + "\t s/regexp/replacement/[igp]\n" + "\t which attempt to match regexp against the pattern space\n" + "\t and if successful replaces the matched portion with replacement.\n\n" + "\t aTEXT\n" + "\t which appends TEXT after the pattern space\n" + "Options:\n" + "-e\tadd the script to the commands to be executed\n" + "-n\tsuppress automatic printing of pattern space\n\n" #if defined BB_REGEXP - "This version of sed matches full regular expresions.\n"; + "This version of sed matches full regular expresions.\n"; #else - "This version of sed matches strings (not full regular expresions).\n"; + "This version of sed matches strings (not full regular expresions).\n"; #endif /* Flags & variables */ @@ -76,276 +77,277 @@ static int negated = 0; static inline int at_last(FILE * fp) { - int res = 0; - - if (feof(fp)) - return 1; - else { - char ch; - if ((ch = fgetc(fp)) == EOF) - res++; - ungetc(ch, fp); - } - return res; + int res = 0; + + if (feof(fp)) + return 1; + else { + char ch; + + if ((ch = fgetc(fp)) == EOF) + res++; + ungetc(ch, fp); + } + return res; } static void do_sed_repl(FILE * fp, char *needle, char *newNeedle, - int ignoreCase, int printFlag, int quietFlag) + int ignoreCase, int printFlag, int quietFlag) { - int foundOne = FALSE; - char haystack[BUFSIZE]; - int line = 1, doit; - - while (fgets(haystack, BUFSIZE - 1, fp)) { - doit = 0; - if (addr_pattern) { - doit = !find_match(haystack, addr_pattern, FALSE); - } else if (addr_line == NO_LINE) - doit = 1; - else if (addr_line == LAST_LINE) { - if (at_last(fp)) - doit = 1; - } else { - if (line == addr_line) - doit = 1; - } - if (negated) - doit = 1 - doit; - if (doit) { - foundOne = - replace_match(haystack, needle, newNeedle, ignoreCase); - - if (foundOne == TRUE && printFlag == TRUE) { - fprintf(stdout, haystack); - } - } + int foundOne = FALSE; + char haystack[BUFSIZE]; + int line = 1, doit; + + while (fgets(haystack, BUFSIZE - 1, fp)) { + doit = 0; + if (addr_pattern) { + doit = !find_match(haystack, addr_pattern, FALSE); + } else if (addr_line == NO_LINE) + doit = 1; + else if (addr_line == LAST_LINE) { + if (at_last(fp)) + doit = 1; + } else { + if (line == addr_line) + doit = 1; + } + if (negated) + doit = 1 - doit; + if (doit) { + foundOne = + replace_match(haystack, needle, newNeedle, ignoreCase); + + if (foundOne == TRUE && printFlag == TRUE) { + fprintf(stdout, haystack); + } + } - if (quietFlag == FALSE) { - fprintf(stdout, haystack); - } + if (quietFlag == FALSE) { + fprintf(stdout, haystack); + } - line++; - } + line++; + } } static void do_sed_append(FILE * fp, char *appendline, int quietFlag) { - char buffer[BUFSIZE]; - int line = 1, doit; - - while (fgets(buffer, BUFSIZE - 1, fp)) { - doit = 0; - if (addr_pattern) { - doit = !find_match(buffer, addr_pattern, FALSE); - } else if (addr_line == NO_LINE) - doit = 1; - else if (addr_line == LAST_LINE) { - if (at_last(fp)) - doit = 1; - } else { - if (line == addr_line) - doit = 1; - } - if (negated) - doit = 1 - doit; - if (quietFlag == FALSE) { - fprintf(stdout, buffer); - } - if (doit) { - fputs(appendline, stdout); - fputc('\n', stdout); - } + char buffer[BUFSIZE]; + int line = 1, doit; + + while (fgets(buffer, BUFSIZE - 1, fp)) { + doit = 0; + if (addr_pattern) { + doit = !find_match(buffer, addr_pattern, FALSE); + } else if (addr_line == NO_LINE) + doit = 1; + else if (addr_line == LAST_LINE) { + if (at_last(fp)) + doit = 1; + } else { + if (line == addr_line) + doit = 1; + } + if (negated) + doit = 1 - doit; + if (quietFlag == FALSE) { + fprintf(stdout, buffer); + } + if (doit) { + fputs(appendline, stdout); + fputc('\n', stdout); + } - line++; - } + line++; + } } extern int sed_main(int argc, char **argv) { - FILE *fp; - char *needle = NULL, *newNeedle = NULL; - char *name; - char *cp; - int ignoreCase = FALSE; - int printFlag = FALSE; - int quietFlag = FALSE; - int stopNow; - char *line_s = NULL, saved; - char *appendline = NULL; - char *pos; - sed_function sed_f = f_none; - - argc--; - argv++; - if (argc < 1) { - usage(sed_usage); - } - - if (**argv == '-') { - argc--; - cp = *argv++; - stopNow = FALSE; - - while (*++cp && stopNow == FALSE) { - switch (*cp) { - case 'n': - quietFlag = TRUE; - break; - case 'e': - if (*(cp + 1) == 0 && --argc < 0) { - usage(sed_usage); - } - if (*++cp != 's') - cp = *argv++; - - /* Read address if present */ - SKIPSPACES(cp); - if (*cp == '$') { - addr_line = LAST_LINE; - cp++; - } else { - if (isdigit(*cp)) { /* LINE ADDRESS */ - line_s = cp; - while (isdigit(*cp)) - cp++; - if (cp > line_s) { - /* numeric line */ - saved = *cp; - *cp = '\0'; - addr_line = atoi(line_s); - *cp = saved; - } - } else if (*cp == '/') { /* PATTERN ADDRESS */ - pos = addr_pattern = cp + 1; - pos = strchr(pos, '/'); - if (!pos) - usage(sed_usage); - *pos = '\0'; - cp = pos + 1; - } - } - - SKIPSPACES(cp); - if (*cp == '!') { - negated++; - cp++; - } + FILE *fp; + char *needle = NULL, *newNeedle = NULL; + char *name; + char *cp; + int ignoreCase = FALSE; + int printFlag = FALSE; + int quietFlag = FALSE; + int stopNow; + char *line_s = NULL, saved; + char *appendline = NULL; + char *pos; + sed_function sed_f = f_none; - /* Read command */ + argc--; + argv++; + if (argc < 1) { + usage(sed_usage); + } - SKIPSPACES(cp); - switch (*cp) { - case 's': /* REPLACE */ - if (strlen(cp) <= 3 || *(cp + 1) != '/') - break; - sed_f = f_replace; + if (**argv == '-') { + argc--; + cp = *argv++; + stopNow = FALSE; - pos = needle = cp + 2; + while (*++cp && stopNow == FALSE) { + switch (*cp) { + case 'n': + quietFlag = TRUE; + break; + case 'e': + if (*(cp + 1) == 0 && --argc < 0) { + usage(sed_usage); + } + if (*++cp != 's') + cp = *argv++; + + /* Read address if present */ + SKIPSPACES(cp); + if (*cp == '$') { + addr_line = LAST_LINE; + cp++; + } else { + if (isdigit(*cp)) { /* LINE ADDRESS */ + line_s = cp; + while (isdigit(*cp)) + cp++; + if (cp > line_s) { + /* numeric line */ + saved = *cp; + *cp = '\0'; + addr_line = atoi(line_s); + *cp = saved; + } + } else if (*cp == '/') { /* PATTERN ADDRESS */ + pos = addr_pattern = cp + 1; + pos = strchr(pos, '/'); + if (!pos) + usage(sed_usage); + *pos = '\0'; + cp = pos + 1; + } + } + + SKIPSPACES(cp); + if (*cp == '!') { + negated++; + cp++; + } + + /* Read command */ + + SKIPSPACES(cp); + switch (*cp) { + case 's': /* REPLACE */ + if (strlen(cp) <= 3 || *(cp + 1) != '/') + break; + sed_f = f_replace; + + pos = needle = cp + 2; + + for (;;) { + pos = strchr(pos, '/'); + if (pos == NULL) { + usage(sed_usage); + } + if (*(pos - 1) == '\\') { + pos++; + continue; + } + break; + } + *pos = 0; + newNeedle = ++pos; + for (;;) { + pos = strchr(pos, '/'); + if (pos == NULL) { + usage(sed_usage); + } + if (*(pos - 1) == '\\') { + pos++; + continue; + } + break; + } + *pos = 0; + if (pos + 2 != 0) { + while (*++pos) { + switch (*pos) { + case 'i': + ignoreCase = TRUE; + break; + case 'p': + printFlag = TRUE; + break; + case 'g': + break; + default: + usage(sed_usage); + } + } + } + cp = pos; + /* fprintf(stderr, "replace '%s' with '%s'\n", needle, newNeedle); */ + break; + + case 'a': /* APPEND */ + if (strlen(cp) < 2) + break; + sed_f = f_append; + appendline = ++cp; + /* fprintf(stderr, "append '%s'\n", appendline); */ + break; + } + + stopNow = TRUE; + break; - for (;;) { - pos = strchr(pos, '/'); - if (pos == NULL) { - usage(sed_usage); - } - if (*(pos - 1) == '\\') { - pos++; - continue; + default: + usage(sed_usage); } + } + } + + if (argc == 0) { + switch (sed_f) { + case f_none: break; - } - *pos = 0; - newNeedle = ++pos; - for (;;) { - pos = strchr(pos, '/'); - if (pos == NULL) { - usage(sed_usage); - } - if (*(pos - 1) == '\\') { - pos++; - continue; - } + case f_replace: + do_sed_repl(stdin, needle, newNeedle, ignoreCase, printFlag, + quietFlag); break; - } - *pos = 0; - if (pos + 2 != 0) { - while (*++pos) { - switch (*pos) { - case 'i': - ignoreCase = TRUE; + case f_append: + do_sed_append(stdin, appendline, quietFlag); + break; + } + } else { + while (argc-- > 0) { + name = *argv++; + + fp = fopen(name, "r"); + if (fp == NULL) { + perror(name); + continue; + } + + switch (sed_f) { + case f_none: break; - case 'p': - printFlag = TRUE; + case f_replace: + do_sed_repl(fp, needle, newNeedle, ignoreCase, printFlag, + quietFlag); break; - case 'g': + case f_append: + do_sed_append(fp, appendline, quietFlag); break; - default: - usage(sed_usage); - } } - } - cp = pos; - /* fprintf(stderr, "replace '%s' with '%s'\n", needle, newNeedle); */ - break; - case 'a': /* APPEND */ - if (strlen(cp) < 2) - break; - sed_f = f_append; - appendline = ++cp; - /* fprintf(stderr, "append '%s'\n", appendline); */ - break; - } + if (ferror(fp)) + perror(name); - stopNow = TRUE; - break; - - default: - usage(sed_usage); - } - } - } - - if (argc == 0) { - switch (sed_f) { - case f_none: - break; - case f_replace: - do_sed_repl(stdin, needle, newNeedle, ignoreCase, printFlag, - quietFlag); - break; - case f_append: - do_sed_append(stdin, appendline, quietFlag); - break; - } - } else { - while (argc-- > 0) { - name = *argv++; - - fp = fopen(name, "r"); - if (fp == NULL) { - perror(name); - continue; - } - - switch (sed_f) { - case f_none: - break; - case f_replace: - do_sed_repl(fp, needle, newNeedle, ignoreCase, printFlag, - quietFlag); - break; - case f_append: - do_sed_append(fp, appendline, quietFlag); - break; - } - - if (ferror(fp)) - perror(name); - - fclose(fp); + fclose(fp); + } } - } - exit(TRUE); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini fbset implementation for busybox * @@ -48,7 +49,7 @@ #define OPT_READMODE (1 << 2) #define CMD_HELP 0 -#define CMD_FB 1 +#define CMD_FB 1 #define CMD_DB 2 #define CMD_GEOMETRY 3 #define CMD_TIMING 4 @@ -87,213 +88,242 @@ static unsigned int g_options = 0; struct cmdoptions_t { - char *name; - unsigned char param_count; - unsigned char code; + char *name; + unsigned char param_count; + unsigned char code; } g_cmdoptions[] = { - { "-h", 0, CMD_HELP }, - { "-fb", 1, CMD_FB }, - { "-db", 1, CMD_DB }, - { "-a", 0, CMD_ALL }, - { "-i", 0, CMD_INFO }, - { "-g", 5, CMD_GEOMETRY }, - { "-t", 7, CMD_TIMING }, - { "-accel", 1, CMD_ACCEL }, - { "-hsync", 1, CMD_HSYNC }, - { "-vsync", 1, CMD_VSYNC }, - { "-laced", 1, CMD_LACED }, - { "-double", 1, CMD_DOUBLE }, - + { + "-h", 0, CMD_HELP}, { + "-fb", 1, CMD_FB}, { + "-db", 1, CMD_DB}, { + "-a", 0, CMD_ALL}, { + "-i", 0, CMD_INFO}, { + "-g", 5, CMD_GEOMETRY}, { + "-t", 7, CMD_TIMING}, { + "-accel", 1, CMD_ACCEL}, { + "-hsync", 1, CMD_HSYNC}, { + "-vsync", 1, CMD_VSYNC}, { + "-laced", 1, CMD_LACED}, { + "-double", 1, CMD_DOUBLE}, #ifdef BB_FBSET_FANCY - { "--help", 0, CMD_HELP }, - { "-all", 0, CMD_ALL }, - { "-xres", 1, CMD_XRES }, - { "-yres", 1, CMD_YRES }, - { "-vxres", 1, CMD_VXRES }, - { "-vyres", 1, CMD_VYRES }, - { "-depth", 1, CMD_DEPTH }, - { "-match", 0, CMD_MATCH }, - { "--geometry", 5, CMD_GEOMETRY }, - - { "-pixclock", 1, CMD_PIXCLOCK }, - { "-left", 1, CMD_LEFT }, - { "-right", 1, CMD_RIGHT }, - { "-upper", 1, CMD_UPPER }, - { "-lower", 1, CMD_LOWER }, - { "-hslen", 1, CMD_HSLEN }, - { "-vslen", 1, CMD_VSLEN }, - { "--timings", 7, CMD_TIMING }, - - { "-csync", 1, CMD_CSYNC }, - { "-gsync", 1, CMD_GSYNC }, - { "-extsync", 1, CMD_EXTSYNC }, - { "-bcast", 1, CMD_BCAST }, - { "-rgba", 1, CMD_RGBA }, - { "-step", 1, CMD_STEP }, - { "-move", 1, CMD_MOVE }, + { + "--help", 0, CMD_HELP}, { + "-all", 0, CMD_ALL}, { + "-xres", 1, CMD_XRES}, { + "-yres", 1, CMD_YRES}, { + "-vxres", 1, CMD_VXRES}, { + "-vyres", 1, CMD_VYRES}, { + "-depth", 1, CMD_DEPTH}, { + "-match", 0, CMD_MATCH}, { + "--geometry", 5, CMD_GEOMETRY}, { + "-pixclock", 1, CMD_PIXCLOCK}, { + "-left", 1, CMD_LEFT}, { + "-right", 1, CMD_RIGHT}, { + "-upper", 1, CMD_UPPER}, { + "-lower", 1, CMD_LOWER}, { + "-hslen", 1, CMD_HSLEN}, { + "-vslen", 1, CMD_VSLEN}, { + "--timings", 7, CMD_TIMING}, { + "-csync", 1, CMD_CSYNC}, { + "-gsync", 1, CMD_GSYNC}, { + "-extsync", 1, CMD_EXTSYNC}, { + "-bcast", 1, CMD_BCAST}, { + "-rgba", 1, CMD_RGBA}, { + "-step", 1, CMD_STEP}, { + "-move", 1, CMD_MOVE}, #endif - { 0, 0, 0 } + { + 0, 0, 0} }; static int readmode(struct fb_var_screeninfo *base, const char *fn, - const char *mode) + const char *mode) { #ifdef BB_FBSET_READMODE - FILE *f; - char buf[256]; - char *p = buf; - - if ((f = fopen(fn, "r")) == NULL) PERROR("readmode(fopen)"); - while (!feof(f)) { - fgets(buf, sizeof(buf), f); - if ((p = strstr(buf, "mode ")) || (p = strstr(buf, "mode\t"))) { - p += 5; - if ((p = strstr(buf, mode))) { - p += strlen(mode); - if (!isspace(*p) && (*p != 0) && (*p != '"') && (*p != '\r') - && (*p != '\n')) continue; /* almost, but not quite */ - while (!feof(f)) { - fgets(buf, sizeof(buf), f); - if (!strstr(buf, "endmode")) return 1; + FILE *f; + char buf[256]; + char *p = buf; + + if ((f = fopen(fn, "r")) == NULL) + PERROR("readmode(fopen)"); + while (!feof(f)) { + fgets(buf, sizeof(buf), f); + if ((p = strstr(buf, "mode ")) || (p = strstr(buf, "mode\t"))) { + p += 5; + if ((p = strstr(buf, mode))) { + p += strlen(mode); + if (!isspace(*p) && (*p != 0) && (*p != '"') + && (*p != '\r') && (*p != '\n')) + continue; /* almost, but not quite */ + while (!feof(f)) { + fgets(buf, sizeof(buf), f); + if (!strstr(buf, "endmode")) + return 1; + } + } } - } } - } #else - fprintf(stderr, "W: mode reading was disabled on this copy of fbset; ignoring request\n"); + fprintf(stderr, + "W: mode reading was disabled on this copy of fbset; ignoring request\n"); #endif - return 0; + return 0; } -static void setmode(struct fb_var_screeninfo *base, - struct fb_var_screeninfo *set) +static void setmode(struct fb_var_screeninfo *base, + struct fb_var_screeninfo *set) { - if ((int)set->xres > 0) base->xres = set->xres; - if ((int)set->yres > 0) base->yres = set->yres; - if ((int)set->xres_virtual > 0) base->xres_virtual = set->xres_virtual; - if ((int)set->yres_virtual > 0) base->yres_virtual = set->yres_virtual; - if ((int)set->bits_per_pixel > 0) base->bits_per_pixel = set->bits_per_pixel; + if ((int) set->xres > 0) + base->xres = set->xres; + if ((int) set->yres > 0) + base->yres = set->yres; + if ((int) set->xres_virtual > 0) + base->xres_virtual = set->xres_virtual; + if ((int) set->yres_virtual > 0) + base->yres_virtual = set->yres_virtual; + if ((int) set->bits_per_pixel > 0) + base->bits_per_pixel = set->bits_per_pixel; } static void showmode(struct fb_var_screeninfo *v) { - double drate = 0, hrate = 0, vrate = 0; - if (v->pixclock) { - drate = 1e12 / v->pixclock; - hrate = drate / (v->left_margin+v->xres+v->right_margin+v->hsync_len); - vrate = hrate / (v->upper_margin+v->yres+v->lower_margin+v->vsync_len); - } - printf("\nmode \"%ux%u-%u\"\n", v->xres, v->yres, (int)(vrate+0.5)); + double drate = 0, hrate = 0, vrate = 0; + + if (v->pixclock) { + drate = 1e12 / v->pixclock; + hrate = + drate / (v->left_margin + v->xres + v->right_margin + + v->hsync_len); + vrate = + hrate / (v->upper_margin + v->yres + v->lower_margin + + v->vsync_len); + } + printf("\nmode \"%ux%u-%u\"\n", v->xres, v->yres, (int) (vrate + 0.5)); #ifdef BB_FBSET_FANCY - printf("\t# D: %.3f MHz, H: %.3f kHz, V: %.3f Hz\n", drate/1e6, hrate/1e3, - vrate); + printf("\t# D: %.3f MHz, H: %.3f kHz, V: %.3f Hz\n", drate / 1e6, + hrate / 1e3, vrate); #endif - printf("\tgeometry %u %u %u %u %u\n", v->xres, v->yres, - v->xres_virtual, v->yres_virtual, v->bits_per_pixel); + printf("\tgeometry %u %u %u %u %u\n", v->xres, v->yres, + v->xres_virtual, v->yres_virtual, v->bits_per_pixel); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) - printf("\ttimings %u %u %u %u %u %u %u\n", v->pixclock, v->left_margin, - v->right_margin, v->upper_margin, v->lower_margin, v->hsync_len, - v->vsync_len); - printf("\taccel %s\n", (v->accel_flags > 0 ? "true" : "false")); + printf("\ttimings %u %u %u %u %u %u %u\n", v->pixclock, v->left_margin, + v->right_margin, v->upper_margin, v->lower_margin, v->hsync_len, + v->vsync_len); + printf("\taccel %s\n", (v->accel_flags > 0 ? "true" : "false")); #else - printf("\ttimings %lu %lu %lu %lu %lu %lu %lu\n", v->pixclock, v->left_margin, - v->right_margin, v->upper_margin, v->lower_margin, v->hsync_len, - v->vsync_len); + printf("\ttimings %lu %lu %lu %lu %lu %lu %lu\n", v->pixclock, + v->left_margin, v->right_margin, v->upper_margin, + v->lower_margin, v->hsync_len, v->vsync_len); #endif - printf("\trgba %u/%u,%u/%u,%u/%u,%u/%u\n", v->red.length, v->red.offset, - v->green.length, v->green.offset, v->blue.length, v->blue.offset, - v->transp.length, v->transp.offset); - printf("endmode\n"); + printf("\trgba %u/%u,%u/%u,%u/%u,%u/%u\n", v->red.length, + v->red.offset, v->green.length, v->green.offset, v->blue.length, + v->blue.offset, v->transp.length, v->transp.offset); + printf("endmode\n"); } static void fbset_usage(void) { - int i; + int i; + #ifndef STANDALONE - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", BB_VER, BB_BT); + fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", + BB_VER, BB_BT); #endif - fprintf(stderr, "Usage: fbset [options] [mode]\n"); - fprintf(stderr, "\tThe following options are recognized:\n"); - for (i = 0; g_cmdoptions[i].name; i++) - fprintf(stderr, "\t\t%s\n", g_cmdoptions[i].name); - exit(-1); + fprintf(stderr, "Usage: fbset [options] [mode]\n"); + fprintf(stderr, "\tThe following options are recognized:\n"); + for (i = 0; g_cmdoptions[i].name; i++) + fprintf(stderr, "\t\t%s\n", g_cmdoptions[i].name); + exit(-1); } #ifdef STANDALONE int main(int argc, char **argv) -#else +#else extern int fbset_main(int argc, char **argv) #endif { - struct fb_var_screeninfo var, varset; - int fh, i; - char *fbdev = DEFAULTFBDEV; - char *modefile = DEFAULTFBMODE; - char *thisarg, *mode = NULL; + struct fb_var_screeninfo var, varset; + int fh, i; + char *fbdev = DEFAULTFBDEV; + char *modefile = DEFAULTFBMODE; + char *thisarg, *mode = NULL; + + memset(&varset, 0xFF, sizeof(varset)); - memset(&varset, 0xFF, sizeof(varset)); - - /* parse cmd args.... why do they have to make things so difficult? */ - argv++; argc--; - for (; argc > 0 && (thisarg = *argv); argc--, argv++) { - for (i = 0; g_cmdoptions[i].name; i++) { - if (!strcmp(thisarg, g_cmdoptions[i].name)) { - if (argc - 1 < g_cmdoptions[i].param_count) fbset_usage(); - switch (g_cmdoptions[i].code) { - case CMD_HELP: fbset_usage(); - case CMD_FB: fbdev = argv[1]; break; - case CMD_DB: modefile = argv[1]; break; - case CMD_GEOMETRY: - varset.xres = strtoul(argv[1],0,0); - varset.yres = strtoul(argv[2],0,0); - varset.xres_virtual = strtoul(argv[3],0,0); - varset.yres_virtual = strtoul(argv[4],0,0); - varset.bits_per_pixel = strtoul(argv[5],0,0); - break; - case CMD_TIMING: - varset.pixclock = strtoul(argv[1],0,0); - varset.left_margin = strtoul(argv[2],0,0); - varset.right_margin = strtoul(argv[3],0,0); - varset.upper_margin = strtoul(argv[4],0,0); - varset.lower_margin = strtoul(argv[5],0,0); - varset.hsync_len = strtoul(argv[6],0,0); - varset.vsync_len = strtoul(argv[7],0,0); - break; + /* parse cmd args.... why do they have to make things so difficult? */ + argv++; + argc--; + for (; argc > 0 && (thisarg = *argv); argc--, argv++) { + for (i = 0; g_cmdoptions[i].name; i++) { + if (!strcmp(thisarg, g_cmdoptions[i].name)) { + if (argc - 1 < g_cmdoptions[i].param_count) + fbset_usage(); + switch (g_cmdoptions[i].code) { + case CMD_HELP: + fbset_usage(); + case CMD_FB: + fbdev = argv[1]; + break; + case CMD_DB: + modefile = argv[1]; + break; + case CMD_GEOMETRY: + varset.xres = strtoul(argv[1], 0, 0); + varset.yres = strtoul(argv[2], 0, 0); + varset.xres_virtual = strtoul(argv[3], 0, 0); + varset.yres_virtual = strtoul(argv[4], 0, 0); + varset.bits_per_pixel = strtoul(argv[5], 0, 0); + break; + case CMD_TIMING: + varset.pixclock = strtoul(argv[1], 0, 0); + varset.left_margin = strtoul(argv[2], 0, 0); + varset.right_margin = strtoul(argv[3], 0, 0); + varset.upper_margin = strtoul(argv[4], 0, 0); + varset.lower_margin = strtoul(argv[5], 0, 0); + varset.hsync_len = strtoul(argv[6], 0, 0); + varset.vsync_len = strtoul(argv[7], 0, 0); + break; #ifdef BB_FBSET_FANCY - case CMD_XRES: varset.xres = strtoul(argv[1],0,0); break; - case CMD_YRES: varset.yres = strtoul(argv[1],0,0); break; + case CMD_XRES: + varset.xres = strtoul(argv[1], 0, 0); + break; + case CMD_YRES: + varset.yres = strtoul(argv[1], 0, 0); + break; #endif + } + argc -= g_cmdoptions[i].param_count; + argv += g_cmdoptions[i].param_count; + break; + } + } + if (!g_cmdoptions[i].name) { + if (argc == 1) { + mode = *argv; + g_options |= OPT_READMODE; + } else { + fbset_usage(); + } } - argc -= g_cmdoptions[i].param_count; - argv += g_cmdoptions[i].param_count; - break; - } - } - if (!g_cmdoptions[i].name) { - if (argc == 1) { - mode = *argv; - g_options |= OPT_READMODE; - } else { - fbset_usage(); - } } - } - if ((fh = open(fbdev, O_RDONLY)) < 0) PERROR("fbset(open)"); - if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) PERROR("fbset(ioctl)"); - if (g_options & OPT_READMODE) { - if (!readmode(&var, modefile, mode)) { - fprintf(stderr, "Unknown video mode `%s'\n", mode); - exit(1); + if ((fh = open(fbdev, O_RDONLY)) < 0) + PERROR("fbset(open)"); + if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) + PERROR("fbset(ioctl)"); + if (g_options & OPT_READMODE) { + if (!readmode(&var, modefile, mode)) { + fprintf(stderr, "Unknown video mode `%s'\n", mode); + exit(1); + } } - } - setmode(&var, &varset); - if (g_options & OPT_CHANGE) - if (ioctl(fh, FBIOPUT_VSCREENINFO, &var)) PERROR("fbset(ioctl)"); - showmode(&var); - close(fh); - - return(TRUE); -} + setmode(&var, &varset); + if (g_options & OPT_CHANGE) + if (ioctl(fh, FBIOPUT_VSCREENINFO, &var)) + PERROR("fbset(ioctl)"); + showmode(&var); + close(fh); + return (TRUE); +} @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini fdflush implementation for busybox * @@ -29,24 +30,25 @@ extern int fdflush_main(int argc, char **argv) { - int value; - int fd; - if ( argc <= 1 || **(argv++) == '-' ) { - usage( "fdflush device\n"); - } + int value; + int fd; - fd = open(*argv, 0); - if ( fd < 0 ) { - perror(*argv); - exit(FALSE); - } + if (argc <= 1 || **(argv++) == '-') { + usage("fdflush device\n"); + } - value = ioctl(fd, FDFLUSH, 0); - close(fd); + fd = open(*argv, 0); + if (fd < 0) { + perror(*argv); + exit(FALSE); + } - if ( value ) { - perror(*argv); - exit(FALSE); - } - exit (TRUE); + value = ioctl(fd, FDFLUSH, 0); + close(fd); + + if (value) { + perror(*argv); + exit(FALSE); + } + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini find implementation for busybox * @@ -28,92 +29,95 @@ #include <dirent.h> -static char* pattern=NULL; -static char* directory="."; -static int dereferenceFlag=FALSE; +static char *pattern = NULL; +static char *directory = "."; +static int dereferenceFlag = FALSE; static const char find_usage[] = "find [PATH...] [EXPRESSION]\n\n" -"Search for files in a directory hierarchy. The default PATH is\n" -"the current directory; default EXPRESSION is '-print'\n\n" -"\nEXPRESSION may consist of:\n" -"\t-follow\n\t\tDereference symbolic links.\n" -"\t-name PATTERN\n\t\tFile name (with leading directories removed) matches PATTERN.\n" -"\t-print\n\t\tprint the full file name followed by a newline to stdout.\n\n" + "Search for files in a directory hierarchy. The default PATH is\n" + "the current directory; default EXPRESSION is '-print'\n\n" + "\nEXPRESSION may consist of:\n" + "\t-follow\n\t\tDereference symbolic links.\n" + "\t-name PATTERN\n\t\tFile name (with leading directories removed) matches PATTERN.\n" + "\t-print\n\t\tprint the full file name followed by a newline to stdout.\n\n" #if defined BB_REGEXP -"This version of find matches full regular expresions.\n"; + "This version of find matches full regular expresions.\n"; #else -"This version of find matches strings (not regular expresions).\n"; + "This version of find matches strings (not regular expresions).\n"; #endif -static int fileAction(const char *fileName, struct stat* statbuf) +static int fileAction(const char *fileName, struct stat *statbuf) { - if (pattern==NULL) - fprintf(stdout, "%s\n", fileName); - else { - char* tmp = strrchr( fileName, '/'); - if (tmp == NULL) - tmp = (char*)fileName; - else - tmp++; - if (check_wildcard_match(tmp, pattern) == TRUE) - fprintf(stdout, "%s\n", fileName); - } - return( TRUE); + if (pattern == NULL) + fprintf(stdout, "%s\n", fileName); + else { + char *tmp = strrchr(fileName, '/'); + + if (tmp == NULL) + tmp = (char *) fileName; + else + tmp++; + if (check_wildcard_match(tmp, pattern) == TRUE) + fprintf(stdout, "%s\n", fileName); + } + return (TRUE); } int find_main(int argc, char **argv) { - /* peel off the "find" */ - argc--; - argv++; - - if ( argc > 0 && **argv != '-') { - directory = *argv; + /* peel off the "find" */ argc--; argv++; - } - /* Parse any options */ - while (argc > 0 && **argv == '-') { - int stopit=FALSE; - while (*++(*argv) && stopit==FALSE) switch (**argv) { - case 'f': - if (strcmp(*argv, "follow")==0) { - argc--; - argv++; - dereferenceFlag=TRUE; - } - break; - case 'n': - if (strcmp(*argv, "name")==0) { - if (argc-- > 1) { - pattern = *(++argv); - stopit = TRUE; - } else { - usage (find_usage); - } - } - break; - case '-': - /* Ignore all long options */ - break; - default: - usage (find_usage); + if (argc > 0 && **argv != '-') { + directory = *argv; + argc--; + argv++; } - if (argc-- > 1) - argv++; - if (**argv != '-') - break; - else - break; - } - if (recursiveAction(directory, TRUE, FALSE, FALSE, - fileAction, fileAction) == FALSE) { - exit( FALSE); - } + /* Parse any options */ + while (argc > 0 && **argv == '-') { + int stopit = FALSE; + + while (*++(*argv) && stopit == FALSE) + switch (**argv) { + case 'f': + if (strcmp(*argv, "follow") == 0) { + argc--; + argv++; + dereferenceFlag = TRUE; + } + break; + case 'n': + if (strcmp(*argv, "name") == 0) { + if (argc-- > 1) { + pattern = *(++argv); + stopit = TRUE; + } else { + usage(find_usage); + } + } + break; + case '-': + /* Ignore all long options */ + break; + default: + usage(find_usage); + } + if (argc-- > 1) + argv++; + if (**argv != '-') + break; + else + break; + } + + if (recursiveAction(directory, TRUE, FALSE, FALSE, + fileAction, fileAction) == FALSE) { + exit(FALSE); + } - exit(TRUE); + exit(TRUE); } diff --git a/findutils/find.c b/findutils/find.c index 50872b7f1..6346d454f 100644 --- a/findutils/find.c +++ b/findutils/find.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini find implementation for busybox * @@ -28,92 +29,95 @@ #include <dirent.h> -static char* pattern=NULL; -static char* directory="."; -static int dereferenceFlag=FALSE; +static char *pattern = NULL; +static char *directory = "."; +static int dereferenceFlag = FALSE; static const char find_usage[] = "find [PATH...] [EXPRESSION]\n\n" -"Search for files in a directory hierarchy. The default PATH is\n" -"the current directory; default EXPRESSION is '-print'\n\n" -"\nEXPRESSION may consist of:\n" -"\t-follow\n\t\tDereference symbolic links.\n" -"\t-name PATTERN\n\t\tFile name (with leading directories removed) matches PATTERN.\n" -"\t-print\n\t\tprint the full file name followed by a newline to stdout.\n\n" + "Search for files in a directory hierarchy. The default PATH is\n" + "the current directory; default EXPRESSION is '-print'\n\n" + "\nEXPRESSION may consist of:\n" + "\t-follow\n\t\tDereference symbolic links.\n" + "\t-name PATTERN\n\t\tFile name (with leading directories removed) matches PATTERN.\n" + "\t-print\n\t\tprint the full file name followed by a newline to stdout.\n\n" #if defined BB_REGEXP -"This version of find matches full regular expresions.\n"; + "This version of find matches full regular expresions.\n"; #else -"This version of find matches strings (not regular expresions).\n"; + "This version of find matches strings (not regular expresions).\n"; #endif -static int fileAction(const char *fileName, struct stat* statbuf) +static int fileAction(const char *fileName, struct stat *statbuf) { - if (pattern==NULL) - fprintf(stdout, "%s\n", fileName); - else { - char* tmp = strrchr( fileName, '/'); - if (tmp == NULL) - tmp = (char*)fileName; - else - tmp++; - if (check_wildcard_match(tmp, pattern) == TRUE) - fprintf(stdout, "%s\n", fileName); - } - return( TRUE); + if (pattern == NULL) + fprintf(stdout, "%s\n", fileName); + else { + char *tmp = strrchr(fileName, '/'); + + if (tmp == NULL) + tmp = (char *) fileName; + else + tmp++; + if (check_wildcard_match(tmp, pattern) == TRUE) + fprintf(stdout, "%s\n", fileName); + } + return (TRUE); } int find_main(int argc, char **argv) { - /* peel off the "find" */ - argc--; - argv++; - - if ( argc > 0 && **argv != '-') { - directory = *argv; + /* peel off the "find" */ argc--; argv++; - } - /* Parse any options */ - while (argc > 0 && **argv == '-') { - int stopit=FALSE; - while (*++(*argv) && stopit==FALSE) switch (**argv) { - case 'f': - if (strcmp(*argv, "follow")==0) { - argc--; - argv++; - dereferenceFlag=TRUE; - } - break; - case 'n': - if (strcmp(*argv, "name")==0) { - if (argc-- > 1) { - pattern = *(++argv); - stopit = TRUE; - } else { - usage (find_usage); - } - } - break; - case '-': - /* Ignore all long options */ - break; - default: - usage (find_usage); + if (argc > 0 && **argv != '-') { + directory = *argv; + argc--; + argv++; } - if (argc-- > 1) - argv++; - if (**argv != '-') - break; - else - break; - } - if (recursiveAction(directory, TRUE, FALSE, FALSE, - fileAction, fileAction) == FALSE) { - exit( FALSE); - } + /* Parse any options */ + while (argc > 0 && **argv == '-') { + int stopit = FALSE; + + while (*++(*argv) && stopit == FALSE) + switch (**argv) { + case 'f': + if (strcmp(*argv, "follow") == 0) { + argc--; + argv++; + dereferenceFlag = TRUE; + } + break; + case 'n': + if (strcmp(*argv, "name") == 0) { + if (argc-- > 1) { + pattern = *(++argv); + stopit = TRUE; + } else { + usage(find_usage); + } + } + break; + case '-': + /* Ignore all long options */ + break; + default: + usage(find_usage); + } + if (argc-- > 1) + argv++; + if (**argv != '-') + break; + else + break; + } + + if (recursiveAction(directory, TRUE, FALSE, FALSE, + fileAction, fileAction) == FALSE) { + exit(FALSE); + } - exit(TRUE); + exit(TRUE); } diff --git a/findutils/grep.c b/findutils/grep.c index 287d9f80d..d8d2f1837 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini grep implementation for busybox * @@ -40,126 +41,125 @@ #include <ctype.h> static const char grep_usage[] = -"grep [OPTIONS]... PATTERN [FILE]...\n\n" -"Search for PATTERN in each FILE or standard input.\n\n" -"OPTIONS:\n" -"\t-h\tsuppress the prefixing filename on output\n" -"\t-i\tignore case distinctions\n" -"\t-n\tprint line number with output lines\n" -"\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n\n" + "grep [OPTIONS]... PATTERN [FILE]...\n\n" + "Search for PATTERN in each FILE or standard input.\n\n" + "OPTIONS:\n" + "\t-h\tsuppress the prefixing filename on output\n" + "\t-i\tignore case distinctions\n" + "\t-n\tprint line number with output lines\n" + "\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n\n" #if defined BB_REGEXP -"This version of grep matches full regular expresions.\n"; + "This version of grep matches full regular expresions.\n"; #else -"This version of grep matches strings (not regular expresions).\n"; + "This version of grep matches strings (not regular expresions).\n"; #endif static int match = FALSE, beQuiet = FALSE; -static void do_grep(FILE *fp, char* needle, char *fileName, int tellName, int ignoreCase, int tellLine) +static void do_grep(FILE * fp, char *needle, char *fileName, int tellName, + int ignoreCase, int tellLine) { - char *cp; - long line = 0; - char haystack[BUF_SIZE]; + char *cp; + long line = 0; + char haystack[BUF_SIZE]; - while (fgets (haystack, sizeof (haystack), fp)) { - line++; - cp = &haystack[strlen (haystack) - 1]; + while (fgets(haystack, sizeof(haystack), fp)) { + line++; + cp = &haystack[strlen(haystack) - 1]; - if (*cp != '\n') - fprintf (stderr, "%s: Line too long\n", fileName); + if (*cp != '\n') + fprintf(stderr, "%s: Line too long\n", fileName); - if (find_match(haystack, needle, ignoreCase) == TRUE) { - if (tellName==TRUE) - printf ("%s:", fileName); + if (find_match(haystack, needle, ignoreCase) == TRUE) { + if (tellName == TRUE) + printf("%s:", fileName); - if (tellLine==TRUE) - printf ("%ld:", line); + if (tellLine == TRUE) + printf("%ld:", line); - if (beQuiet==FALSE) - fputs (haystack, stdout); + if (beQuiet == FALSE) + fputs(haystack, stdout); - match = TRUE; + match = TRUE; + } } - } } -extern int grep_main (int argc, char **argv) +extern int grep_main(int argc, char **argv) { - FILE *fp; - char *cp; - char *needle; - char *fileName; - int tellName=TRUE; - int ignoreCase=TRUE; - int tellLine=FALSE; + FILE *fp; + char *cp; + char *needle; + char *fileName; + int tellName = TRUE; + int ignoreCase = TRUE; + int tellLine = FALSE; - ignoreCase = FALSE; - tellLine = FALSE; + ignoreCase = FALSE; + tellLine = FALSE; - argc--; - argv++; - if (argc < 1) { - usage(grep_usage); - } - - if (**argv == '-') { argc--; - cp = *argv++; + argv++; + if (argc < 1) { + usage(grep_usage); + } - while (*++cp) - switch (*cp) { - case 'i': - ignoreCase = TRUE; - break; + if (**argv == '-') { + argc--; + cp = *argv++; - case 'h': - tellName = FALSE; - break; + while (*++cp) + switch (*cp) { + case 'i': + ignoreCase = TRUE; + break; - case 'n': - tellLine = TRUE; - break; + case 'h': + tellName = FALSE; + break; - case 'q': - beQuiet = TRUE; - break; + case 'n': + tellLine = TRUE; + break; - default: - usage(grep_usage); - } - } - - needle = *argv++; - argc--; - - if (argc==0) { - do_grep( stdin, needle, "stdin", FALSE, ignoreCase, tellLine); - } else { - /* Never print the filename for just one file */ - if (argc==1) - tellName=FALSE; - while (argc-- > 0) { - fileName = *argv++; - - fp = fopen (fileName, "r"); - if (fp == NULL) { - perror (fileName); - continue; - } - - do_grep( fp, needle, fileName, tellName, ignoreCase, tellLine); - - if (ferror (fp)) - perror (fileName); - fclose (fp); + case 'q': + beQuiet = TRUE; + break; + + default: + usage(grep_usage); + } } - } - exit(match); -} + needle = *argv++; + argc--; -/* END CODE */ + if (argc == 0) { + do_grep(stdin, needle, "stdin", FALSE, ignoreCase, tellLine); + } else { + /* Never print the filename for just one file */ + if (argc == 1) + tellName = FALSE; + while (argc-- > 0) { + fileName = *argv++; + + fp = fopen(fileName, "r"); + if (fp == NULL) { + perror(fileName); + continue; + } + + do_grep(fp, needle, fileName, tellName, ignoreCase, tellLine); + + if (ferror(fp)) + perror(fileName); + fclose(fp); + } + } + exit(match); +} +/* END CODE */ @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini free implementation for busybox * @@ -30,6 +31,7 @@ extern int free_main(int argc, char **argv) { - char* cmd[] = { "cat", "/proc/meminfo", "\0" }; - exit(cat_main( 3, cmd)); + char *cmd[] = { "cat", "/proc/meminfo", "\0" }; + + exit(cat_main(3, cmd)); } diff --git a/fsck_minix.c b/fsck_minix.c index 09111c5dc..084c76d36 100644 --- a/fsck_minix.c +++ b/fsck_minix.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * fsck.c - a file system consistency checker for Linux. * @@ -96,7 +97,7 @@ #include <termios.h> #include <mntent.h> #include <sys/stat.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ #include <linux/fs.h> #include <linux/minix_fs.h> @@ -124,17 +125,17 @@ #define BITS_PER_BLOCK (BLOCK_SIZE<<3) -static char * program_name = "fsck.minix"; -static char * program_version = "1.2 - 11/11/96"; -static char * device_name = NULL; +static char *program_name = "fsck.minix"; +static char *program_version = "1.2 - 11/11/96"; +static char *device_name = NULL; static int IN; -static int repair=0, automatic=0, verbose=0, list=0, show=0, warn_mode=0, - force=0; -static int directory=0, regular=0, blockdev=0, chardev=0, links=0, - symlinks=0, total=0; +static int repair = 0, automatic = 0, verbose = 0, list = 0, show = + 0, warn_mode = 0, force = 0; +static int directory = 0, regular = 0, blockdev = 0, chardev = 0, links = + 0, symlinks = 0, total = 0; -static int changed = 0; /* flags if the filesystem has been changed */ -static int errors_uncorrected = 0; /* flag if some error was not corrected */ +static int changed = 0; /* flags if the filesystem has been changed */ +static int errors_uncorrected = 0; /* flag if some error was not corrected */ static int dirsize = 16; static int namelen = 14; static int version2 = 0; @@ -146,10 +147,12 @@ static int termios_set = 0; static int name_depth = 0; static char name_list[MAX_DEPTH][PATH_MAX + 1]; -static char * inode_buffer = NULL; +static char *inode_buffer = NULL; + #define Inode (((struct minix_inode *) inode_buffer)-1) #define Inode2 (((struct minix2_inode *) inode_buffer)-1) static char super_block_buffer[BLOCK_SIZE]; + #define Super (*(struct minix_super_block *)super_block_buffer) #define INODES ((unsigned long)Super.s_ninodes) #ifdef HAVE_MINIX2 @@ -168,8 +171,8 @@ static char super_block_buffer[BLOCK_SIZE]; static char *inode_map; static char *zone_map; -static unsigned char * inode_count = NULL; -static unsigned char * zone_count = NULL; +static unsigned char *inode_count = NULL; +static unsigned char *zone_count = NULL; static void recursive_check(unsigned int ino); static void recursive_check2(unsigned int ino); @@ -191,22 +194,27 @@ static void leave(int status) exit(status); } -static void show_usage(void) { - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", BB_VER, BB_BT); +static void show_usage(void) +{ + fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", + BB_VER, BB_BT); fprintf(stderr, "Usage: %s [-larvsmf] /dev/name\n\n", program_name); - fprintf(stderr, "Performs a consistency check for MINIX filesystems.\n\n"); + fprintf(stderr, + "Performs a consistency check for MINIX filesystems.\n\n"); fprintf(stderr, "OPTIONS:\n"); fprintf(stderr, "\t-l\tLists all filenames\n"); fprintf(stderr, "\t-r\tPerform interactive repairs\n"); fprintf(stderr, "\t-a\tPerform automatic repairs\n"); fprintf(stderr, "\t-v\tverbose\n"); fprintf(stderr, "\t-s\tOutputs super-block information\n"); - fprintf(stderr, "\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"); + fprintf(stderr, + "\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"); fprintf(stderr, "\t-f\tForce file system check.\n\n"); leave(16); } -static void die(const char *str) { +static void die(const char *str) +{ fprintf(stderr, "%s: %s\n", program_name, str); leave(8); } @@ -217,15 +225,15 @@ static void die(const char *str) { */ static void print_current_name(void) { - int i=0; + int i = 0; - while (i<name_depth) - printf("/%.*s",namelen,name_list[i++]); + while (i < name_depth) + printf("/%.*s", namelen, name_list[i++]); if (i == 0) - printf ("/"); + printf("/"); } -static int ask(const char * string, int def) +static int ask(const char *string, int def) { int c; @@ -237,18 +245,18 @@ static int ask(const char * string, int def) if (automatic) { printf("\n"); if (!def) - errors_uncorrected = 1; + errors_uncorrected = 1; return def; } - printf(def?"%s (y/n)? ":"%s (n/y)? ",string); + printf(def ? "%s (y/n)? " : "%s (n/y)? ", string); for (;;) { fflush(stdout); - if ((c=getchar())==EOF) { - if (!def) - errors_uncorrected = 1; + if ((c = getchar()) == EOF) { + if (!def) + errors_uncorrected = 1; return def; } - c=toupper(c); + c = toupper(c); if (c == 'Y') { def = 1; break; @@ -263,7 +271,7 @@ static int ask(const char * string, int def) else { printf("n\n"); errors_uncorrected = 1; - } + } return def; } @@ -274,17 +282,17 @@ static int ask(const char * string, int def) */ static void check_mount(void) { - FILE * f; - struct mntent * mnt; + FILE *f; + struct mntent *mnt; int cont; int fd; - if ((f = setmntent (MOUNTED, "r")) == NULL) + if ((f = setmntent(MOUNTED, "r")) == NULL) return; - while ((mnt = getmntent (f)) != NULL) - if (strcmp (device_name, mnt->mnt_fsname) == 0) + while ((mnt = getmntent(f)) != NULL) + if (strcmp(device_name, mnt->mnt_fsname) == 0) break; - endmntent (f); + endmntent(f); if (!mnt) return; @@ -298,15 +306,15 @@ static void check_mount(void) return; else close(fd); - - printf ("%s is mounted. ", device_name); + + printf("%s is mounted. ", device_name); if (isatty(0) && isatty(1)) cont = ask("Do you really want to continue", 0); else cont = 0; if (!cont) { - printf ("check aborted.\n"); - exit (0); + printf("check aborted.\n"); + exit(0); } return; } @@ -317,7 +325,7 @@ static void check_mount(void) * if an error was corrected, and returns the zone (0 for no zone * or a bad zone-number). */ -static int check_zone_nr(unsigned short * nr, int * corrected) +static int check_zone_nr(unsigned short *nr, int *corrected) { if (!*nr) return 0; @@ -329,7 +337,7 @@ static int check_zone_nr(unsigned short * nr, int * corrected) return *nr; print_current_name(); printf("'."); - if (ask("Remove block",1)) { + if (ask("Remove block", 1)) { *nr = 0; *corrected = 1; } @@ -337,19 +345,19 @@ static int check_zone_nr(unsigned short * nr, int * corrected) } #ifdef HAVE_MINIX2 -static int check_zone_nr2 (unsigned int *nr, int *corrected) +static int check_zone_nr2(unsigned int *nr, int *corrected) { if (!*nr) return 0; if (*nr < FIRSTZONE) - printf ("Zone nr < FIRSTZONE in file `"); + printf("Zone nr < FIRSTZONE in file `"); else if (*nr >= ZONES) - printf ("Zone nr >= ZONES in file `"); + printf("Zone nr >= ZONES in file `"); else return *nr; - print_current_name (); - printf ("'."); - if (ask ("Remove block", 1)) { + print_current_name(); + printf("'."); + if (ask("Remove block", 1)) { *nr = 0; *corrected = 1; } @@ -360,23 +368,23 @@ static int check_zone_nr2 (unsigned int *nr, int *corrected) /* * read-block reads block nr into the buffer at addr. */ -static void read_block(unsigned int nr, char * addr) +static void read_block(unsigned int nr, char *addr) { if (!nr) { - memset(addr,0,BLOCK_SIZE); + memset(addr, 0, BLOCK_SIZE); return; } - if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET)) { + if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) { printf("Read error: unable to seek to block in file '"); print_current_name(); printf("'\n"); - memset(addr,0,BLOCK_SIZE); + memset(addr, 0, BLOCK_SIZE); errors_uncorrected = 1; } else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) { printf("Read error: bad block in file '"); print_current_name(); printf("'\n"); - memset(addr,0,BLOCK_SIZE); + memset(addr, 0, BLOCK_SIZE); errors_uncorrected = 1; } } @@ -384,17 +392,17 @@ static void read_block(unsigned int nr, char * addr) /* * write_block writes block nr to disk. */ -static void write_block(unsigned int nr, char * addr) +static void write_block(unsigned int nr, char *addr) { if (!nr) return; if (nr < FIRSTZONE || nr >= ZONES) { printf("Internal error: trying to write bad block\n" - "Write request ignored\n"); + "Write request ignored\n"); errors_uncorrected = 1; return; } - if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET)) + if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) die("seek failed in write_block"); if (BLOCK_SIZE != write(IN, addr, BLOCK_SIZE)) { printf("Write error: bad block in file '"); @@ -409,16 +417,16 @@ static void write_block(unsigned int nr, char * addr) * It sets 'changed' if the inode has needed changing, and re-writes * any indirect blocks with errors. */ -static int map_block(struct minix_inode * inode, unsigned int blknr) +static int map_block(struct minix_inode *inode, unsigned int blknr) { - unsigned short ind[BLOCK_SIZE>>1]; - unsigned short dind[BLOCK_SIZE>>1]; + unsigned short ind[BLOCK_SIZE >> 1]; + unsigned short dind[BLOCK_SIZE >> 1]; int blk_chg, block, result; - if (blknr<7) + if (blknr < 7) return check_zone_nr(inode->i_zone + blknr, &changed); blknr -= 7; - if (blknr<512) { + if (blknr < 512) { block = check_zone_nr(inode->i_zone + 7, &changed); read_block(block, (char *) ind); blk_chg = 0; @@ -431,73 +439,73 @@ static int map_block(struct minix_inode * inode, unsigned int blknr) block = check_zone_nr(inode->i_zone + 8, &changed); read_block(block, (char *) dind); blk_chg = 0; - result = check_zone_nr(dind + (blknr/512), &blk_chg); + result = check_zone_nr(dind + (blknr / 512), &blk_chg); if (blk_chg) write_block(block, (char *) dind); block = result; read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr(ind + (blknr%512), &blk_chg); + result = check_zone_nr(ind + (blknr % 512), &blk_chg); if (blk_chg) write_block(block, (char *) ind); return result; } #ifdef HAVE_MINIX2 -static int map_block2 (struct minix2_inode *inode, unsigned int blknr) +static int map_block2(struct minix2_inode *inode, unsigned int blknr) { - unsigned int ind[BLOCK_SIZE >> 2]; + unsigned int ind[BLOCK_SIZE >> 2]; unsigned int dind[BLOCK_SIZE >> 2]; unsigned int tind[BLOCK_SIZE >> 2]; int blk_chg, block, result; if (blknr < 7) - return check_zone_nr2 (inode->i_zone + blknr, &changed); + return check_zone_nr2(inode->i_zone + blknr, &changed); blknr -= 7; if (blknr < 256) { - block = check_zone_nr2 (inode->i_zone + 7, &changed); - read_block (block, (char *) ind); + block = check_zone_nr2(inode->i_zone + 7, &changed); + read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr2 (blknr + ind, &blk_chg); + result = check_zone_nr2(blknr + ind, &blk_chg); if (blk_chg) - write_block (block, (char *) ind); + write_block(block, (char *) ind); return result; } blknr -= 256; if (blknr >= 256 * 256) { - block = check_zone_nr2 (inode->i_zone + 8, &changed); - read_block (block, (char *) dind); + block = check_zone_nr2(inode->i_zone + 8, &changed); + read_block(block, (char *) dind); blk_chg = 0; - result = check_zone_nr2 (dind + blknr / 256, &blk_chg); + result = check_zone_nr2(dind + blknr / 256, &blk_chg); if (blk_chg) - write_block (block, (char *) dind); + write_block(block, (char *) dind); block = result; - read_block (block, (char *) ind); + read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr2 (ind + blknr % 256, &blk_chg); + result = check_zone_nr2(ind + blknr % 256, &blk_chg); if (blk_chg) - write_block (block, (char *) ind); + write_block(block, (char *) ind); return result; } blknr -= 256 * 256; - block = check_zone_nr2 (inode->i_zone + 9, &changed); - read_block (block, (char *) tind); + block = check_zone_nr2(inode->i_zone + 9, &changed); + read_block(block, (char *) tind); blk_chg = 0; - result = check_zone_nr2 (tind + blknr / (256 * 256), &blk_chg); + result = check_zone_nr2(tind + blknr / (256 * 256), &blk_chg); if (blk_chg) - write_block (block, (char *) tind); + write_block(block, (char *) tind); block = result; - read_block (block, (char *) dind); + read_block(block, (char *) dind); blk_chg = 0; - result = check_zone_nr2 (dind + (blknr / 256) % 256, &blk_chg); + result = check_zone_nr2(dind + (blknr / 256) % 256, &blk_chg); if (blk_chg) - write_block (block, (char *) dind); + write_block(block, (char *) dind); block = result; - read_block (block, (char *) ind); + read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr2 (ind + blknr % 256, &blk_chg); + result = check_zone_nr2(ind + blknr % 256, &blk_chg); if (blk_chg) - write_block (block, (char *) ind); + write_block(block, (char *) ind); return result; } #endif @@ -510,11 +518,11 @@ static void write_super_block(void) * unconditionally set if we get this far. */ Super.s_state |= MINIX_VALID_FS; - if ( errors_uncorrected ) + if (errors_uncorrected) Super.s_state |= MINIX_ERROR_FS; else Super.s_state &= ~MINIX_ERROR_FS; - + if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET)) die("seek failed in write_super_block"); if (BLOCK_SIZE != write(IN, super_block_buffer, BLOCK_SIZE)) @@ -527,15 +535,15 @@ static void write_tables(void) { write_super_block(); - if (IMAPS*BLOCK_SIZE != write(IN,inode_map,IMAPS*BLOCK_SIZE)) + if (IMAPS * BLOCK_SIZE != write(IN, inode_map, IMAPS * BLOCK_SIZE)) die("Unable to write inode map"); - if (ZMAPS*BLOCK_SIZE != write(IN,zone_map,ZMAPS*BLOCK_SIZE)) + if (ZMAPS * BLOCK_SIZE != write(IN, zone_map, ZMAPS * BLOCK_SIZE)) die("Unable to write zone map"); - if (INODE_BUFFER_SIZE != write(IN,inode_buffer,INODE_BUFFER_SIZE)) + if (INODE_BUFFER_SIZE != write(IN, inode_buffer, INODE_BUFFER_SIZE)) die("Unable to write inodes"); } -static void get_dirsize (void) +static void get_dirsize(void) { int block; char blk[BLOCK_SIZE]; @@ -547,9 +555,9 @@ static void get_dirsize (void) else #endif block = Inode[ROOT_INO].i_zone[0]; - read_block (block, blk); + read_block(block, blk); for (size = 16; size < BLOCK_SIZE; size <<= 1) { - if (strcmp (blk + size + 2, "..") == 0) { + if (strcmp(blk + size + 2, "..") == 0) { dirsize = size; namelen = size - 2; return; @@ -600,8 +608,8 @@ static void read_tables(void) zone_map = malloc(ZMAPS * BLOCK_SIZE); if (!inode_map) die("Unable to allocate buffer for zone map"); - memset(inode_map,0,sizeof(inode_map)); - memset(zone_map,0,sizeof(zone_map)); + memset(inode_map, 0, sizeof(inode_map)); + memset(zone_map, 0, sizeof(zone_map)); inode_buffer = malloc(INODE_BUFFER_SIZE); if (!inode_buffer) die("Unable to allocate buffer for inodes"); @@ -611,31 +619,31 @@ static void read_tables(void) zone_count = malloc(ZONES); if (!zone_count) die("Unable to allocate buffer for zone count"); - if (IMAPS*BLOCK_SIZE != read(IN,inode_map,IMAPS*BLOCK_SIZE)) + if (IMAPS * BLOCK_SIZE != read(IN, inode_map, IMAPS * BLOCK_SIZE)) die("Unable to read inode map"); - if (ZMAPS*BLOCK_SIZE != read(IN,zone_map,ZMAPS*BLOCK_SIZE)) + if (ZMAPS * BLOCK_SIZE != read(IN, zone_map, ZMAPS * BLOCK_SIZE)) die("Unable to read zone map"); - if (INODE_BUFFER_SIZE != read(IN,inode_buffer,INODE_BUFFER_SIZE)) + if (INODE_BUFFER_SIZE != read(IN, inode_buffer, INODE_BUFFER_SIZE)) die("Unable to read inodes"); if (NORM_FIRSTZONE != FIRSTZONE) { printf("Warning: Firstzone != Norm_firstzone\n"); errors_uncorrected = 1; } - get_dirsize (); + get_dirsize(); if (show) { - printf("%ld inodes\n",INODES); - printf("%ld blocks\n",ZONES); - printf("Firstdatazone=%ld (%ld)\n",FIRSTZONE,NORM_FIRSTZONE); - printf("Zonesize=%d\n",BLOCK_SIZE<<ZONESIZE); - printf("Maxsize=%ld\n",MAXSIZE); + printf("%ld inodes\n", INODES); + printf("%ld blocks\n", ZONES); + printf("Firstdatazone=%ld (%ld)\n", FIRSTZONE, NORM_FIRSTZONE); + printf("Zonesize=%d\n", BLOCK_SIZE << ZONESIZE); + printf("Maxsize=%ld\n", MAXSIZE); printf("Filesystem state=%d\n", Super.s_state); - printf("namelen=%d\n\n",namelen); + printf("namelen=%d\n\n", namelen); } } -struct minix_inode * get_inode(unsigned int nr) +struct minix_inode *get_inode(unsigned int nr) { - struct minix_inode * inode; + struct minix_inode *inode; if (!nr || nr > INODES) return NULL; @@ -643,15 +651,14 @@ struct minix_inode * get_inode(unsigned int nr) inode = Inode + nr; if (!inode_count[nr]) { if (!inode_in_use(nr)) { - printf("Inode %d marked not used, but used for file '", - nr); + printf("Inode %d marked not used, but used for file '", nr); print_current_name(); printf("'\n"); if (repair) { - if (ask("Mark in use",1)) + if (ask("Mark in use", 1)) mark_inode(nr); } else { - errors_uncorrected = 1; + errors_uncorrected = 1; } } if (S_ISDIR(inode->i_mode)) @@ -664,14 +671,12 @@ struct minix_inode * get_inode(unsigned int nr) blockdev++; else if (S_ISLNK(inode->i_mode)) symlinks++; - else if (S_ISSOCK(inode->i_mode)) - ; - else if (S_ISFIFO(inode->i_mode)) - ; + else if (S_ISSOCK(inode->i_mode)); + else if (S_ISFIFO(inode->i_mode)); else { - print_current_name(); - printf(" has mode %05o\n",inode->i_mode); - } + print_current_name(); + printf(" has mode %05o\n", inode->i_mode); + } } else links++; @@ -684,8 +689,7 @@ struct minix_inode * get_inode(unsigned int nr) } #ifdef HAVE_MINIX2 -struct minix2_inode * -get_inode2 (unsigned int nr) +struct minix2_inode *get_inode2(unsigned int nr) { struct minix2_inode *inode; @@ -694,37 +698,37 @@ get_inode2 (unsigned int nr) total++; inode = Inode2 + nr; if (!inode_count[nr]) { - if (!inode_in_use (nr)) { - printf ("Inode %d marked not used, but used for file '", nr); - print_current_name (); - printf ("'\n"); + if (!inode_in_use(nr)) { + printf("Inode %d marked not used, but used for file '", nr); + print_current_name(); + printf("'\n"); if (repair) { - if (ask ("Mark in use", 1)) - mark_inode (nr); + if (ask("Mark in use", 1)) + mark_inode(nr); else errors_uncorrected = 1; } } - if (S_ISDIR (inode->i_mode)) + if (S_ISDIR(inode->i_mode)) directory++; - else if (S_ISREG (inode->i_mode)) + else if (S_ISREG(inode->i_mode)) regular++; - else if (S_ISCHR (inode->i_mode)) + else if (S_ISCHR(inode->i_mode)) chardev++; - else if (S_ISBLK (inode->i_mode)) + else if (S_ISBLK(inode->i_mode)) blockdev++; - else if (S_ISLNK (inode->i_mode)) + else if (S_ISLNK(inode->i_mode)) symlinks++; - else if (S_ISSOCK (inode->i_mode)); - else if (S_ISFIFO (inode->i_mode)); + else if (S_ISSOCK(inode->i_mode)); + else if (S_ISFIFO(inode->i_mode)); else { - print_current_name (); - printf (" has mode %05o\n", inode->i_mode); + print_current_name(); + printf(" has mode %05o\n", inode->i_mode); } } else links++; if (!++inode_count[nr]) { - printf ("Warning: inode count too big.\n"); + printf("Warning: inode count too big.\n"); inode_count[nr]--; errors_uncorrected = 1; } @@ -734,23 +738,23 @@ get_inode2 (unsigned int nr) static void check_root(void) { - struct minix_inode * inode = Inode + ROOT_INO; + struct minix_inode *inode = Inode + ROOT_INO; if (!inode || !S_ISDIR(inode->i_mode)) die("root inode isn't a directory"); } #ifdef HAVE_MINIX2 -static void check_root2 (void) +static void check_root2(void) { struct minix2_inode *inode = Inode2 + ROOT_INO; - if (!inode || !S_ISDIR (inode->i_mode)) - die ("root inode isn't a directory"); + if (!inode || !S_ISDIR(inode->i_mode)) + die("root inode isn't a directory"); } #endif -static int add_zone(unsigned short * znr, int * corrected) +static int add_zone(unsigned short *znr, int *corrected) { int result; int block; @@ -763,7 +767,7 @@ static int add_zone(unsigned short * znr, int * corrected) printf("Block has been used before. Now in file `"); print_current_name(); printf("'."); - if (ask("Clear",1)) { + if (ask("Clear", 1)) { *znr = 0; block = 0; *corrected = 1; @@ -772,10 +776,10 @@ static int add_zone(unsigned short * znr, int * corrected) if (!block) return 0; if (!zone_in_use(block)) { - printf("Block %d in file `",block); + printf("Block %d in file `", block); print_current_name(); printf("' is marked not in use."); - if (ask("Correct",1)) + if (ask("Correct", 1)) mark_zone(block); } if (!++zone_count[block]) @@ -784,20 +788,20 @@ static int add_zone(unsigned short * znr, int * corrected) } #ifdef HAVE_MINIX2 -static int add_zone2 (unsigned int *znr, int *corrected) +static int add_zone2(unsigned int *znr, int *corrected) { int result; int block; result = 0; - block = check_zone_nr2 (znr, corrected); + block = check_zone_nr2(znr, corrected); if (!block) return 0; if (zone_count[block]) { - printf ("Block has been used before. Now in file `"); - print_current_name (); - printf ("'."); - if (ask ("Clear", 1)) { + printf("Block has been used before. Now in file `"); + print_current_name(); + printf("'."); + if (ask("Clear", 1)) { *znr = 0; block = 0; *corrected = 1; @@ -805,12 +809,12 @@ static int add_zone2 (unsigned int *znr, int *corrected) } if (!block) return 0; - if (!zone_in_use (block)) { - printf ("Block %d in file `", block); - print_current_name (); - printf ("' is marked not in use."); - if (ask ("Correct", 1)) - mark_zone (block); + if (!zone_in_use(block)) { + printf("Block %d in file `", block); + print_current_name(); + printf("' is marked not in use."); + if (ask("Correct", 1)) + mark_zone(block); } if (!++zone_count[block]) zone_count[block]--; @@ -818,182 +822,179 @@ static int add_zone2 (unsigned int *znr, int *corrected) } #endif -static void add_zone_ind(unsigned short * znr, int * corrected) +static void add_zone_ind(unsigned short *znr, int *corrected) { static char blk[BLOCK_SIZE]; - int i, chg_blk=0; + int i, chg_blk = 0; int block; block = add_zone(znr, corrected); if (!block) return; read_block(block, blk); - for (i=0 ; i < (BLOCK_SIZE>>1) ; i++) + for (i = 0; i < (BLOCK_SIZE >> 1); i++) add_zone(i + (unsigned short *) blk, &chg_blk); if (chg_blk) write_block(block, blk); } #ifdef HAVE_MINIX2 -static void -add_zone_ind2 (unsigned int *znr, int *corrected) +static void add_zone_ind2(unsigned int *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, chg_blk = 0; int block; - block = add_zone2 (znr, corrected); + block = add_zone2(znr, corrected); if (!block) return; - read_block (block, blk); + read_block(block, blk); for (i = 0; i < BLOCK_SIZE >> 2; i++) - add_zone2 (i + (unsigned int *) blk, &chg_blk); + add_zone2(i + (unsigned int *) blk, &chg_blk); if (chg_blk) - write_block (block, blk); + write_block(block, blk); } #endif -static void add_zone_dind(unsigned short * znr, int * corrected) +static void add_zone_dind(unsigned short *znr, int *corrected) { static char blk[BLOCK_SIZE]; - int i, blk_chg=0; + int i, blk_chg = 0; int block; block = add_zone(znr, corrected); if (!block) return; read_block(block, blk); - for (i=0 ; i < (BLOCK_SIZE>>1) ; i++) + for (i = 0; i < (BLOCK_SIZE >> 1); i++) add_zone_ind(i + (unsigned short *) blk, &blk_chg); if (blk_chg) write_block(block, blk); } #ifdef HAVE_MINIX2 -static void -add_zone_dind2 (unsigned int *znr, int *corrected) +static void add_zone_dind2(unsigned int *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, blk_chg = 0; int block; - block = add_zone2 (znr, corrected); + block = add_zone2(znr, corrected); if (!block) return; - read_block (block, blk); + read_block(block, blk); for (i = 0; i < BLOCK_SIZE >> 2; i++) - add_zone_ind2 (i + (unsigned int *) blk, &blk_chg); + add_zone_ind2(i + (unsigned int *) blk, &blk_chg); if (blk_chg) - write_block (block, blk); + write_block(block, blk); } -static void -add_zone_tind2 (unsigned int *znr, int *corrected) +static void add_zone_tind2(unsigned int *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, blk_chg = 0; int block; - block = add_zone2 (znr, corrected); + block = add_zone2(znr, corrected); if (!block) return; - read_block (block, blk); + read_block(block, blk); for (i = 0; i < BLOCK_SIZE >> 2; i++) - add_zone_dind2 (i + (unsigned int *) blk, &blk_chg); + add_zone_dind2(i + (unsigned int *) blk, &blk_chg); if (blk_chg) - write_block (block, blk); + write_block(block, blk); } #endif static void check_zones(unsigned int i) { - struct minix_inode * inode; + struct minix_inode *inode; if (!i || i > INODES) return; - if (inode_count[i] > 1) /* have we counted this file already? */ + if (inode_count[i] > 1) /* have we counted this file already? */ return; inode = Inode + i; if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) && - !S_ISLNK(inode->i_mode)) - return; - for (i=0 ; i<7 ; i++) + !S_ISLNK(inode->i_mode)) return; + for (i = 0; i < 7; i++) add_zone(i + inode->i_zone, &changed); add_zone_ind(7 + inode->i_zone, &changed); add_zone_dind(8 + inode->i_zone, &changed); } #ifdef HAVE_MINIX2 -static void -check_zones2 (unsigned int i) +static void check_zones2(unsigned int i) { struct minix2_inode *inode; if (!i || i > INODES) return; - if (inode_count[i] > 1) /* have we counted this file already? */ + if (inode_count[i] > 1) /* have we counted this file already? */ return; inode = Inode2 + i; - if (!S_ISDIR (inode->i_mode) && !S_ISREG (inode->i_mode) - && !S_ISLNK (inode->i_mode)) + if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) + && !S_ISLNK(inode->i_mode)) return; for (i = 0; i < 7; i++) - add_zone2 (i + inode->i_zone, &changed); - add_zone_ind2 (7 + inode->i_zone, &changed); - add_zone_dind2 (8 + inode->i_zone, &changed); - add_zone_tind2 (9 + inode->i_zone, &changed); + add_zone2(i + inode->i_zone, &changed); + add_zone_ind2(7 + inode->i_zone, &changed); + add_zone_dind2(8 + inode->i_zone, &changed); + add_zone_tind2(9 + inode->i_zone, &changed); } #endif -static void check_file(struct minix_inode * dir, unsigned int offset) +static void check_file(struct minix_inode *dir, unsigned int offset) { static char blk[BLOCK_SIZE]; - struct minix_inode * inode; + struct minix_inode *inode; int ino; - char * name; + char *name; int block; - block = map_block(dir,offset/BLOCK_SIZE); + block = map_block(dir, offset / BLOCK_SIZE); read_block(block, blk); name = blk + (offset % BLOCK_SIZE) + 2; - ino = * (unsigned short *) (name-2); + ino = *(unsigned short *) (name - 2); if (ino > INODES) { print_current_name(); printf(" contains a bad inode number for file '"); - printf("%.*s'.",namelen,name); - if (ask(" Remove",1)) { - *(unsigned short *)(name-2) = 0; + printf("%.*s'.", namelen, name); + if (ask(" Remove", 1)) { + *(unsigned short *) (name - 2) = 0; write_block(block, blk); } ino = 0; - } + } if (name_depth < MAX_DEPTH) - strncpy (name_list[name_depth], name, namelen); + strncpy(name_list[name_depth], name, namelen); name_depth++; inode = get_inode(ino); name_depth--; if (!offset) { - if (!inode || strcmp(".",name)) { + if (!inode || strcmp(".", name)) { print_current_name(); printf(": bad directory: '.' isn't first\n"); errors_uncorrected = 1; - } else return; + } else + return; } if (offset == dirsize) { - if (!inode || strcmp("..",name)) { + if (!inode || strcmp("..", name)) { print_current_name(); printf(": bad directory: '..' isn't second\n"); errors_uncorrected = 1; - } else return; + } else + return; } if (!inode) return; if (name_depth < MAX_DEPTH) - strncpy(name_list[name_depth],name,namelen); - name_depth++; + strncpy(name_list[name_depth], name, namelen); + name_depth++; if (list) { if (verbose) - printf("%6d %07o %3d ",ino,inode->i_mode,inode->i_nlinks); + printf("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); print_current_name(); if (S_ISDIR(inode->i_mode)) printf(":\n"); @@ -1008,8 +1009,7 @@ static void check_file(struct minix_inode * dir, unsigned int offset) } #ifdef HAVE_MINIX2 -static void -check_file2 (struct minix2_inode *dir, unsigned int offset) +static void check_file2(struct minix2_inode *dir, unsigned int offset) { static char blk[BLOCK_SIZE]; struct minix2_inode *inode; @@ -1017,37 +1017,37 @@ check_file2 (struct minix2_inode *dir, unsigned int offset) char *name; int block; - block = map_block2 (dir, offset / BLOCK_SIZE); - read_block (block, blk); + block = map_block2(dir, offset / BLOCK_SIZE); + read_block(block, blk); name = blk + (offset % BLOCK_SIZE) + 2; ino = *(unsigned short *) (name - 2); if (ino > INODES) { - print_current_name (); - printf (" contains a bad inode number for file '"); - printf ("%.*s'.", namelen, name); - if (ask (" Remove", 1)) { + print_current_name(); + printf(" contains a bad inode number for file '"); + printf("%.*s'.", namelen, name); + if (ask(" Remove", 1)) { *(unsigned short *) (name - 2) = 0; - write_block (block, blk); + write_block(block, blk); } ino = 0; } if (name_depth < MAX_DEPTH) - strncpy (name_list[name_depth], name, namelen); + strncpy(name_list[name_depth], name, namelen); name_depth++; - inode = get_inode2 (ino); + inode = get_inode2(ino); name_depth--; if (!offset) { - if (!inode || strcmp (".", name)) { - print_current_name (); - printf (": bad directory: '.' isn't first\n"); + if (!inode || strcmp(".", name)) { + print_current_name(); + printf(": bad directory: '.' isn't first\n"); errors_uncorrected = 1; } else return; } if (offset == dirsize) { - if (!inode || strcmp ("..", name)) { - print_current_name (); - printf (": bad directory: '..' isn't second\n"); + if (!inode || strcmp("..", name)) { + print_current_name(); + printf(": bad directory: '..' isn't second\n"); errors_uncorrected = 1; } else return; @@ -1057,16 +1057,16 @@ check_file2 (struct minix2_inode *dir, unsigned int offset) name_depth++; if (list) { if (verbose) - printf ("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); - print_current_name (); - if (S_ISDIR (inode->i_mode)) - printf (":\n"); + printf("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); + print_current_name(); + if (S_ISDIR(inode->i_mode)) + printf(":\n"); else - printf ("\n"); + printf("\n"); } - check_zones2 (ino); - if (inode && S_ISDIR (inode->i_mode)) - recursive_check2 (ino); + check_zones2(ino); + if (inode && S_ISDIR(inode->i_mode)) + recursive_check2(ino); name_depth--; return; } @@ -1074,7 +1074,7 @@ check_file2 (struct minix2_inode *dir, unsigned int offset) static void recursive_check(unsigned int ino) { - struct minix_inode * dir; + struct minix_inode *dir; unsigned int offset; dir = Inode + ino; @@ -1085,27 +1085,26 @@ static void recursive_check(unsigned int ino) printf(": bad directory: size<32"); errors_uncorrected = 1; } - for (offset = 0 ; offset < dir->i_size ; offset += dirsize) - check_file(dir,offset); + for (offset = 0; offset < dir->i_size; offset += dirsize) + check_file(dir, offset); } #ifdef HAVE_MINIX2 -static void -recursive_check2 (unsigned int ino) +static void recursive_check2(unsigned int ino) { struct minix2_inode *dir; unsigned int offset; dir = Inode2 + ino; - if (!S_ISDIR (dir->i_mode)) - die ("internal error"); + if (!S_ISDIR(dir->i_mode)) + die("internal error"); if (dir->i_size < 2 * dirsize) { - print_current_name (); - printf (": bad directory: size < 32"); + print_current_name(); + printf(": bad directory: size < 32"); errors_uncorrected = 1; } for (offset = 0; offset < dir->i_size; offset += dirsize) - check_file2 (dir, offset); + check_file2(dir, offset); } #endif @@ -1113,7 +1112,7 @@ static int bad_zone(int i) { char buffer[1024]; - if (BLOCK_SIZE*i != lseek(IN, BLOCK_SIZE*i, SEEK_SET)) + if (BLOCK_SIZE * i != lseek(IN, BLOCK_SIZE * i, SEEK_SET)) die("seek failed in bad_zone"); return (BLOCK_SIZE != read(IN, buffer, BLOCK_SIZE)); } @@ -1122,10 +1121,10 @@ static void check_counts(void) { int i; - for (i=1 ; i <= INODES ; i++) { + for (i = 1; i <= INODES; i++) { if (!inode_in_use(i) && Inode[i].i_mode && warn_mode) { - printf("Inode %d mode not cleared.",i); - if (ask("Clear",1)) { + printf("Inode %d mode not cleared.", i); + if (ask("Clear", 1)) { Inode[i].i_mode = 0; changed = 1; } @@ -1133,117 +1132,115 @@ static void check_counts(void) if (!inode_count[i]) { if (!inode_in_use(i)) continue; - printf("Inode %d not used, marked used in the bitmap.",i); - if (ask("Clear",1)) + printf("Inode %d not used, marked used in the bitmap.", i); + if (ask("Clear", 1)) unmark_inode(i); continue; } if (!inode_in_use(i)) { printf("Inode %d used, marked unused in the bitmap.", i); - if (ask("Set",1)) + if (ask("Set", 1)) mark_inode(i); } if (Inode[i].i_nlinks != inode_count[i]) { printf("Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", - i,Inode[i].i_mode,Inode[i].i_nlinks,inode_count[i]); - if (ask("Set i_nlinks to count",1)) { - Inode[i].i_nlinks=inode_count[i]; - changed=1; + i, Inode[i].i_mode, Inode[i].i_nlinks, inode_count[i]); + if (ask("Set i_nlinks to count", 1)) { + Inode[i].i_nlinks = inode_count[i]; + changed = 1; } } } - for (i=FIRSTZONE ; i < ZONES ; i++) { + for (i = FIRSTZONE; i < ZONES; i++) { if (zone_in_use(i) == zone_count[i]) continue; if (!zone_count[i]) { if (bad_zone(i)) continue; - printf("Zone %d: marked in use, no file uses it.",i); - if (ask("Unmark",1)) + printf("Zone %d: marked in use, no file uses it.", i); + if (ask("Unmark", 1)) unmark_zone(i); continue; } - printf("Zone %d: %sin use, counted=%d\n", - i,zone_in_use(i)?"":"not ",zone_count[i]); + printf("Zone %d: %sin use, counted=%d\n", + i, zone_in_use(i) ? "" : "not ", zone_count[i]); } } #ifdef HAVE_MINIX2 -static void -check_counts2 (void) +static void check_counts2(void) { int i; for (i = 1; i <= INODES; i++) { - if (!inode_in_use (i) && Inode2[i].i_mode && warn_mode) { - printf ("Inode %d mode not cleared.", i); - if (ask ("Clear", 1)) { + if (!inode_in_use(i) && Inode2[i].i_mode && warn_mode) { + printf("Inode %d mode not cleared.", i); + if (ask("Clear", 1)) { Inode2[i].i_mode = 0; changed = 1; } } if (!inode_count[i]) { - if (!inode_in_use (i)) + if (!inode_in_use(i)) continue; - printf ("Inode %d not used, marked used in the bitmap.", i); - if (ask ("Clear", 1)) - unmark_inode (i); + printf("Inode %d not used, marked used in the bitmap.", i); + if (ask("Clear", 1)) + unmark_inode(i); continue; } - if (!inode_in_use (i)) { - printf ("Inode %d used, marked unused in the bitmap.", i); - if (ask ("Set", 1)) - mark_inode (i); + if (!inode_in_use(i)) { + printf("Inode %d used, marked unused in the bitmap.", i); + if (ask("Set", 1)) + mark_inode(i); } if (Inode2[i].i_nlinks != inode_count[i]) { - printf ("Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", - i, Inode2[i].i_mode, Inode2[i].i_nlinks, inode_count[i]); - if (ask ("Set i_nlinks to count", 1)) { + printf("Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", + i, Inode2[i].i_mode, Inode2[i].i_nlinks, + inode_count[i]); + if (ask("Set i_nlinks to count", 1)) { Inode2[i].i_nlinks = inode_count[i]; changed = 1; } } } for (i = FIRSTZONE; i < ZONES; i++) { - if (zone_in_use (i) == zone_count[i]) + if (zone_in_use(i) == zone_count[i]) continue; if (!zone_count[i]) { - if (bad_zone (i)) + if (bad_zone(i)) continue; - printf ("Zone %d: marked in use, no file uses it.", i); - if (ask ("Unmark", 1)) - unmark_zone (i); + printf("Zone %d: marked in use, no file uses it.", i); + if (ask("Unmark", 1)) + unmark_zone(i); continue; } - printf ("Zone %d: %sin use, counted=%d\n", - i, zone_in_use (i) ? "" : "not ", zone_count[i]); + printf("Zone %d: %sin use, counted=%d\n", + i, zone_in_use(i) ? "" : "not ", zone_count[i]); } } #endif static void check(void) { - memset(inode_count,0,(INODES + 1) * sizeof(*inode_count)); - memset(zone_count,0,ZONES*sizeof(*zone_count)); + memset(inode_count, 0, (INODES + 1) * sizeof(*inode_count)); + memset(zone_count, 0, ZONES * sizeof(*zone_count)); check_zones(ROOT_INO); recursive_check(ROOT_INO); check_counts(); } #ifdef HAVE_MINIX2 -static void -check2 (void) +static void check2(void) { - memset (inode_count, 0, (INODES + 1) * sizeof (*inode_count)); - memset (zone_count, 0, ZONES * sizeof (*zone_count)); - check_zones2 (ROOT_INO); - recursive_check2 (ROOT_INO); - check_counts2 (); + memset(inode_count, 0, (INODES + 1) * sizeof(*inode_count)); + memset(zone_count, 0, ZONES * sizeof(*zone_count)); + check_zones2(ROOT_INO); + recursive_check2(ROOT_INO); + check_counts2(); } #endif -extern int -fsck_minix_main(int argc, char ** argv) +extern int fsck_minix_main(int argc, char **argv) { struct termios tmp; int count; @@ -1264,29 +1261,47 @@ fsck_minix_main(int argc, char ** argv) show_usage(); else device_name = argv[0]; - } else while (*++argv[0]) - switch (argv[0][0]) { - case 'l': list=1; break; - case 'a': automatic=1; repair=1; break; - case 'r': automatic=0; repair=1; break; - case 'v': verbose=1; break; - case 's': show=1; break; - case 'm': warn_mode=1; break; - case 'f': force=1; break; - default: show_usage(); - } + } else + while (*++argv[0]) + switch (argv[0][0]) { + case 'l': + list = 1; + break; + case 'a': + automatic = 1; + repair = 1; + break; + case 'r': + automatic = 0; + repair = 1; + break; + case 'v': + verbose = 1; + break; + case 's': + show = 1; + break; + case 'm': + warn_mode = 1; + break; + case 'f': + force = 1; + break; + default: + show_usage(); + } } if (!device_name) show_usage(); - check_mount(); /* trying to check a mounted filesystem? */ + check_mount(); /* trying to check a mounted filesystem? */ if (repair && !automatic) { if (!isatty(0) || !isatty(1)) die("need terminal for interactive repairs"); } - IN = open(device_name,repair?O_RDWR:O_RDONLY); + IN = open(device_name, repair ? O_RDWR : O_RDONLY); if (IN < 0) die("unable to open '%s'"); - for (count=0 ; count<3 ; count++) + for (count = 0; count < 3; count++) sync(); read_superblock(); @@ -1297,80 +1312,77 @@ fsck_minix_main(int argc, char ** argv) * command line. */ printf("%s, %s\n", program_name, program_version); - if ( !(Super.s_state & MINIX_ERROR_FS) && - (Super.s_state & MINIX_VALID_FS) && - !force ) { + if (!(Super.s_state & MINIX_ERROR_FS) && + (Super.s_state & MINIX_VALID_FS) && !force) { if (repair) printf("%s is clean, no check.\n", device_name); return retcode; - } - else if (force) + } else if (force) printf("Forcing filesystem check on %s.\n", device_name); else if (repair) - printf("Filesystem on %s is dirty, needs checking.\n",\ - device_name); + printf("Filesystem on %s is dirty, needs checking.\n", + device_name); read_tables(); if (repair && !automatic) { - tcgetattr(0,&termios); + tcgetattr(0, &termios); tmp = termios; - tmp.c_lflag &= ~(ICANON|ECHO); - tcsetattr(0,TCSANOW,&tmp); + tmp.c_lflag &= ~(ICANON | ECHO); + tcsetattr(0, TCSANOW, &tmp); termios_set = 1; } - #if HAVE_MINIX2 if (version2) { - check_root2 (); - check2 (); - } else + check_root2(); + check2(); + } else #endif - { + { check_root(); check(); } if (verbose) { int i, free; - for (i=1,free=0 ; i <= INODES ; i++) + for (i = 1, free = 0; i <= INODES; i++) if (!inode_in_use(i)) free++; - printf("\n%6ld inodes used (%ld%%)\n",(INODES-free), - 100*(INODES-free)/INODES); - for (i=FIRSTZONE,free=0 ; i < ZONES ; i++) + printf("\n%6ld inodes used (%ld%%)\n", (INODES - free), + 100 * (INODES - free) / INODES); + for (i = FIRSTZONE, free = 0; i < ZONES; i++) if (!zone_in_use(i)) free++; - printf("%6ld zones used (%ld%%)\n",(ZONES-free), - 100*(ZONES-free)/ZONES); + printf("%6ld zones used (%ld%%)\n", (ZONES - free), + 100 * (ZONES - free) / ZONES); printf("\n%6d regular files\n" - "%6d directories\n" - "%6d character device files\n" - "%6d block device files\n" - "%6d links\n" - "%6d symbolic links\n" - "------\n" - "%6d files\n", - regular,directory,chardev,blockdev, - links-2*directory+1,symlinks,total-2*directory+1); + "%6d directories\n" + "%6d character device files\n" + "%6d block device files\n" + "%6d links\n" + "%6d symbolic links\n" + "------\n" + "%6d files\n", + regular, directory, chardev, blockdev, + links - 2 * directory + 1, symlinks, + total - 2 * directory + 1); } if (changed) { write_tables(); - printf( "----------------------------\n" - "FILE SYSTEM HAS BEEN CHANGED\n" - "----------------------------\n"); - for (count=0 ; count<3 ; count++) + printf("----------------------------\n" + "FILE SYSTEM HAS BEEN CHANGED\n" + "----------------------------\n"); + for (count = 0; count < 3; count++) sync(); - } - else if ( repair ) + } else if (repair) write_super_block(); - + if (repair && !automatic) - tcsetattr(0,TCSANOW,&termios); + tcsetattr(0, TCSANOW, &termios); if (changed) - retcode += 3; + retcode += 3; if (errors_uncorrected) - retcode += 4; + retcode += 4; return retcode; } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini grep implementation for busybox * @@ -40,126 +41,125 @@ #include <ctype.h> static const char grep_usage[] = -"grep [OPTIONS]... PATTERN [FILE]...\n\n" -"Search for PATTERN in each FILE or standard input.\n\n" -"OPTIONS:\n" -"\t-h\tsuppress the prefixing filename on output\n" -"\t-i\tignore case distinctions\n" -"\t-n\tprint line number with output lines\n" -"\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n\n" + "grep [OPTIONS]... PATTERN [FILE]...\n\n" + "Search for PATTERN in each FILE or standard input.\n\n" + "OPTIONS:\n" + "\t-h\tsuppress the prefixing filename on output\n" + "\t-i\tignore case distinctions\n" + "\t-n\tprint line number with output lines\n" + "\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n\n" #if defined BB_REGEXP -"This version of grep matches full regular expresions.\n"; + "This version of grep matches full regular expresions.\n"; #else -"This version of grep matches strings (not regular expresions).\n"; + "This version of grep matches strings (not regular expresions).\n"; #endif static int match = FALSE, beQuiet = FALSE; -static void do_grep(FILE *fp, char* needle, char *fileName, int tellName, int ignoreCase, int tellLine) +static void do_grep(FILE * fp, char *needle, char *fileName, int tellName, + int ignoreCase, int tellLine) { - char *cp; - long line = 0; - char haystack[BUF_SIZE]; + char *cp; + long line = 0; + char haystack[BUF_SIZE]; - while (fgets (haystack, sizeof (haystack), fp)) { - line++; - cp = &haystack[strlen (haystack) - 1]; + while (fgets(haystack, sizeof(haystack), fp)) { + line++; + cp = &haystack[strlen(haystack) - 1]; - if (*cp != '\n') - fprintf (stderr, "%s: Line too long\n", fileName); + if (*cp != '\n') + fprintf(stderr, "%s: Line too long\n", fileName); - if (find_match(haystack, needle, ignoreCase) == TRUE) { - if (tellName==TRUE) - printf ("%s:", fileName); + if (find_match(haystack, needle, ignoreCase) == TRUE) { + if (tellName == TRUE) + printf("%s:", fileName); - if (tellLine==TRUE) - printf ("%ld:", line); + if (tellLine == TRUE) + printf("%ld:", line); - if (beQuiet==FALSE) - fputs (haystack, stdout); + if (beQuiet == FALSE) + fputs(haystack, stdout); - match = TRUE; + match = TRUE; + } } - } } -extern int grep_main (int argc, char **argv) +extern int grep_main(int argc, char **argv) { - FILE *fp; - char *cp; - char *needle; - char *fileName; - int tellName=TRUE; - int ignoreCase=TRUE; - int tellLine=FALSE; + FILE *fp; + char *cp; + char *needle; + char *fileName; + int tellName = TRUE; + int ignoreCase = TRUE; + int tellLine = FALSE; - ignoreCase = FALSE; - tellLine = FALSE; + ignoreCase = FALSE; + tellLine = FALSE; - argc--; - argv++; - if (argc < 1) { - usage(grep_usage); - } - - if (**argv == '-') { argc--; - cp = *argv++; + argv++; + if (argc < 1) { + usage(grep_usage); + } - while (*++cp) - switch (*cp) { - case 'i': - ignoreCase = TRUE; - break; + if (**argv == '-') { + argc--; + cp = *argv++; - case 'h': - tellName = FALSE; - break; + while (*++cp) + switch (*cp) { + case 'i': + ignoreCase = TRUE; + break; - case 'n': - tellLine = TRUE; - break; + case 'h': + tellName = FALSE; + break; - case 'q': - beQuiet = TRUE; - break; + case 'n': + tellLine = TRUE; + break; - default: - usage(grep_usage); - } - } - - needle = *argv++; - argc--; - - if (argc==0) { - do_grep( stdin, needle, "stdin", FALSE, ignoreCase, tellLine); - } else { - /* Never print the filename for just one file */ - if (argc==1) - tellName=FALSE; - while (argc-- > 0) { - fileName = *argv++; - - fp = fopen (fileName, "r"); - if (fp == NULL) { - perror (fileName); - continue; - } - - do_grep( fp, needle, fileName, tellName, ignoreCase, tellLine); - - if (ferror (fp)) - perror (fileName); - fclose (fp); + case 'q': + beQuiet = TRUE; + break; + + default: + usage(grep_usage); + } } - } - exit(match); -} + needle = *argv++; + argc--; -/* END CODE */ + if (argc == 0) { + do_grep(stdin, needle, "stdin", FALSE, ignoreCase, tellLine); + } else { + /* Never print the filename for just one file */ + if (argc == 1) + tellName = FALSE; + while (argc-- > 0) { + fileName = *argv++; + + fp = fopen(fileName, "r"); + if (fp == NULL) { + perror(fileName); + continue; + } + + do_grep(fp, needle, fileName, tellName, ignoreCase, tellLine); + + if (ferror(fp)) + perror(fileName); + fclose(fp); + } + } + exit(match); +} +/* END CODE */ @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* zcat : stripped version based on gzip sources Sven Rudolph <sr1@inf.tu-dresden.de> */ @@ -8,11 +9,12 @@ #include "messages.c" static const char gunzip_usage[] = - "gunzip [OPTION]... FILE\n\n" - "Uncompress FILE (or standard input if FILE is '-').\n\n" - "Options:\n" - "\t-c\tWrite output to standard output\n" - "\t-t\tTest compressed file integrity\n"; + "gunzip [OPTION]... FILE\n\n" + "Uncompress FILE (or standard input if FILE is '-').\n\n" + "Options:\n" + + "\t-c\tWrite output to standard output\n" + "\t-t\tTest compressed file integrity\n"; /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface * Copyright (C) 1992-1993 Jean-loup Gailly @@ -26,22 +28,23 @@ static const char gunzip_usage[] = */ #if 0 -static char *license_msg[] = { -" Copyright (C) 1992-1993 Jean-loup Gailly", -" 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", -" the Free Software Foundation; either version 2, or (at your option)", -" any later version.", -"", -" This program is distributed in the hope that it will be useful,", -" but WITHOUT ANY WARRANTY; without even the implied warranty of", -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the", -" GNU General Public License for more details.", -"", -" You should have received a copy of the GNU General Public License", -" along with this program; if not, write to the Free Software", -" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.", -0}; +static char *license_msg[] = { + " Copyright (C) 1992-1993 Jean-loup Gailly", + " 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", + " the Free Software Foundation; either version 2, or (at your option)", + " any later version.", + "", + " This program is distributed in the hope that it will be useful,", + " but WITHOUT ANY WARRANTY; without even the implied warranty of", + " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the", + " GNU General Public License for more details.", + "", + " You should have received a copy of the GNU General Public License", + " along with this program; if not, write to the Free Software", + " Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.", + 0 +}; #endif /* Compress files with zip algorithm and 'compress' interface. @@ -67,7 +70,7 @@ static char *license_msg[] = { #include <signal.h> #include <sys/stat.h> #include <errno.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ /* #include "tailor.h" */ @@ -101,9 +104,9 @@ static char *license_msg[] = { #endif #ifdef __STDC__ - typedef void *voidp; +typedef void *voidp; #else - typedef char *voidp; +typedef char *voidp; #endif /* I don't like nested includes, but the string and io functions are used @@ -118,10 +121,10 @@ static char *license_msg[] = { # define memzero(s, n) memset ((voidp)(s), 0, (n)) #else # include <strings.h> -# define strchr index +# define strchr index # define strrchr rindex -# define memcpy(d, s, n) bcopy((s), (d), (n)) -# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) +# define memcpy(d, s, n) bcopy((s), (d), (n)) +# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) # define memzero(s, n) bzero((s), (n)) #endif @@ -131,9 +134,9 @@ static char *license_msg[] = { #define local static -typedef unsigned char uch; +typedef unsigned char uch; typedef unsigned short ush; -typedef unsigned long ulg; +typedef unsigned long ulg; /* Return codes from gzip */ #define OK 0 @@ -143,7 +146,7 @@ typedef unsigned long ulg; /* Compression methods (see algorithm.doc) */ #define DEFLATED 8 -extern int method; /* compression method */ +extern int method; /* compression method */ /* To save memory for 16 bit systems, some arrays are overlaid between * the various modules: @@ -158,29 +161,29 @@ extern int method; /* compression method */ #ifndef INBUFSIZ # ifdef SMALL_MEM -# define INBUFSIZ 0x2000 /* input buffer size */ +# define INBUFSIZ 0x2000 /* input buffer size */ # else -# define INBUFSIZ 0x8000 /* input buffer size */ +# define INBUFSIZ 0x8000 /* input buffer size */ # endif #endif -#define INBUF_EXTRA 64 /* required by unlzw() */ +#define INBUF_EXTRA 64 /* required by unlzw() */ #ifndef OUTBUFSIZ # ifdef SMALL_MEM -# define OUTBUFSIZ 8192 /* output buffer size */ +# define OUTBUFSIZ 8192 /* output buffer size */ # else -# define OUTBUFSIZ 16384 /* output buffer size */ +# define OUTBUFSIZ 16384 /* output buffer size */ # endif #endif -#define OUTBUF_EXTRA 2048 /* required by unlzw() */ +#define OUTBUF_EXTRA 2048 /* required by unlzw() */ #define SMALL_MEM #ifndef DIST_BUFSIZE # ifdef SMALL_MEM -# define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */ +# define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */ # else -# define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */ +# define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */ # endif #endif @@ -201,50 +204,51 @@ extern int method; /* compression method */ # define FREE(array) #endif -EXTERN(uch, inbuf); /* input buffer */ -EXTERN(uch, outbuf); /* output buffer */ -EXTERN(ush, d_buf); /* buffer for distances, see trees.c */ -EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ +EXTERN(uch, inbuf); /* input buffer */ +EXTERN(uch, outbuf); /* output buffer */ +EXTERN(ush, d_buf); /* buffer for distances, see trees.c */ +EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ #define tab_suffix window #ifndef MAXSEG_64K -# define tab_prefix prev /* hash link (see deflate.c) */ -# define head (prev+WSIZE) /* hash head (see deflate.c) */ - EXTERN(ush, tab_prefix); /* prefix code (see unlzw.c) */ +# define tab_prefix prev /* hash link (see deflate.c) */ +# define head (prev+WSIZE) /* hash head (see deflate.c) */ +EXTERN(ush, tab_prefix); /* prefix code (see unlzw.c) */ #else # define tab_prefix0 prev # define head tab_prefix1 - EXTERN(ush, tab_prefix0); /* prefix for even codes */ - EXTERN(ush, tab_prefix1); /* prefix for odd codes */ +EXTERN(ush, tab_prefix0); /* prefix for even codes */ +EXTERN(ush, tab_prefix1); /* prefix for odd codes */ #endif -extern unsigned insize; /* valid bytes in inbuf */ -extern unsigned inptr; /* index of next byte to be processed in inbuf */ -extern unsigned outcnt; /* bytes in output buffer */ +extern unsigned insize; /* valid bytes in inbuf */ +extern unsigned inptr; /* index of next byte to be processed in inbuf */ +extern unsigned outcnt; /* bytes in output buffer */ + +extern long bytes_in; /* number of input bytes */ +extern long bytes_out; /* number of output bytes */ +extern long header_bytes; /* number of bytes in gzip header */ -extern long bytes_in; /* number of input bytes */ -extern long bytes_out; /* number of output bytes */ -extern long header_bytes;/* number of bytes in gzip header */ +extern long ifile_size; /* input file size, -1 for devices (debug only) */ -extern long ifile_size; /* input file size, -1 for devices (debug only) */ +typedef int file_t; /* Do not use stdio */ -typedef int file_t; /* Do not use stdio */ -#define NO_FILE (-1) /* in memory compression */ +#define NO_FILE (-1) /* in memory compression */ -#define GZIP_MAGIC "\037\213" /* Magic header for gzip files, 1F 8B */ +#define GZIP_MAGIC "\037\213" /* Magic header for gzip files, 1F 8B */ /* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ -#define RESERVED 0xC0 /* bit 6,7: reserved */ +#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ +#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ +#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ +#define COMMENT 0x10 /* bit 4 set: file comment present */ +#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ +#define RESERVED 0xC0 /* bit 6,7: reserved */ #ifndef WSIZE -# define WSIZE 0x8000 /* window size--must be a power of two, and */ -#endif /* at least 32K for zip's deflate method */ +# define WSIZE 0x8000 /* window size--must be a power of two, and */ +#endif /* at least 32K for zip's deflate method */ #define MIN_MATCH 3 #define MAX_MATCH 258 @@ -260,11 +264,11 @@ typedef int file_t; /* Do not use stdio */ * distances are limited to MAX_DIST instead of WSIZE. */ -extern int exit_code; /* program exit code */ -extern int verbose; /* be verbose (-v) */ -extern int level; /* compression level */ -extern int test; /* check .z file integrity */ -extern int save_orig_name; /* set if original name must be saved */ +extern int exit_code; /* program exit code */ +extern int verbose; /* be verbose (-v) */ +extern int level; /* compression level */ +extern int test; /* check .z file integrity */ +extern int save_orig_name; /* set if original name must be saved */ #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) @@ -296,10 +300,10 @@ extern int save_orig_name; /* set if original name must be saved */ put_short(((ulg)(n)) >> 16); \ } -#define seekable() 0 /* force sequential output */ -#define translate_eol 0 /* no option -a yet */ +#define seekable() 0 /* force sequential output */ +#define translate_eol 0 /* no option -a yet */ -#define tolow(c) (isupper(c) ? (c)-'A'+'a' : (c)) /* force to lower case */ +#define tolow(c) (isupper(c) ? (c)-'A'+'a' : (c)) /* force to lower case */ /* Macros for getting two-byte and four-byte header values */ #define SH(p) ((ush)(uch)((p)[0]) | ((ush)(uch)((p)[1]) << 8)) @@ -329,43 +333,44 @@ extern int save_orig_name; /* set if original name must be saved */ /* in unzip.c */ -extern int unzip OF((int in, int out)); +extern int unzip OF((int in, int out)); /* in gzip.c */ RETSIGTYPE abort_gzip OF((void)); - /* in deflate.c */ -void lm_init OF((int pack_level, ush *flags)); -ulg deflate OF((void)); + /* in deflate.c */ +void lm_init OF((int pack_level, ush * flags)); +ulg deflate OF((void)); - /* in trees.c */ -void ct_init OF((ush *attr, int *method)); -int ct_tally OF((int dist, int lc)); -ulg flush_block OF((char *buf, ulg stored_len, int eof)); + /* in trees.c */ +void ct_init OF((ush * attr, int *method)); +int ct_tally OF((int dist, int lc)); +ulg flush_block OF((char *buf, ulg stored_len, int eof)); - /* in bits.c */ -void bi_init OF((file_t zipfile)); -void send_bits OF((int value, int length)); + /* in bits.c */ +void bi_init OF((file_t zipfile)); +void send_bits OF((int value, int length)); unsigned bi_reverse OF((unsigned value, int length)); -void bi_windup OF((void)); -void copy_block OF((char *buf, unsigned len, int header)); -extern int (*read_buf) OF((char *buf, unsigned size)); +void bi_windup OF((void)); +void copy_block OF((char *buf, unsigned len, int header)); +extern int (*read_buf) OF((char *buf, unsigned size)); /* in util.c: */ -extern int copy OF((int in, int out)); -extern ulg updcrc OF((uch *s, unsigned n)); -extern void clear_bufs OF((void)); -extern int fill_inbuf OF((int eof_ok)); -extern void flush_outbuf OF((void)); -extern void flush_window OF((void)); -extern void write_buf OF((int fd, voidp buf, unsigned cnt)); +extern int copy OF((int in, int out)); +extern ulg updcrc OF((uch * s, unsigned n)); +extern void clear_bufs OF((void)); +extern int fill_inbuf OF((int eof_ok)); +extern void flush_outbuf OF((void)); +extern void flush_window OF((void)); +extern void write_buf OF((int fd, voidp buf, unsigned cnt)); + #ifndef __linux__ -extern char *basename OF((char *fname)); -#endif /* not __linux__ */ -extern void error OF((char *m)); -extern void warn OF((char *a, char *b)); -extern void read_error OF((void)); -extern void write_error OF((void)); +extern char *basename OF((char *fname)); +#endif /* not __linux__ */ +extern void error OF((char *m)); +extern void warn OF((char *a, char *b)); +extern void read_error OF((void)); +extern void write_error OF((void)); /* in inflate.c */ extern int inflate OF((void)); @@ -385,11 +390,11 @@ extern int inflate OF((void)); #ifndef BITS # define BITS 16 #endif -#define INIT_BITS 9 /* Initial number of bits per code */ +#define INIT_BITS 9 /* Initial number of bits per code */ -#define LZW_MAGIC "\037\235" /* Magic header for lzw files, 1F 9D */ +#define LZW_MAGIC "\037\235" /* Magic header for lzw files, 1F 9D */ -#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ +#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ /* Mask 0x20 is reserved to mean a fourth header byte, and 0x40 is free. * It's a pity that old uncompress does not check bit 0x20. That makes * extension of the format actually undesirable because old compress @@ -404,16 +409,16 @@ extern int inflate OF((void)); * clear the dictionary. */ -#define LZW_RESERVED 0x60 /* reserved bits */ +#define LZW_RESERVED 0x60 /* reserved bits */ -#define CLEAR 256 /* flush the dictionary */ -#define FIRST (CLEAR+1) /* first free entry */ +#define CLEAR 256 /* flush the dictionary */ +#define FIRST (CLEAR+1) /* first free entry */ -extern int maxbits; /* max bits per code for LZW */ -extern int block_mode; /* block compress mode -C compatible with 2.0 */ +extern int maxbits; /* max bits per code for LZW */ +extern int block_mode; /* block compress mode -C compatible with 2.0 */ -extern int lzw OF((int in, int out)); -extern int unlzw OF((int in, int out)); +extern int lzw OF((int in, int out)); +extern int unlzw OF((int in, int out)); /* #include "revision.h" */ @@ -458,14 +463,12 @@ extern int unlzw OF((int in, int out)); #ifdef __cplusplus extern "C" { #endif - /* For communication from `getopt' to the caller. When `getopt' finds an option that takes an argument, the argument value is returned here. Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ - -extern char *optarg; + extern char *optarg; /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller @@ -479,16 +482,16 @@ extern char *optarg; Otherwise, `optind' communicates from one call to the next how much of ARGV has been scanned so far. */ -extern int optind; + extern int optind; /* Callers store zero here to inhibit the error message `getopt' prints for unrecognized options. */ -extern int opterr; + extern int opterr; /* Set to an option character which was unrecognized. */ -extern int optopt; + extern int optopt; /* Describe the long-named options requested by the application. The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector @@ -511,19 +514,18 @@ extern int optopt; one). For long options that have a zero `flag' field, `getopt' returns the contents of the `val' field. */ -struct option -{ + struct option { #if __STDC__ - const char *name; + const char *name; #else - char *name; + char *name; #endif - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; + }; /* Names for the values of the `has_arg' field of `struct option'. */ @@ -536,60 +538,61 @@ struct option /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ -extern int getopt (int argc, char *const *argv, const char *shortopts); -#endif /* not __GNU_LIBRARY__ */ -extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); -extern int getopt_long_only (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind); + extern int getopt(int argc, char *const *argv, const char *shortopts); +#endif /* not __GNU_LIBRARY__ */ + extern int getopt_long(int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, int *longind); + extern int getopt_long_only(int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, + int *longind); /* Internal only. Users should not call this directly. */ -extern int _getopt_internal (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind, - int long_only); -#else /* not __STDC__ */ -extern int getopt (); -extern int getopt_long (); -extern int getopt_long_only (); - -extern int _getopt_internal (); -#endif /* not __STDC__ */ + extern int _getopt_internal(int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, + int *longind, int long_only); +#else /* not __STDC__ */ + extern int getopt(); + extern int getopt_long(); + extern int getopt_long_only(); + + extern int _getopt_internal(); +#endif /* not __STDC__ */ #ifdef __cplusplus } #endif - -#endif /* _GETOPT_H */ - - +#endif /* _GETOPT_H */ #include <time.h> #include <fcntl.h> #include <unistd.h> - #include <stdlib.h> - #if defined(DIRENT) # include <dirent.h> - typedef struct dirent dir_type; +typedef struct dirent dir_type; + # define NLENGTH(dirent) ((int)strlen((dirent)->d_name)) # define DIR_OPT "DIRENT" #else # define NLENGTH(dirent) ((dirent)->d_namlen) # ifdef SYSDIR # include <sys/dir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "SYSDIR" # else # ifdef SYSNDIR # include <sys/ndir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "SYSNDIR" # else # ifdef NDIR # include <ndir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "NDIR" # else # define NO_DIR @@ -598,18 +601,16 @@ extern int _getopt_internal (); # endif # endif #endif - #if !defined(S_ISDIR) && defined(S_IFDIR) # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif #if !defined(S_ISREG) && defined(S_IFREG) # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif - -typedef RETSIGTYPE (*sig_type) OF((int)); +typedef RETSIGTYPE(*sig_type) OF((int)); #ifndef O_BINARY -# define O_BINARY 0 /* creation mode for open() */ +# define O_BINARY 0 /* creation mode for open() */ #endif #ifndef O_CREAT @@ -629,9 +630,9 @@ typedef RETSIGTYPE (*sig_type) OF((int)); #ifndef S_IWUSR # define S_IWUSR 0200 #endif -#define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ +#define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ -#ifndef MAX_PATH_LEN /* max pathname length */ +#ifndef MAX_PATH_LEN /* max pathname length */ # ifdef PATH_MAX # define MAX_PATH_LEN PATH_MAX # else @@ -644,224 +645,224 @@ typedef RETSIGTYPE (*sig_type) OF((int)); #endif #ifdef NO_OFF_T - typedef long off_t; - off_t lseek OF((int fd, off_t offset, int whence)); +typedef long off_t; +off_t lseek OF((int fd, off_t offset, int whence)); #endif /* global buffers */ -DECLARE(uch, inbuf, INBUFSIZ +INBUF_EXTRA); -DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); -DECLARE(ush, d_buf, DIST_BUFSIZE); -DECLARE(uch, window, 2L*WSIZE); +DECLARE(uch, inbuf, INBUFSIZ + INBUF_EXTRA); +DECLARE(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); +DECLARE(ush, d_buf, DIST_BUFSIZE); +DECLARE(uch, window, 2L * WSIZE); #ifndef MAXSEG_64K - DECLARE(ush, tab_prefix, 1L<<BITS); +DECLARE(ush, tab_prefix, 1L << BITS); #else - DECLARE(ush, tab_prefix0, 1L<<(BITS-1)); - DECLARE(ush, tab_prefix1, 1L<<(BITS-1)); +DECLARE(ush, tab_prefix0, 1L << (BITS - 1)); +DECLARE(ush, tab_prefix1, 1L << (BITS - 1)); #endif /* local variables */ -int test_mode = 0; /* check file integrity option */ -int foreground; /* set if program run in foreground */ -int maxbits = BITS; /* max bits per code for LZW */ -int method = DEFLATED;/* compression method */ -int exit_code = OK; /* program exit code */ -int last_member; /* set for .zip and .Z files */ -int part_nb; /* number of parts in .gz file */ -long ifile_size; /* input file size, -1 for devices (debug only) */ - -long bytes_in; /* number of input bytes */ -long bytes_out; /* number of output bytes */ -long total_in = 0; /* input bytes for all files */ -long total_out = 0; /* output bytes for all files */ -struct stat istat; /* status for input file */ -int ifd; /* input file descriptor */ -int ofd; /* output file descriptor */ -unsigned insize; /* valid bytes in inbuf */ -unsigned inptr; /* index of next byte to be processed in inbuf */ -unsigned outcnt; /* bytes in output buffer */ - -long header_bytes; /* number of bytes in gzip header */ +int test_mode = 0; /* check file integrity option */ +int foreground; /* set if program run in foreground */ +int maxbits = BITS; /* max bits per code for LZW */ +int method = DEFLATED; /* compression method */ +int exit_code = OK; /* program exit code */ +int last_member; /* set for .zip and .Z files */ +int part_nb; /* number of parts in .gz file */ +long ifile_size; /* input file size, -1 for devices (debug only) */ + +long bytes_in; /* number of input bytes */ +long bytes_out; /* number of output bytes */ +long total_in = 0; /* input bytes for all files */ +long total_out = 0; /* output bytes for all files */ +struct stat istat; /* status for input file */ +int ifd; /* input file descriptor */ +int ofd; /* output file descriptor */ +unsigned insize; /* valid bytes in inbuf */ +unsigned inptr; /* index of next byte to be processed in inbuf */ +unsigned outcnt; /* bytes in output buffer */ + +long header_bytes; /* number of bytes in gzip header */ /* local functions */ -local int get_method OF((int in)); +local int get_method OF((int in)); #define strequ(s1, s2) (strcmp((s1),(s2)) == 0) /* ======================================================================== */ -int gunzip_main (int argc, char** argv) +int gunzip_main(int argc, char **argv) { - int file_count; /* number of files to precess */ - int to_stdout = 0; - int fromstdin = 0; - int result; - int inFileNum; - int outFileNum; - int delInputFile=0; - struct stat statBuf; - char* delFileName; - char ifname[MAX_PATH_LEN + 1]; /* input file name */ - char ofname[MAX_PATH_LEN + 1]; /* output file name */ - - if (argc==1) - usage(gunzip_usage); - - if (strcmp(*argv, "zcat")==0) - to_stdout = 1; - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv)+1) == '\0') { - fromstdin = 1; - to_stdout = 1; - } - while (*(++(*argv))) { - switch (**argv) { - case 'c': + int file_count; /* number of files to precess */ + int to_stdout = 0; + int fromstdin = 0; + int result; + int inFileNum; + int outFileNum; + int delInputFile = 0; + struct stat statBuf; + char *delFileName; + char ifname[MAX_PATH_LEN + 1]; /* input file name */ + char ofname[MAX_PATH_LEN + 1]; /* output file name */ + + if (argc == 1) + usage(gunzip_usage); + + if (strcmp(*argv, "zcat") == 0) to_stdout = 1; - break; - case 't': - test_mode = 1; - break; - default: - usage(gunzip_usage); - } + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + if (*((*argv) + 1) == '\0') { + fromstdin = 1; + to_stdout = 1; + } + while (*(++(*argv))) { + switch (**argv) { + case 'c': + to_stdout = 1; + break; + case 't': + test_mode = 1; + break; + + default: + usage(gunzip_usage); + } + } } - } - foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; - if (foreground) { - (void) signal (SIGINT, (sig_type)abort_gzip); - } + foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; + if (foreground) { + (void) signal(SIGINT, (sig_type) abort_gzip); + } #ifdef SIGTERM - if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { - (void) signal(SIGTERM, (sig_type)abort_gzip); - } + if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { + (void) signal(SIGTERM, (sig_type) abort_gzip); + } #endif #ifdef SIGHUP - if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { - (void) signal(SIGHUP, (sig_type)abort_gzip); - } + if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { + (void) signal(SIGHUP, (sig_type) abort_gzip); + } #endif - file_count = argc - optind; + file_count = argc - optind; - /* Allocate all global buffers (for DYN_ALLOC option) */ - ALLOC(uch, inbuf, INBUFSIZ +INBUF_EXTRA); - ALLOC(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); - ALLOC(ush, d_buf, DIST_BUFSIZE); - ALLOC(uch, window, 2L*WSIZE); + /* Allocate all global buffers (for DYN_ALLOC option) */ + ALLOC(uch, inbuf, INBUFSIZ + INBUF_EXTRA); + ALLOC(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); + ALLOC(ush, d_buf, DIST_BUFSIZE); + ALLOC(uch, window, 2L * WSIZE); #ifndef MAXSEG_64K - ALLOC(ush, tab_prefix, 1L<<BITS); + ALLOC(ush, tab_prefix, 1L << BITS); #else - ALLOC(ush, tab_prefix0, 1L<<(BITS-1)); - ALLOC(ush, tab_prefix1, 1L<<(BITS-1)); + ALLOC(ush, tab_prefix0, 1L << (BITS - 1)); + ALLOC(ush, tab_prefix1, 1L << (BITS - 1)); #endif - if (fromstdin==1) { - strcpy(ofname, "stdin"); - - inFileNum=fileno(stdin); - ifile_size = -1L; /* convention for unknown size */ - } else { - /* Open up the input file */ - if (*argv=='\0') - usage(gunzip_usage); - if (strlen(*argv) > MAX_PATH_LEN) { - fprintf(stderr, name_too_long, "gunzip"); - do_exit(WARNING); - } - strcpy(ifname, *argv); + if (fromstdin == 1) { + strcpy(ofname, "stdin"); - /* Open input fille */ - inFileNum=open( ifname, O_RDONLY); - if (inFileNum < 0) { - perror(ifname); - do_exit(WARNING); - } - /* Get the time stamp on the input file. */ - result = stat(ifname, &statBuf); - if (result < 0) { - perror(ifname); - do_exit(WARNING); - } - ifile_size = statBuf.st_size; - } - - if (to_stdout==1) { - /* And get to work */ - strcpy(ofname, "stdout"); - outFileNum=fileno(stdout); - - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; - - /* Actually do the compression/decompression. */ - unzip(inFileNum, outFileNum); - - } else if (test_mode) { - /* Actually do the compression/decompression. */ - unzip(inFileNum, 2); - } else { - char* pos; - - /* And get to work */ - if (strlen(ifname) > MAX_PATH_LEN - 4) { - fprintf(stderr, name_too_long, "gunzip"); - do_exit(WARNING); - } - strcpy(ofname, ifname); - pos=strstr(ofname, ".gz"); - if (pos != NULL) { - *pos='\0'; - delInputFile=1; + inFileNum = fileno(stdin); + ifile_size = -1L; /* convention for unknown size */ } else { - pos=strstr(ofname, ".tgz"); - if (pos != NULL) { - *pos='\0'; - strcat( pos, ".tar"); - delInputFile=1; - } + /* Open up the input file */ + if (*argv == '\0') + usage(gunzip_usage); + if (strlen(*argv) > MAX_PATH_LEN) { + fprintf(stderr, name_too_long, "gunzip"); + do_exit(WARNING); + } + strcpy(ifname, *argv); + + /* Open input fille */ + inFileNum = open(ifname, O_RDONLY); + if (inFileNum < 0) { + perror(ifname); + do_exit(WARNING); + } + /* Get the time stamp on the input file. */ + result = stat(ifname, &statBuf); + if (result < 0) { + perror(ifname); + do_exit(WARNING); + } + ifile_size = statBuf.st_size; } - /* Open output fille */ + if (to_stdout == 1) { + /* And get to work */ + strcpy(ofname, "stdout"); + outFileNum = fileno(stdout); + + clear_bufs(); /* clear input and output buffers */ + part_nb = 0; + + /* Actually do the compression/decompression. */ + unzip(inFileNum, outFileNum); + + } else if (test_mode) { + /* Actually do the compression/decompression. */ + unzip(inFileNum, 2); + } else { + char *pos; + + /* And get to work */ + if (strlen(ifname) > MAX_PATH_LEN - 4) { + fprintf(stderr, name_too_long, "gunzip"); + do_exit(WARNING); + } + strcpy(ofname, ifname); + pos = strstr(ofname, ".gz"); + if (pos != NULL) { + *pos = '\0'; + delInputFile = 1; + } else { + pos = strstr(ofname, ".tgz"); + if (pos != NULL) { + *pos = '\0'; + strcat(pos, ".tar"); + delInputFile = 1; + } + } + + /* Open output fille */ #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW); + outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW); #else - outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL); + outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL); #endif - if (outFileNum < 0) { - perror(ofname); - do_exit(WARNING); - } - /* Set permissions on the file */ - fchmod(outFileNum, statBuf.st_mode); - - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; - - /* Actually do the compression/decompression. */ - result=unzip(inFileNum, outFileNum); - - close( outFileNum); - close( inFileNum); - /* Delete the original file */ - if (result == OK) - delFileName=ifname; - else - delFileName=ofname; - - if (delInputFile == 1 && unlink (delFileName) < 0) { - perror (delFileName); - exit( FALSE); + if (outFileNum < 0) { + perror(ofname); + do_exit(WARNING); + } + /* Set permissions on the file */ + fchmod(outFileNum, statBuf.st_mode); + + clear_bufs(); /* clear input and output buffers */ + part_nb = 0; + + /* Actually do the compression/decompression. */ + result = unzip(inFileNum, outFileNum); + + close(outFileNum); + close(inFileNum); + /* Delete the original file */ + if (result == OK) + delFileName = ifname; + else + delFileName = ofname; + + if (delInputFile == 1 && unlink(delFileName) < 0) { + perror(delFileName); + exit(FALSE); + } } - } - do_exit(exit_code); + do_exit(exit_code); } @@ -877,71 +878,76 @@ int gunzip_main (int argc, char** argv) * If the member is a zip file, it must be the only one. */ local int get_method(in) - int in; /* input file descriptor */ +int in; /* input file descriptor */ { - uch flags; /* compression flags */ - char magic[2]; /* magic header */ - - magic[0] = (char)get_byte(); - magic[1] = (char)get_byte(); - method = -1; /* unknown yet */ - part_nb++; /* number of parts in gzip file */ - header_bytes = 0; - last_member = RECORD_IO; - /* assume multiple members in gzip file except for record oriented I/O */ - - if (memcmp(magic, GZIP_MAGIC, 2) == 0) { - - method = (int)get_byte(); - if (method != DEFLATED) { - fprintf(stderr, - "unknown method %d -- get newer version of gzip\n", - method); - exit_code = ERROR; - return -1; - } - flags = (uch)get_byte(); - - (ulg)get_byte(); /* Ignore time stamp */ - (ulg)get_byte(); - (ulg)get_byte(); - (ulg)get_byte(); + uch flags; /* compression flags */ + char magic[2]; /* magic header */ + + magic[0] = (char) get_byte(); + magic[1] = (char) get_byte(); + method = -1; /* unknown yet */ + part_nb++; /* number of parts in gzip file */ + header_bytes = 0; + last_member = RECORD_IO; + /* assume multiple members in gzip file except for record oriented I/O */ + + if (memcmp(magic, GZIP_MAGIC, 2) == 0) { + + method = (int) get_byte(); + if (method != DEFLATED) { + fprintf(stderr, + "unknown method %d -- get newer version of gzip\n", + method); + exit_code = ERROR; + return -1; + } + flags = (uch) get_byte(); + + (ulg) get_byte(); /* Ignore time stamp */ + (ulg) get_byte(); + (ulg) get_byte(); + (ulg) get_byte(); + + (void) get_byte(); /* Ignore extra flags for the moment */ + (void) get_byte(); /* Ignore OS type for the moment */ + + if ((flags & EXTRA_FIELD) != 0) { + unsigned len = (unsigned) get_byte(); + + len |= ((unsigned) get_byte()) << 8; + + while (len--) + (void) get_byte(); + } + + /* Discard original name if any */ + if ((flags & ORIG_NAME) != 0) { + while (get_char() != 0) /* null */ + ; + } + + /* Discard file comment if any */ + if ((flags & COMMENT) != 0) { + while (get_char() != 0) /* null */ + ; + } + if (part_nb == 1) { + header_bytes = inptr + 2 * sizeof(long); /* include crc and size */ + } - (void)get_byte(); /* Ignore extra flags for the moment */ - (void)get_byte(); /* Ignore OS type for the moment */ - - if ((flags & EXTRA_FIELD) != 0) { - unsigned len = (unsigned)get_byte(); - len |= ((unsigned)get_byte())<<8; - - while (len--) (void)get_byte(); } - /* Discard original name if any */ - if ((flags & ORIG_NAME) != 0) { - while (get_char() != 0) /* null */ ; - } + if (method >= 0) + return method; - /* Discard file comment if any */ - if ((flags & COMMENT) != 0) { - while (get_char() != 0) /* null */ ; - } if (part_nb == 1) { - header_bytes = inptr + 2*sizeof(long); /* include crc and size */ + fprintf(stderr, "\nnot in gzip format\n"); + exit_code = ERROR; + return -1; + } else { + WARN((stderr, "\ndecompression OK, trailing garbage ignored\n")); + return -2; } - - } - - if (method >= 0) return method; - - if (part_nb == 1) { - fprintf(stderr, "\nnot in gzip format\n"); - exit_code = ERROR; - return -1; - } else { - WARN((stderr, "\ndecompression OK, trailing garbage ignored\n")); - return -2; - } } /* ======================================================================== @@ -949,8 +955,9 @@ local int get_method(in) */ RETSIGTYPE abort_gzip() { - do_exit(ERROR); + do_exit(ERROR); } + /* unzip.c -- decompress files in gzip or pkzip format. * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the @@ -973,35 +980,35 @@ RETSIGTYPE abort_gzip() */ #ifdef CRYPT -# undef CRYPT /* dummy version */ +# undef CRYPT /* dummy version */ #endif -#define RAND_HEAD_LEN 12 /* length of encryption random header */ +#define RAND_HEAD_LEN 12 /* length of encryption random header */ #define zencode #define zdecode /* PKZIP header definitions */ -#define LOCSIG 0x04034b50L /* four-byte lead-in (lsb first) */ -#define LOCFLG 6 /* offset of bit flag */ -#define CRPFLG 1 /* bit for encrypted entry */ -#define EXTFLG 8 /* bit for extended local header */ -#define LOCHOW 8 /* offset of compression method */ -#define LOCTIM 10 /* file mod time (for decryption) */ -#define LOCCRC 14 /* offset of crc */ -#define LOCSIZ 18 /* offset of compressed size */ -#define LOCLEN 22 /* offset of uncompressed length */ -#define LOCFIL 26 /* offset of file name field length */ -#define LOCEXT 28 /* offset of extra field length */ -#define LOCHDR 30 /* size of local header, including sig */ -#define EXTHDR 16 /* size of extended local header, inc sig */ +#define LOCSIG 0x04034b50L /* four-byte lead-in (lsb first) */ +#define LOCFLG 6 /* offset of bit flag */ +#define CRPFLG 1 /* bit for encrypted entry */ +#define EXTFLG 8 /* bit for extended local header */ +#define LOCHOW 8 /* offset of compression method */ +#define LOCTIM 10 /* file mod time (for decryption) */ +#define LOCCRC 14 /* offset of crc */ +#define LOCSIZ 18 /* offset of compressed size */ +#define LOCLEN 22 /* offset of uncompressed length */ +#define LOCFIL 26 /* offset of file name field length */ +#define LOCEXT 28 /* offset of extra field length */ +#define LOCHDR 30 /* size of local header, including sig */ +#define EXTHDR 16 /* size of extended local header, inc sig */ /* Globals */ -char *key; /* not used--needed to link crypt.c */ -int pkzip = 0; /* set for a pkzip file */ -int ext_header = 0; /* set if extended local header */ +char *key; /* not used--needed to link crypt.c */ +int pkzip = 0; /* set for a pkzip file */ +int ext_header = 0; /* set if extended local header */ /* =========================================================================== * Unzip in to out. This routine works on both gzip and pkzip files. @@ -1011,81 +1018,82 @@ int ext_header = 0; /* set if extended local header */ * The magic header has already been checked. The output buffer is cleared. */ int unzip(in, out) - int in, out; /* input and output file descriptors */ +int in, out; /* input and output file descriptors */ { - ulg orig_crc = 0; /* original crc */ - ulg orig_len = 0; /* original uncompressed length */ - int n; - uch buf[EXTHDR]; /* extended local header */ - - ifd = in; - ofd = out; - method = get_method(ifd); - if (method < 0) { - do_exit(exit_code); /* error message already emitted */ - } - - updcrc(NULL, 0); /* initialize crc */ - - if (pkzip && !ext_header) { /* crc and length at the end otherwise */ - orig_crc = LG(inbuf + LOCCRC); - orig_len = LG(inbuf + LOCLEN); - } - - /* Decompress */ - if (method == DEFLATED) { - - int res = inflate(); - - if (res == 3) { - error("out of memory"); - } else if (res != 0) { - error("invalid compressed data--format violated"); + ulg orig_crc = 0; /* original crc */ + ulg orig_len = 0; /* original uncompressed length */ + int n; + uch buf[EXTHDR]; /* extended local header */ + + ifd = in; + ofd = out; + method = get_method(ifd); + if (method < 0) { + do_exit(exit_code); /* error message already emitted */ } - } else { - error("internal error, invalid method"); - } - - /* Get the crc and original length */ - if (!pkzip) { - /* crc32 (see algorithm.doc) - * uncompressed input size modulo 2^32 - */ - for (n = 0; n < 8; n++) { - buf[n] = (uch)get_byte(); /* may cause an error if EOF */ + updcrc(NULL, 0); /* initialize crc */ + + if (pkzip && !ext_header) { /* crc and length at the end otherwise */ + orig_crc = LG(inbuf + LOCCRC); + orig_len = LG(inbuf + LOCLEN); } - orig_crc = LG(buf); - orig_len = LG(buf+4); - - } else if (ext_header) { /* If extended header, check it */ - /* signature - 4bytes: 0x50 0x4b 0x07 0x08 - * CRC-32 value - * compressed size 4-bytes - * uncompressed size 4-bytes - */ - for (n = 0; n < EXTHDR; n++) { - buf[n] = (uch)get_byte(); /* may cause an error if EOF */ + + /* Decompress */ + if (method == DEFLATED) { + + int res = inflate(); + + if (res == 3) { + error("out of memory"); + } else if (res != 0) { + error("invalid compressed data--format violated"); + } + + } else { + error("internal error, invalid method"); + } + + /* Get the crc and original length */ + if (!pkzip) { + /* crc32 (see algorithm.doc) + * uncompressed input size modulo 2^32 + */ + for (n = 0; n < 8; n++) { + buf[n] = (uch) get_byte(); /* may cause an error if EOF */ + } + orig_crc = LG(buf); + orig_len = LG(buf + 4); + + } else if (ext_header) { /* If extended header, check it */ + /* signature - 4bytes: 0x50 0x4b 0x07 0x08 + * CRC-32 value + * compressed size 4-bytes + * uncompressed size 4-bytes + */ + for (n = 0; n < EXTHDR; n++) { + buf[n] = (uch) get_byte(); /* may cause an error if EOF */ + } + orig_crc = LG(buf + 4); + orig_len = LG(buf + 12); + } + + /* Validate decompression */ + if (orig_crc != updcrc(outbuf, 0)) { + error("invalid compressed data--crc error"); } - orig_crc = LG(buf+4); - orig_len = LG(buf+12); - } - - /* Validate decompression */ - if (orig_crc != updcrc(outbuf, 0)) { - error("invalid compressed data--crc error"); - } - if (orig_len != (ulg)bytes_out) { - error("invalid compressed data--length error"); - } - - /* Check if there are more entries in a pkzip file */ - if (pkzip && inptr + 4 < insize && LG(inbuf+inptr) == LOCSIG) { - WARN((stderr,"has more than one entry--rest ignored\n")); - } - ext_header = pkzip = 0; /* for next file */ - return OK; + if (orig_len != (ulg) bytes_out) { + error("invalid compressed data--length error"); + } + + /* Check if there are more entries in a pkzip file */ + if (pkzip && inptr + 4 < insize && LG(inbuf + inptr) == LOCSIG) { + WARN((stderr, "has more than one entry--rest ignored\n")); + } + ext_header = pkzip = 0; /* for next file */ + return OK; } + /* util.c -- utility functions for gzip support * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the @@ -1106,10 +1114,10 @@ int unzip(in, out) #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) # include <stdlib.h> #else - extern int errno; +extern int errno; #endif -static const ulg crc_32_tab[]; /* crc table, defined below */ +static const ulg crc_32_tab[]; /* crc table, defined below */ /* =========================================================================== * Run a set of bytes through the crc shift register. If s is a NULL @@ -1117,23 +1125,24 @@ static const ulg crc_32_tab[]; /* crc table, defined below */ * Return the current crc in either case. */ ulg updcrc(s, n) - uch *s; /* pointer to bytes to pump through */ - unsigned n; /* number of bytes in s[] */ +uch *s; /* pointer to bytes to pump through */ +unsigned n; /* number of bytes in s[] */ { - register ulg c; /* temporary variable */ - - static ulg crc = (ulg)0xffffffffL; /* shift register contents */ - - if (s == NULL) { - c = 0xffffffffL; - } else { - c = crc; - if (n) do { - c = crc_32_tab[((int)c ^ (*s++)) & 0xff] ^ (c >> 8); - } while (--n); - } - crc = c; - return c ^ 0xffffffffL; /* (instead of ~c for 64-bit machines) */ + register ulg c; /* temporary variable */ + + static ulg crc = (ulg) 0xffffffffL; /* shift register contents */ + + if (s == NULL) { + c = 0xffffffffL; + } else { + c = crc; + if (n) + do { + c = crc_32_tab[((int) c ^ (*s++)) & 0xff] ^ (c >> 8); + } while (--n); + } + crc = c; + return c ^ 0xffffffffL; /* (instead of ~c for 64-bit machines) */ } /* =========================================================================== @@ -1141,35 +1150,37 @@ ulg updcrc(s, n) */ void clear_bufs() { - outcnt = 0; - insize = inptr = 0; - bytes_in = bytes_out = 0L; + outcnt = 0; + insize = inptr = 0; + bytes_in = bytes_out = 0L; } /* =========================================================================== * Fill the input buffer. This is called only when the buffer is empty. */ int fill_inbuf(eof_ok) - int eof_ok; /* set if EOF acceptable as a result */ +int eof_ok; /* set if EOF acceptable as a result */ { - int len; - - /* Read as much as possible */ - insize = 0; - errno = 0; - do { - len = read(ifd, (char*)inbuf+insize, INBUFSIZ-insize); - if (len == 0 || len == EOF) break; - insize += len; - } while (insize < INBUFSIZ); - - if (insize == 0) { - if (eof_ok) return EOF; - read_error(); - } - bytes_in += (ulg)insize; - inptr = 1; - return inbuf[0]; + int len; + + /* Read as much as possible */ + insize = 0; + errno = 0; + do { + len = read(ifd, (char *) inbuf + insize, INBUFSIZ - insize); + if (len == 0 || len == EOF) + break; + insize += len; + } while (insize < INBUFSIZ); + + if (insize == 0) { + if (eof_ok) + return EOF; + read_error(); + } + bytes_in += (ulg) insize; + inptr = 1; + return inbuf[0]; } /* =========================================================================== @@ -1178,12 +1189,13 @@ int fill_inbuf(eof_ok) */ void flush_outbuf() { - if (outcnt == 0) return; + if (outcnt == 0) + return; - if (!test_mode) - write_buf(ofd, (char *)outbuf, outcnt); - bytes_out += (ulg)outcnt; - outcnt = 0; + if (!test_mode) + write_buf(ofd, (char *) outbuf, outcnt); + bytes_out += (ulg) outcnt; + outcnt = 0; } /* =========================================================================== @@ -1192,13 +1204,14 @@ void flush_outbuf() */ void flush_window() { - if (outcnt == 0) return; - updcrc(window, outcnt); - - if (!test_mode) - write_buf(ofd, (char *)window, outcnt); - bytes_out += (ulg)outcnt; - outcnt = 0; + if (outcnt == 0) + return; + updcrc(window, outcnt); + + if (!test_mode) + write_buf(ofd, (char *) window, outcnt); + bytes_out += (ulg) outcnt; + outcnt = 0; } /* =========================================================================== @@ -1206,19 +1219,19 @@ void flush_window() * for error return. */ void write_buf(fd, buf, cnt) - int fd; - voidp buf; - unsigned cnt; +int fd; +voidp buf; +unsigned cnt; { - unsigned n; - - while ((n = write(fd, buf, cnt)) != cnt) { - if (n == (unsigned)(-1)) { - write_error(); + unsigned n; + + while ((n = write(fd, buf, cnt)) != cnt) { + if (n == (unsigned) (-1)) { + write_error(); + } + cnt -= n; + buf = (voidp) ((char *) buf + n); } - cnt -= n; - buf = (voidp)((char*)buf+n); - } } #if defined(NO_STRING_H) && !defined(STDC_HEADERS) @@ -1229,7 +1242,7 @@ void write_buf(fd, buf, cnt) # define const # endif -int strspn OF((const char *s, const char *accept)); +int strspn OF((const char *s, const char *accept)); int strcspn OF((const char *s, const char *reject)); /* ======================================================================== @@ -1237,21 +1250,23 @@ int strcspn OF((const char *s, const char *reject)); * of s which contains only characters in accept. */ int strspn(s, accept) - const char *s; - const char *accept; +const char *s; +const char *accept; { - register const char *p; - register const char *a; - register int count = 0; - - for (p = s; *p != '\0'; ++p) { - for (a = accept; *a != '\0'; ++a) { - if (*p == *a) break; + register const char *p; + register const char *a; + register int count = 0; + + for (p = s; *p != '\0'; ++p) { + for (a = accept; *a != '\0'; ++a) { + if (*p == *a) + break; + } + if (*a == '\0') + return count; + ++count; } - if (*a == '\0') return count; - ++count; - } - return count; + return count; } /* ======================================================================== @@ -1259,46 +1274,47 @@ int strspn(s, accept) * which contains no characters from reject. */ int strcspn(s, reject) - const char *s; - const char *reject; +const char *s; +const char *reject; { - register int count = 0; + register int count = 0; - while (*s != '\0') { - if (strchr(reject, *s++) != NULL) return count; - ++count; - } - return count; + while (*s != '\0') { + if (strchr(reject, *s++) != NULL) + return count; + ++count; + } + return count; } -#endif /* NO_STRING_H */ +#endif /* NO_STRING_H */ /* ======================================================================== * Error handlers. */ void warn(a, b) - char *a, *b; /* message strings juxtaposed in output */ +char *a, *b; /* message strings juxtaposed in output */ { - WARN((stderr, "warning: %s%s\n", a, b)); + WARN((stderr, "warning: %s%s\n", a, b)); } void read_error() { - fprintf(stderr, "\n"); - if (errno != 0) { - perror(""); - } else { - fprintf(stderr, "unexpected end of file\n"); - } - abort_gzip(); + fprintf(stderr, "\n"); + if (errno != 0) { + perror(""); + } else { + fprintf(stderr, "unexpected end of file\n"); + } + abort_gzip(); } void write_error() { - fprintf(stderr, "\n"); - perror(""); - abort_gzip(); + fprintf(stderr, "\n"); + perror(""); + abort_gzip(); } @@ -1306,59 +1322,60 @@ void write_error() * Table of CRC-32's of all single-byte values (made by makecrc.c) */ static const ulg crc_32_tab[] = { - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, - 0x2d02ef8dL + 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, + 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, + 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, + 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, + 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, + 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, + 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, + 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, + 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, + 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, + 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, + 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, + 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, + 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, + 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, + 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, + 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, + 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, + 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, + 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, + 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, + 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, + 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, + 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, + 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, + 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, + 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, + 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, + 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, + 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, + 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, + 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, + 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, + 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, + 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, + 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, + 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, + 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, + 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, + 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, + 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, + 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, + 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, + 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, + 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, + 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, + 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, + 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, + 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, + 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, + 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, + 0x2d02ef8dL }; + /* inflate.c -- Not copyrighted 1992 by Mark Adler version c10p1, 10 January 1993 */ @@ -1474,18 +1491,18 @@ static const ulg crc_32_tab[] = { an unused code. If a code with e == 99 is looked up, this implies an error in the data. */ struct huft { - uch e; /* number of extra bits or operation */ - uch b; /* number of bits in this code or subcode */ - union { - ush n; /* literal, length base, or distance base */ - struct huft *t; /* pointer to next level of table */ - } v; + uch e; /* number of extra bits or operation */ + uch b; /* number of bits in this code or subcode */ + union { + ush n; /* literal, length base, or distance base */ + struct huft *t; /* pointer to next level of table */ + } v; }; /* Function prototypes */ int huft_build OF((unsigned *, unsigned, unsigned, ush *, ush *, - struct huft **, int *)); + struct huft **, int *)); int huft_free OF((struct huft *)); int inflate_codes OF((struct huft *, struct huft *, int, int)); int inflate_stored OF((void)); @@ -1508,23 +1525,29 @@ int inflate OF((void)); #define flush_output(w) (wp=(w),flush_window()) /* Tables for deflate from PKZIP's appnote.txt. */ -static unsigned border[] = { /* Order of the bit length code lengths */ - 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; -static ush cplens[] = { /* Copy lengths for literal codes 257..285 */ - 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, - 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; - /* note: see note #13 above about the 258 in this list. */ -static ush cplext[] = { /* Extra bits for literal codes 257..285 */ - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, - 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99}; /* 99==invalid */ -static ush cpdist[] = { /* Copy offsets for distance codes 0..29 */ - 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, - 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, - 8193, 12289, 16385, 24577}; -static ush cpdext[] = { /* Extra bits for distance codes */ - 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, - 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, - 12, 12, 13, 13}; +static unsigned border[] = { /* Order of the bit length code lengths */ + 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 +}; +static ush cplens[] = { /* Copy lengths for literal codes 257..285 */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 +}; + + /* note: see note #13 above about the 258 in this list. */ +static ush cplext[] = { /* Extra bits for literal codes 257..285 */ + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, + 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99 +}; /* 99==invalid */ +static ush cpdist[] = { /* Copy offsets for distance codes 0..29 */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577 +}; +static ush cpdext[] = { /* Extra bits for distance codes */ + 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, + 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, + 12, 12, 13, 13 +}; @@ -1558,17 +1581,18 @@ static ush cpdext[] = { /* Extra bits for distance codes */ the stream. */ -ulg bb; /* bit buffer */ -unsigned bk; /* bits in bit buffer */ +ulg bb; /* bit buffer */ +unsigned bk; /* bits in bit buffer */ ush mask_bits[] = { - 0x0000, - 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, - 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff + 0x0000, + 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, + 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff }; #ifdef CRYPT - uch cc; +uch cc; + # define NEXTBYTE() (cc = get_byte(), zdecode(cc), cc) #else # define NEXTBYTE() (uch)get_byte() @@ -1610,342 +1634,342 @@ ush mask_bits[] = { */ -int lbits = 9; /* bits in base literal/length lookup table */ -int dbits = 6; /* bits in base distance lookup table */ +int lbits = 9; /* bits in base literal/length lookup table */ +int dbits = 6; /* bits in base distance lookup table */ /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ -#define BMAX 16 /* maximum bit length of any code (16 for explode) */ -#define N_MAX 288 /* maximum number of codes in any set */ +#define BMAX 16 /* maximum bit length of any code (16 for explode) */ +#define N_MAX 288 /* maximum number of codes in any set */ -unsigned hufts; /* track memory usage */ +unsigned hufts; /* track memory usage */ int huft_build(b, n, s, d, e, t, m) -unsigned *b; /* code lengths in bits (all assumed <= BMAX) */ -unsigned n; /* number of codes (assumed <= N_MAX) */ -unsigned s; /* number of simple-valued codes (0..s-1) */ -ush *d; /* list of base values for non-simple codes */ -ush *e; /* list of extra bits for non-simple codes */ -struct huft **t; /* result: starting table */ -int *m; /* maximum lookup bits, returns actual */ +unsigned *b; /* code lengths in bits (all assumed <= BMAX) */ +unsigned n; /* number of codes (assumed <= N_MAX) */ +unsigned s; /* number of simple-valued codes (0..s-1) */ +ush *d; /* list of base values for non-simple codes */ +ush *e; /* list of extra bits for non-simple codes */ +struct huft **t; /* result: starting table */ +int *m; /* maximum lookup bits, returns actual */ + /* Given a list of code lengths and a maximum table size, make a set of tables to decode that set of codes. Return zero on success, one if the given code set is incomplete (the tables are still built in this case), two if the input is invalid (all zero length codes or an oversubscribed set of lengths), and three if not enough memory. */ { - unsigned a; /* counter for codes of length k */ - unsigned c[BMAX+1]; /* bit length count table */ - unsigned f; /* i repeats in table every f entries */ - int g; /* maximum code length */ - int h; /* table level */ - register unsigned i; /* counter, current code */ - register unsigned j; /* counter */ - register int k; /* number of bits in current code */ - int l; /* bits per table (returned in m) */ - register unsigned *p; /* pointer into c[], b[], or v[] */ - register struct huft *q; /* points to current table */ - struct huft r; /* table entry for structure assignment */ - struct huft *u[BMAX]; /* table stack */ - unsigned v[N_MAX]; /* values in order of bit length */ - register int w; /* bits before this table == (l * h) */ - unsigned x[BMAX+1]; /* bit offsets, then code stack */ - unsigned *xp; /* pointer into x */ - int y; /* number of dummy codes added */ - unsigned z; /* number of entries in current table */ - - - /* Generate counts for each bit length */ - memzero(c, sizeof(c)); - p = b; i = n; - do { - Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"), - n-i, *p)); - c[*p]++; /* assume all entries <= BMAX */ - p++; /* Can't combine with above line (Solaris bug) */ - } while (--i); - if (c[0] == n) /* null input--all zero length codes */ - { - *t = (struct huft *)NULL; - *m = 0; - return 0; - } - - - /* Find minimum and maximum length, bound *m by those */ - l = *m; - for (j = 1; j <= BMAX; j++) - if (c[j]) - break; - k = j; /* minimum code length */ - if ((unsigned)l < j) - l = j; - for (i = BMAX; i; i--) - if (c[i]) - break; - g = i; /* maximum code length */ - if ((unsigned)l > i) - l = i; - *m = l; - - - /* Adjust last length count to fill out codes, if needed */ - for (y = 1 << j; j < i; j++, y <<= 1) - if ((y -= c[j]) < 0) - return 2; /* bad input: more codes than bits */ - if ((y -= c[i]) < 0) - return 2; - c[i] += y; - - - /* Generate starting offsets into the value table for each length */ - x[1] = j = 0; - p = c + 1; xp = x + 2; - while (--i) { /* note that i == g from above */ - *xp++ = (j += *p++); - } - - - /* Make a table of values in order of bit lengths */ - p = b; i = 0; - do { - if ((j = *p++) != 0) - v[x[j]++] = i; - } while (++i < n); - - - /* Generate the Huffman codes and for each, make the table entries */ - x[0] = i = 0; /* first Huffman code is zero */ - p = v; /* grab values in bit order */ - h = -1; /* no tables yet--level -1 */ - w = -l; /* bits decoded == (l * h) */ - u[0] = (struct huft *)NULL; /* just to keep compilers happy */ - q = (struct huft *)NULL; /* ditto */ - z = 0; /* ditto */ - - /* go through the bit lengths (k already is bits in shortest code) */ - for (; k <= g; k++) - { - a = c[k]; - while (a--) - { - /* here i is the Huffman code of length k bits for value *p */ - /* make tables up to required level */ - while (k > w + l) - { - h++; - w += l; /* previous table always l bits */ - - /* compute minimum size table less than or equal to l bits */ - z = (z = g - w) > (unsigned)l ? l : z; /* upper limit on table size */ - if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ - { /* too few codes for k-w bit table */ - f -= a + 1; /* deduct codes from patterns left */ - xp = c + k; - while (++j < z) /* try smaller tables up to z bits */ - { - if ((f <<= 1) <= *++xp) - break; /* enough codes to use up j bits */ - f -= *xp; /* else deduct codes from patterns */ - } - } - z = 1 << j; /* table entries for j-bit table */ - - /* allocate and link in new table */ - if ((q = (struct huft *)malloc((z + 1)*sizeof(struct huft))) == - (struct huft *)NULL) - { - if (h) - huft_free(u[0]); - return 3; /* not enough memory */ - } - hufts += z + 1; /* track memory usage */ - *t = q + 1; /* link to list for huft_free() */ - *(t = &(q->v.t)) = (struct huft *)NULL; - u[h] = ++q; /* table starts after link */ - - /* connect to last table, if there is one */ - if (h) - { - x[h] = i; /* save pattern for backing up */ - r.b = (uch)l; /* bits to dump before this table */ - r.e = (uch)(16 + j); /* bits in this table */ - r.v.t = q; /* pointer to this table */ - j = i >> (w - l); /* (get around Turbo C bug) */ - u[h-1][j] = r; /* connect to last table */ - } - } - - /* set up table entry in r */ - r.b = (uch)(k - w); - if (p >= v + n) - r.e = 99; /* out of values--invalid code */ - else if (*p < s) - { - r.e = (uch)(*p < 256 ? 16 : 15); /* 256 is end-of-block code */ - r.v.n = (ush)(*p); /* simple code is just the value */ - p++; /* one compiler does not like *p++ */ - } - else - { - r.e = (uch)e[*p - s]; /* non-simple--look up in lists */ - r.v.n = d[*p++ - s]; - } - - /* fill code-like entries with r */ - f = 1 << (k - w); - for (j = i >> w; j < z; j += f) - q[j] = r; - - /* backwards increment the k-bit code i */ - for (j = 1 << (k - 1); i & j; j >>= 1) - i ^= j; - i ^= j; - - /* backup over finished tables */ - while ((i & ((1 << w) - 1)) != x[h]) - { - h--; /* don't need to update q */ - w -= l; - } - } - } - - - /* Return true (1) if we were given an incomplete table */ - return y != 0 && g != 1; + unsigned a; /* counter for codes of length k */ + unsigned c[BMAX + 1]; /* bit length count table */ + unsigned f; /* i repeats in table every f entries */ + int g; /* maximum code length */ + int h; /* table level */ + register unsigned i; /* counter, current code */ + register unsigned j; /* counter */ + register int k; /* number of bits in current code */ + int l; /* bits per table (returned in m) */ + register unsigned *p; /* pointer into c[], b[], or v[] */ + register struct huft *q; /* points to current table */ + struct huft r; /* table entry for structure assignment */ + struct huft *u[BMAX]; /* table stack */ + unsigned v[N_MAX]; /* values in order of bit length */ + register int w; /* bits before this table == (l * h) */ + unsigned x[BMAX + 1]; /* bit offsets, then code stack */ + unsigned *xp; /* pointer into x */ + int y; /* number of dummy codes added */ + unsigned z; /* number of entries in current table */ + + + /* Generate counts for each bit length */ + memzero(c, sizeof(c)); + p = b; + i = n; + do { + Tracecv(*p, + (stderr, + (n - i >= ' ' + && n - i <= '~' ? "%c %d\n" : "0x%x %d\n"), n - i, *p)); + c[*p]++; /* assume all entries <= BMAX */ + p++; /* Can't combine with above line (Solaris bug) */ + } while (--i); + if (c[0] == n) { /* null input--all zero length codes */ + *t = (struct huft *) NULL; + *m = 0; + return 0; + } + + + /* Find minimum and maximum length, bound *m by those */ + l = *m; + for (j = 1; j <= BMAX; j++) + if (c[j]) + break; + k = j; /* minimum code length */ + if ((unsigned) l < j) + l = j; + for (i = BMAX; i; i--) + if (c[i]) + break; + g = i; /* maximum code length */ + if ((unsigned) l > i) + l = i; + *m = l; + + + /* Adjust last length count to fill out codes, if needed */ + for (y = 1 << j; j < i; j++, y <<= 1) + if ((y -= c[j]) < 0) + return 2; /* bad input: more codes than bits */ + if ((y -= c[i]) < 0) + return 2; + c[i] += y; + + + /* Generate starting offsets into the value table for each length */ + x[1] = j = 0; + p = c + 1; + xp = x + 2; + while (--i) { /* note that i == g from above */ + *xp++ = (j += *p++); + } + + + /* Make a table of values in order of bit lengths */ + p = b; + i = 0; + do { + if ((j = *p++) != 0) + v[x[j]++] = i; + } while (++i < n); + + + /* Generate the Huffman codes and for each, make the table entries */ + x[0] = i = 0; /* first Huffman code is zero */ + p = v; /* grab values in bit order */ + h = -1; /* no tables yet--level -1 */ + w = -l; /* bits decoded == (l * h) */ + u[0] = (struct huft *) NULL; /* just to keep compilers happy */ + q = (struct huft *) NULL; /* ditto */ + z = 0; /* ditto */ + + /* go through the bit lengths (k already is bits in shortest code) */ + for (; k <= g; k++) { + a = c[k]; + while (a--) { + /* here i is the Huffman code of length k bits for value *p */ + /* make tables up to required level */ + while (k > w + l) { + h++; + w += l; /* previous table always l bits */ + + /* compute minimum size table less than or equal to l bits */ + z = (z = g - w) > (unsigned) l ? l : z; /* upper limit on table size */ + if ((f = 1 << (j = k - w)) > a + 1) { /* try a k-w bit table *//* too few codes for k-w bit table */ + f -= a + 1; /* deduct codes from patterns left */ + xp = c + k; + while (++j < z) { /* try smaller tables up to z bits */ + if ((f <<= 1) <= *++xp) + break; /* enough codes to use up j bits */ + f -= *xp; /* else deduct codes from patterns */ + } + } + z = 1 << j; /* table entries for j-bit table */ + + /* allocate and link in new table */ + if ( + (q = + (struct huft *) malloc((z + 1) * + sizeof(struct huft))) == + (struct huft *) NULL) { + if (h) + huft_free(u[0]); + return 3; /* not enough memory */ + } + hufts += z + 1; /* track memory usage */ + *t = q + 1; /* link to list for huft_free() */ + *(t = &(q->v.t)) = (struct huft *) NULL; + u[h] = ++q; /* table starts after link */ + + /* connect to last table, if there is one */ + if (h) { + x[h] = i; /* save pattern for backing up */ + r.b = (uch) l; /* bits to dump before this table */ + r.e = (uch) (16 + j); /* bits in this table */ + r.v.t = q; /* pointer to this table */ + j = i >> (w - l); /* (get around Turbo C bug) */ + u[h - 1][j] = r; /* connect to last table */ + } + } + + /* set up table entry in r */ + r.b = (uch) (k - w); + if (p >= v + n) + r.e = 99; /* out of values--invalid code */ + else if (*p < s) { + r.e = (uch) (*p < 256 ? 16 : 15); /* 256 is end-of-block code */ + r.v.n = (ush) (*p); /* simple code is just the value */ + p++; /* one compiler does not like *p++ */ + } else { + r.e = (uch) e[*p - s]; /* non-simple--look up in lists */ + r.v.n = d[*p++ - s]; + } + + /* fill code-like entries with r */ + f = 1 << (k - w); + for (j = i >> w; j < z; j += f) + q[j] = r; + + /* backwards increment the k-bit code i */ + for (j = 1 << (k - 1); i & j; j >>= 1) + i ^= j; + i ^= j; + + /* backup over finished tables */ + while ((i & ((1 << w) - 1)) != x[h]) { + h--; /* don't need to update q */ + w -= l; + } + } + } + + + /* Return true (1) if we were given an incomplete table */ + return y != 0 && g != 1; } int huft_free(t) -struct huft *t; /* table to free */ +struct huft *t; /* table to free */ + /* Free the malloc'ed tables built by huft_build(), which makes a linked list of the tables it made, with the links in a dummy first entry of each table. */ { - register struct huft *p, *q; - - - /* Go through linked list, freeing from the malloced (t[-1]) address. */ - p = t; - while (p != (struct huft *)NULL) - { - q = (--p)->v.t; - free((char*)p); - p = q; - } - return 0; + register struct huft *p, *q; + + + /* Go through linked list, freeing from the malloced (t[-1]) address. */ + p = t; + while (p != (struct huft *) NULL) { + q = (--p)->v.t; + free((char *) p); + p = q; + } + return 0; } int inflate_codes(tl, td, bl, bd) -struct huft *tl, *td; /* literal/length and distance decoder tables */ -int bl, bd; /* number of bits decoded by tl[] and td[] */ +struct huft *tl, *td; /* literal/length and distance decoder tables */ +int bl, bd; /* number of bits decoded by tl[] and td[] */ + /* inflate (decompress) the codes in a deflated (compressed) block. Return an error code or zero if it all goes ok. */ { - register unsigned e; /* table entry flag/number of extra bits */ - unsigned n, d; /* length and index for copy */ - unsigned w; /* current window position */ - struct huft *t; /* pointer to table entry */ - unsigned ml, md; /* masks for bl and bd bits */ - register ulg b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ - - - /* make local copies of globals */ - b = bb; /* initialize bit buffer */ - k = bk; - w = wp; /* initialize window position */ - - /* inflate the coded data */ - ml = mask_bits[bl]; /* precompute masks for speed */ - md = mask_bits[bd]; - for (;;) /* do until end of block */ - { - NEEDBITS((unsigned)bl) - if ((e = (t = tl + ((unsigned)b & ml))->e) > 16) - do { - if (e == 99) - return 1; - DUMPBITS(t->b) - e -= 16; - NEEDBITS(e) - } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); - DUMPBITS(t->b) - if (e == 16) /* then it's a literal */ - { - slide[w++] = (uch)t->v.n; - Tracevv((stderr, "%c", slide[w-1])); - if (w == WSIZE) - { - flush_output(w); - w = 0; - } - } - else /* it's an EOB or a length */ - { - /* exit if end of block */ - if (e == 15) - break; - - /* get length of block to copy */ - NEEDBITS(e) - n = t->v.n + ((unsigned)b & mask_bits[e]); - DUMPBITS(e); - - /* decode distance of block to copy */ - NEEDBITS((unsigned)bd) - if ((e = (t = td + ((unsigned)b & md))->e) > 16) - do { - if (e == 99) - return 1; - DUMPBITS(t->b) - e -= 16; - NEEDBITS(e) - } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); - DUMPBITS(t->b) - NEEDBITS(e) - d = w - t->v.n - ((unsigned)b & mask_bits[e]); - DUMPBITS(e) - Tracevv((stderr,"\\[%d,%d]", w-d, n)); - - /* do the copy */ - do { - n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e); + register unsigned e; /* table entry flag/number of extra bits */ + unsigned n, d; /* length and index for copy */ + unsigned w; /* current window position */ + struct huft *t; /* pointer to table entry */ + unsigned ml, md; /* masks for bl and bd bits */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ + + + /* make local copies of globals */ + b = bb; /* initialize bit buffer */ + k = bk; + w = wp; /* initialize window position */ + + /* inflate the coded data */ + ml = mask_bits[bl]; /* precompute masks for speed */ + md = mask_bits[bd]; + for (;;) { /* do until end of block */ + NEEDBITS((unsigned) bl) + if ((e = (t = tl + ((unsigned) b & ml))->e) > 16) + do { + if (e == 99) + return 1; + DUMPBITS(t->b) + e -= 16; + NEEDBITS(e) + } while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) + > 16); + DUMPBITS(t->b) + if (e == 16) { /* then it's a literal */ + slide[w++] = (uch) t->v.n; + Tracevv((stderr, "%c", slide[w - 1])); + if (w == WSIZE) { + flush_output(w); + w = 0; + } + } else { /* it's an EOB or a length */ + + /* exit if end of block */ + if (e == 15) + break; + + /* get length of block to copy */ + NEEDBITS(e) + n = t->v.n + ((unsigned) b & mask_bits[e]); + DUMPBITS(e); + + /* decode distance of block to copy */ + NEEDBITS((unsigned) bd) + if ((e = (t = td + ((unsigned) b & md))->e) > 16) + do { + if (e == 99) + return 1; + DUMPBITS(t->b) + e -= 16; + NEEDBITS(e) + } + while ( + (e = + (t = + t->v.t + ((unsigned) b & mask_bits[e]))->e) > + 16); + DUMPBITS(t->b) + NEEDBITS(e) + d = w - t->v.n - ((unsigned) b & mask_bits[e]); + DUMPBITS(e) + Tracevv((stderr, "\\[%d,%d]", w - d, n)); + + /* do the copy */ + do { + n -= (e = + (e = + WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > + n ? n : e); #if !defined(NOMEMCPY) && !defined(DEBUG) - if (w - d >= e) /* (this test assumes unsigned comparison) */ - { - memcpy(slide + w, slide + d, e); - w += e; - d += e; - } - else /* do it slow to avoid memcpy() overlap */ -#endif /* !NOMEMCPY */ - do { - slide[w++] = slide[d++]; - Tracevv((stderr, "%c", slide[w-1])); - } while (--e); - if (w == WSIZE) - { - flush_output(w); - w = 0; - } - } while (n); - } - } - - - /* restore the globals from the locals */ - wp = w; /* restore global window pointer */ - bb = b; /* restore global bit buffer */ - bk = k; - - /* done */ - return 0; + if (w - d >= e) { /* (this test assumes unsigned comparison) */ + memcpy(slide + w, slide + d, e); + w += e; + d += e; + } else /* do it slow to avoid memcpy() overlap */ +#endif /* !NOMEMCPY */ + do { + slide[w++] = slide[d++]; + Tracevv((stderr, "%c", slide[w - 1])); + } while (--e); + if (w == WSIZE) { + flush_output(w); + w = 0; + } + } while (n); + } + } + + + /* restore the globals from the locals */ + wp = w; /* restore global window pointer */ + bb = b; /* restore global bit buffer */ + bk = k; + + /* done */ + return 0; } @@ -1953,52 +1977,50 @@ int bl, bd; /* number of bits decoded by tl[] and td[] */ int inflate_stored() /* "decompress" an inflated type 0 (stored) block. */ { - unsigned n; /* number of bytes in block */ - unsigned w; /* current window position */ - register ulg b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ - - - /* make local copies of globals */ - b = bb; /* initialize bit buffer */ - k = bk; - w = wp; /* initialize window position */ - - - /* go to byte boundary */ - n = k & 7; - DUMPBITS(n); - - - /* get the length and its complement */ - NEEDBITS(16) - n = ((unsigned)b & 0xffff); - DUMPBITS(16) - NEEDBITS(16) - if (n != (unsigned)((~b) & 0xffff)) - return 1; /* error in compressed data */ - DUMPBITS(16) - - - /* read and output the compressed data */ - while (n--) - { - NEEDBITS(8) - slide[w++] = (uch)b; - if (w == WSIZE) - { - flush_output(w); - w = 0; - } - DUMPBITS(8) - } - - - /* restore the globals from the locals */ - wp = w; /* restore global window pointer */ - bb = b; /* restore global bit buffer */ - bk = k; - return 0; + unsigned n; /* number of bytes in block */ + unsigned w; /* current window position */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ + + + /* make local copies of globals */ + b = bb; /* initialize bit buffer */ + k = bk; + w = wp; /* initialize window position */ + + + /* go to byte boundary */ + n = k & 7; + DUMPBITS(n); + + + /* get the length and its complement */ + NEEDBITS(16) + n = ((unsigned) b & 0xffff); + DUMPBITS(16) + NEEDBITS(16) + if (n != (unsigned) ((~b) & 0xffff)) + return 1; /* error in compressed data */ + DUMPBITS(16) + + + /* read and output the compressed data */ + while (n--) { + NEEDBITS(8) + slide[w++] = (uch) b; + if (w == WSIZE) { + flush_output(w); + w = 0; + } + DUMPBITS(8) + } + + + /* restore the globals from the locals */ + wp = w; /* restore global window pointer */ + bb = b; /* restore global bit buffer */ + bk = k; + return 0; } @@ -2008,48 +2030,47 @@ int inflate_fixed() either replace this with a custom decoder, or at least precompute the Huffman tables. */ { - int i; /* temporary variable */ - struct huft *tl; /* literal/length code table */ - struct huft *td; /* distance code table */ - int bl; /* lookup bits for tl */ - int bd; /* lookup bits for td */ - unsigned l[288]; /* length list for huft_build */ - - - /* set up literal table */ - for (i = 0; i < 144; i++) - l[i] = 8; - for (; i < 256; i++) - l[i] = 9; - for (; i < 280; i++) - l[i] = 7; - for (; i < 288; i++) /* make a complete, but wrong code set */ - l[i] = 8; - bl = 7; - if ((i = huft_build(l, 288, 257, cplens, cplext, &tl, &bl)) != 0) - return i; - - - /* set up distance table */ - for (i = 0; i < 30; i++) /* make an incomplete code set */ - l[i] = 5; - bd = 5; - if ((i = huft_build(l, 30, 0, cpdist, cpdext, &td, &bd)) > 1) - { - huft_free(tl); - return i; - } - - - /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) - return 1; - - - /* free the decoding tables, return */ - huft_free(tl); - huft_free(td); - return 0; + int i; /* temporary variable */ + struct huft *tl; /* literal/length code table */ + struct huft *td; /* distance code table */ + int bl; /* lookup bits for tl */ + int bd; /* lookup bits for td */ + unsigned l[288]; /* length list for huft_build */ + + + /* set up literal table */ + for (i = 0; i < 144; i++) + l[i] = 8; + for (; i < 256; i++) + l[i] = 9; + for (; i < 280; i++) + l[i] = 7; + for (; i < 288; i++) /* make a complete, but wrong code set */ + l[i] = 8; + bl = 7; + if ((i = huft_build(l, 288, 257, cplens, cplext, &tl, &bl)) != 0) + return i; + + + /* set up distance table */ + for (i = 0; i < 30; i++) /* make an incomplete code set */ + l[i] = 5; + bd = 5; + if ((i = huft_build(l, 30, 0, cpdist, cpdext, &td, &bd)) > 1) { + huft_free(tl); + return i; + } + + + /* decompress until an end-of-block code */ + if (inflate_codes(tl, td, bl, bd)) + return 1; + + + /* free the decoding tables, return */ + huft_free(tl); + huft_free(td); + return 0; } @@ -2057,209 +2078,202 @@ int inflate_fixed() int inflate_dynamic() /* decompress an inflated type 2 (dynamic Huffman codes) block. */ { - int i; /* temporary variables */ - unsigned j; - unsigned l; /* last length */ - unsigned m; /* mask for bit lengths table */ - unsigned n; /* number of lengths to get */ - struct huft *tl; /* literal/length code table */ - struct huft *td; /* distance code table */ - int bl; /* lookup bits for tl */ - int bd; /* lookup bits for td */ - unsigned nb; /* number of bit length codes */ - unsigned nl; /* number of literal/length codes */ - unsigned nd; /* number of distance codes */ + int i; /* temporary variables */ + unsigned j; + unsigned l; /* last length */ + unsigned m; /* mask for bit lengths table */ + unsigned n; /* number of lengths to get */ + struct huft *tl; /* literal/length code table */ + struct huft *td; /* distance code table */ + int bl; /* lookup bits for tl */ + int bd; /* lookup bits for td */ + unsigned nb; /* number of bit length codes */ + unsigned nl; /* number of literal/length codes */ + unsigned nd; /* number of distance codes */ + #ifdef PKZIP_BUG_WORKAROUND - unsigned ll[288+32]; /* literal/length and distance code lengths */ + unsigned ll[288 + 32]; /* literal/length and distance code lengths */ #else - unsigned ll[286+30]; /* literal/length and distance code lengths */ + unsigned ll[286 + 30]; /* literal/length and distance code lengths */ #endif - register ulg b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ - /* make local bit buffer */ - b = bb; - k = bk; + /* make local bit buffer */ + b = bb; + k = bk; - /* read in table lengths */ - NEEDBITS(5) - nl = 257 + ((unsigned)b & 0x1f); /* number of literal/length codes */ - DUMPBITS(5) - NEEDBITS(5) - nd = 1 + ((unsigned)b & 0x1f); /* number of distance codes */ - DUMPBITS(5) - NEEDBITS(4) - nb = 4 + ((unsigned)b & 0xf); /* number of bit length codes */ - DUMPBITS(4) + /* read in table lengths */ + NEEDBITS(5) + nl = 257 + ((unsigned) b & 0x1f); /* number of literal/length codes */ + DUMPBITS(5) + NEEDBITS(5) + nd = 1 + ((unsigned) b & 0x1f); /* number of distance codes */ + DUMPBITS(5) + NEEDBITS(4) + nb = 4 + ((unsigned) b & 0xf); /* number of bit length codes */ + DUMPBITS(4) #ifdef PKZIP_BUG_WORKAROUND - if (nl > 288 || nd > 32) + if (nl > 288 || nd > 32) #else - if (nl > 286 || nd > 30) + if (nl > 286 || nd > 30) #endif - return 1; /* bad lengths */ - - - /* read in bit-length-code lengths */ - for (j = 0; j < nb; j++) - { - NEEDBITS(3) - ll[border[j]] = (unsigned)b & 7; - DUMPBITS(3) - } - for (; j < 19; j++) - ll[border[j]] = 0; - - - /* build decoding table for trees--single level, 7 bit lookup */ - bl = 7; - if ((i = huft_build(ll, 19, 19, NULL, NULL, &tl, &bl)) != 0) - { - if (i == 1) - huft_free(tl); - return i; /* incomplete code set */ - } - - - /* read in literal and distance code lengths */ - n = nl + nd; - m = mask_bits[bl]; - i = l = 0; - while ((unsigned)i < n) - { - NEEDBITS((unsigned)bl) - j = (td = tl + ((unsigned)b & m))->b; - DUMPBITS(j) - j = td->v.n; - if (j < 16) /* length of code in bits (0..15) */ - ll[i++] = l = j; /* save last length in l */ - else if (j == 16) /* repeat last length 3 to 6 times */ - { - NEEDBITS(2) - j = 3 + ((unsigned)b & 3); - DUMPBITS(2) - if ((unsigned)i + j > n) - return 1; - while (j--) - ll[i++] = l; - } - else if (j == 17) /* 3 to 10 zero length codes */ - { - NEEDBITS(3) - j = 3 + ((unsigned)b & 7); - DUMPBITS(3) - if ((unsigned)i + j > n) - return 1; - while (j--) - ll[i++] = 0; - l = 0; - } - else /* j == 18: 11 to 138 zero length codes */ - { - NEEDBITS(7) - j = 11 + ((unsigned)b & 0x7f); - DUMPBITS(7) - if ((unsigned)i + j > n) - return 1; - while (j--) - ll[i++] = 0; - l = 0; - } - } - - - /* free decoding table for trees */ - huft_free(tl); - - - /* restore the global bit buffer */ - bb = b; - bk = k; - - - /* build the decoding tables for literal/length and distance codes */ - bl = lbits; - if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) - { - if (i == 1) { - fprintf(stderr, " incomplete literal tree\n"); - huft_free(tl); - } - return i; /* incomplete code set */ - } - bd = dbits; - if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0) - { - if (i == 1) { - fprintf(stderr, " incomplete distance tree\n"); + return 1; /* bad lengths */ + + + /* read in bit-length-code lengths */ + for (j = 0; j < nb; j++) { + NEEDBITS(3) + ll[border[j]] = (unsigned) b & 7; + DUMPBITS(3) + } + for (; j < 19; j++) + ll[border[j]] = 0; + + + /* build decoding table for trees--single level, 7 bit lookup */ + bl = 7; + if ((i = huft_build(ll, 19, 19, NULL, NULL, &tl, &bl)) != 0) { + if (i == 1) + huft_free(tl); + return i; /* incomplete code set */ + } + + + /* read in literal and distance code lengths */ + n = nl + nd; + m = mask_bits[bl]; + i = l = 0; + while ((unsigned) i < n) { + NEEDBITS((unsigned) bl) + j = (td = tl + ((unsigned) b & m))->b; + DUMPBITS(j) + j = td->v.n; + if (j < 16) /* length of code in bits (0..15) */ + ll[i++] = l = j; /* save last length in l */ + else if (j == 16) { /* repeat last length 3 to 6 times */ + NEEDBITS(2) + j = 3 + ((unsigned) b & 3); + DUMPBITS(2) + if ((unsigned) i + j > n) + return 1; + while (j--) + ll[i++] = l; + } else if (j == 17) { /* 3 to 10 zero length codes */ + NEEDBITS(3) + j = 3 + ((unsigned) b & 7); + DUMPBITS(3) + if ((unsigned) i + j > n) + return 1; + while (j--) + ll[i++] = 0; + l = 0; + } else { /* j == 18: 11 to 138 zero length codes */ + + NEEDBITS(7) + j = 11 + ((unsigned) b & 0x7f); + DUMPBITS(7) + if ((unsigned) i + j > n) + return 1; + while (j--) + ll[i++] = 0; + l = 0; + } + } + + + /* free decoding table for trees */ + huft_free(tl); + + + /* restore the global bit buffer */ + bb = b; + bk = k; + + + /* build the decoding tables for literal/length and distance codes */ + bl = lbits; + if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) { + if (i == 1) { + fprintf(stderr, " incomplete literal tree\n"); + huft_free(tl); + } + return i; /* incomplete code set */ + } + bd = dbits; + if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0) { + if (i == 1) { + fprintf(stderr, " incomplete distance tree\n"); #ifdef PKZIP_BUG_WORKAROUND - i = 0; - } + i = 0; + } #else - huft_free(td); - } - huft_free(tl); - return i; /* incomplete code set */ + huft_free(td); + } + huft_free(tl); + return i; /* incomplete code set */ #endif - } + } - /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) - return 1; + /* decompress until an end-of-block code */ + if (inflate_codes(tl, td, bl, bd)) + return 1; - /* free the decoding tables, return */ - huft_free(tl); - huft_free(td); - return 0; + /* free the decoding tables, return */ + huft_free(tl); + huft_free(td); + return 0; } int inflate_block(e) -int *e; /* last block flag */ +int *e; /* last block flag */ + /* decompress an inflated block */ { - unsigned t; /* block type */ - register ulg b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ + unsigned t; /* block type */ + register ulg b; /* bit buffer */ + register unsigned k; /* number of bits in bit buffer */ - /* make local bit buffer */ - b = bb; - k = bk; + /* make local bit buffer */ + b = bb; + k = bk; - /* read in last block bit */ - NEEDBITS(1) - *e = (int)b & 1; - DUMPBITS(1) + /* read in last block bit */ + NEEDBITS(1) + * e = (int) b & 1; + DUMPBITS(1) - /* read in block type */ - NEEDBITS(2) - t = (unsigned)b & 3; - DUMPBITS(2) + /* read in block type */ + NEEDBITS(2) + t = (unsigned) b & 3; + DUMPBITS(2) - /* restore the global bit buffer */ - bb = b; - bk = k; + /* restore the global bit buffer */ + bb = b; + bk = k; - /* inflate that block type */ - if (t == 2) - return inflate_dynamic(); - if (t == 0) - return inflate_stored(); - if (t == 1) - return inflate_fixed(); + /* inflate that block type */ + if (t == 2) + return inflate_dynamic(); + if (t == 0) + return inflate_stored(); + if (t == 1) + return inflate_fixed(); - /* bad block type */ - return 2; + /* bad block type */ + return 2; } @@ -2267,42 +2281,42 @@ int *e; /* last block flag */ int inflate() /* decompress an inflated entry */ { - int e; /* last block flag */ - int r; /* result code */ - unsigned h; /* maximum struct huft's malloc'ed */ + int e; /* last block flag */ + int r; /* result code */ + unsigned h; /* maximum struct huft's malloc'ed */ - /* initialize window, bit buffer */ - wp = 0; - bk = 0; - bb = 0; + /* initialize window, bit buffer */ + wp = 0; + bk = 0; + bb = 0; - /* decompress until the last block */ - h = 0; - do { - hufts = 0; - if ((r = inflate_block(&e)) != 0) - return r; - if (hufts > h) - h = hufts; - } while (!e); + /* decompress until the last block */ + h = 0; + do { + hufts = 0; + if ((r = inflate_block(&e)) != 0) + return r; + if (hufts > h) + h = hufts; + } while (!e); - /* Undo too much lookahead. The next read will be byte aligned so we - * can discard unused bits in the last meaningful byte. - */ - while (bk >= 8) { - bk -= 8; - inptr--; - } + /* Undo too much lookahead. The next read will be byte aligned so we + * can discard unused bits in the last meaningful byte. + */ + while (bk >= 8) { + bk -= 8; + inptr--; + } - /* flush out slide */ - flush_output(wp); + /* flush out slide */ + flush_output(wp); - /* return success */ + /* return success */ #ifdef DEBUG - fprintf(stderr, "<%u> ", h); -#endif /* DEBUG */ - return 0; + fprintf(stderr, "<%u> ", h); +#endif /* DEBUG */ + return 0; } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* gzip.c -- this is a stripped down version of gzip I put into busybox, it does * only standard in to standard out with -9 compression. It also requires the * zcat module for some important functions. @@ -12,11 +13,12 @@ //#endif static const char gzip_usage[] = - "gzip [OPTION]... FILE\n\n" - "Compress FILE with maximum compression.\n" - "When FILE is -, reads standard input. Implies -c.\n\n" - "Options:\n" - "\t-c\tWrite output to standard output instead of FILE.gz\n"; + "gzip [OPTION]... FILE\n\n" + "Compress FILE with maximum compression.\n" + "When FILE is -, reads standard input. Implies -c.\n\n" + + "Options:\n" + "\t-c\tWrite output to standard output instead of FILE.gz\n"; /* gzip.h -- common declarations for all gzip modules @@ -32,9 +34,9 @@ static const char gzip_usage[] = #endif #ifdef __STDC__ - typedef void *voidp; +typedef void *voidp; #else - typedef char *voidp; +typedef char *voidp; #endif /* I don't like nested includes, but the string and io functions are used @@ -49,10 +51,10 @@ static const char gzip_usage[] = # define memzero(s, n) memset ((voidp)(s), 0, (n)) #else # include <strings.h> -# define strchr index +# define strchr index # define strrchr rindex -# define memcpy(d, s, n) bcopy((s), (d), (n)) -# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) +# define memcpy(d, s, n) bcopy((s), (d), (n)) +# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) # define memzero(s, n) bzero((s), (n)) #endif @@ -62,9 +64,9 @@ static const char gzip_usage[] = #define local static -typedef unsigned char uch; +typedef unsigned char uch; typedef unsigned short ush; -typedef unsigned long ulg; +typedef unsigned long ulg; /* Return codes from gzip */ #define OK 0 @@ -79,7 +81,7 @@ typedef unsigned long ulg; /* methods 4 to 7 reserved */ #define DEFLATED 8 #define MAX_METHODS 9 -extern int method; /* compression method */ +extern int method; /* compression method */ /* To save memory for 16 bit systems, some arrays are overlaid between * the various modules: @@ -94,27 +96,27 @@ extern int method; /* compression method */ #ifndef INBUFSIZ # ifdef SMALL_MEM -# define INBUFSIZ 0x2000 /* input buffer size */ +# define INBUFSIZ 0x2000 /* input buffer size */ # else -# define INBUFSIZ 0x8000 /* input buffer size */ +# define INBUFSIZ 0x8000 /* input buffer size */ # endif #endif -#define INBUF_EXTRA 64 /* required by unlzw() */ +#define INBUF_EXTRA 64 /* required by unlzw() */ #ifndef OUTBUFSIZ # ifdef SMALL_MEM -# define OUTBUFSIZ 8192 /* output buffer size */ +# define OUTBUFSIZ 8192 /* output buffer size */ # else -# define OUTBUFSIZ 16384 /* output buffer size */ +# define OUTBUFSIZ 16384 /* output buffer size */ # endif #endif -#define OUTBUF_EXTRA 2048 /* required by unlzw() */ +#define OUTBUF_EXTRA 2048 /* required by unlzw() */ #ifndef DIST_BUFSIZE # ifdef SMALL_MEM -# define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */ +# define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */ # else -# define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */ +# define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */ # endif #endif @@ -133,60 +135,61 @@ extern int method; /* compression method */ # define FREE(array) #endif -EXTERN(uch, inbuf); /* input buffer */ -EXTERN(uch, outbuf); /* output buffer */ -EXTERN(ush, d_buf); /* buffer for distances, see trees.c */ -EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ +EXTERN(uch, inbuf); /* input buffer */ +EXTERN(uch, outbuf); /* output buffer */ +EXTERN(ush, d_buf); /* buffer for distances, see trees.c */ +EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ #define tab_suffix window #ifndef MAXSEG_64K -# define tab_prefix prev /* hash link (see deflate.c) */ -# define head (prev+WSIZE) /* hash head (see deflate.c) */ - EXTERN(ush, tab_prefix); /* prefix code (see unlzw.c) */ +# define tab_prefix prev /* hash link (see deflate.c) */ +# define head (prev+WSIZE) /* hash head (see deflate.c) */ +EXTERN(ush, tab_prefix); /* prefix code (see unlzw.c) */ #else # define tab_prefix0 prev # define head tab_prefix1 - EXTERN(ush, tab_prefix0); /* prefix for even codes */ - EXTERN(ush, tab_prefix1); /* prefix for odd codes */ +EXTERN(ush, tab_prefix0); /* prefix for even codes */ +EXTERN(ush, tab_prefix1); /* prefix for odd codes */ #endif -extern unsigned insize; /* valid bytes in inbuf */ -extern unsigned inptr; /* index of next byte to be processed in inbuf */ -extern unsigned outcnt; /* bytes in output buffer */ +extern unsigned insize; /* valid bytes in inbuf */ +extern unsigned inptr; /* index of next byte to be processed in inbuf */ +extern unsigned outcnt; /* bytes in output buffer */ -extern long bytes_in; /* number of input bytes */ -extern long bytes_out; /* number of output bytes */ -extern long header_bytes;/* number of bytes in gzip header */ +extern long bytes_in; /* number of input bytes */ +extern long bytes_out; /* number of output bytes */ +extern long header_bytes; /* number of bytes in gzip header */ #define isize bytes_in /* for compatibility with old zip sources (to be cleaned) */ -extern int ifd; /* input file descriptor */ -extern int ofd; /* output file descriptor */ -extern char ifname[]; /* input file name or "stdin" */ -extern char ofname[]; /* output file name or "stdout" */ -extern char *progname; /* program name */ +extern int ifd; /* input file descriptor */ +extern int ofd; /* output file descriptor */ +extern char ifname[]; /* input file name or "stdin" */ +extern char ofname[]; /* output file name or "stdout" */ +extern char *progname; /* program name */ + +extern long time_stamp; /* original time stamp (modification time) */ +extern long ifile_size; /* input file size, -1 for devices (debug only) */ -extern long time_stamp; /* original time stamp (modification time) */ -extern long ifile_size; /* input file size, -1 for devices (debug only) */ +typedef int file_t; /* Do not use stdio */ -typedef int file_t; /* Do not use stdio */ -#define NO_FILE (-1) /* in memory compression */ +#define NO_FILE (-1) /* in memory compression */ -#define PACK_MAGIC "\037\036" /* Magic header for packed files */ -#define GZIP_MAGIC "\037\213" /* Magic header for gzip files, 1F 8B */ -#define OLD_GZIP_MAGIC "\037\236" /* Magic header for gzip 0.5 = freeze 1.x */ -#define LZH_MAGIC "\037\240" /* Magic header for SCO LZH Compress files*/ -#define PKZIP_MAGIC "\120\113\003\004" /* Magic header for pkzip files */ +#define PACK_MAGIC "\037\036" /* Magic header for packed files */ +#define GZIP_MAGIC "\037\213" /* Magic header for gzip files, 1F 8B */ +#define OLD_GZIP_MAGIC "\037\236" /* Magic header for gzip 0.5 = freeze 1.x */ +#define LZH_MAGIC "\037\240" /* Magic header for SCO LZH Compress files */ +#define PKZIP_MAGIC "\120\113\003\004" /* Magic header for pkzip files */ /* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ -#define RESERVED 0xC0 /* bit 6,7: reserved */ +#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ +#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ +#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ +#define COMMENT 0x10 /* bit 4 set: file comment present */ +#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ +#define RESERVED 0xC0 /* bit 6,7: reserved */ /* internal file attribute */ #define UNKNOWN 0xffff @@ -194,8 +197,8 @@ typedef int file_t; /* Do not use stdio */ #define ASCII 1 #ifndef WSIZE -# define WSIZE 0x8000 /* window size--must be a power of two, and */ -#endif /* at least 32K for zip's deflate method */ +# define WSIZE 0x8000 /* window size--must be a power of two, and */ +#endif /* at least 32K for zip's deflate method */ #define MIN_MATCH 3 #define MAX_MATCH 258 @@ -211,12 +214,12 @@ typedef int file_t; /* Do not use stdio */ * distances are limited to MAX_DIST instead of WSIZE. */ -extern int decrypt; /* flag to turn on decryption */ -extern int exit_code; /* program exit code */ -extern int verbose; /* be verbose (-v) */ -extern int quiet; /* be quiet (-q) */ -extern int test; /* check .z file integrity */ -extern int save_orig_name; /* set if original name must be saved */ +extern int decrypt; /* flag to turn on decryption */ +extern int exit_code; /* program exit code */ +extern int verbose; /* be verbose (-v) */ +extern int quiet; /* be quiet (-q) */ +extern int test; /* check .z file integrity */ +extern int save_orig_name; /* set if original name must be saved */ #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) @@ -248,10 +251,10 @@ extern int save_orig_name; /* set if original name must be saved */ put_short(((ulg)(n)) >> 16); \ } -#define seekable() 0 /* force sequential output */ -#define translate_eol 0 /* no option -a yet */ +#define seekable() 0 /* force sequential output */ +#define translate_eol 0 /* no option -a yet */ -#define tolow(c) (isupper(c) ? (c)-'A'+'a' : (c)) /* force to lower case */ +#define tolow(c) (isupper(c) ? (c)-'A'+'a' : (c)) /* force to lower case */ /* Macros for getting two-byte and four-byte header values */ #define SH(p) ((ush)(uch)((p)[0]) | ((ush)(uch)((p)[1]) << 8)) @@ -281,57 +284,58 @@ extern int save_orig_name; /* set if original name must be saved */ /* in zip.c: */ -extern int zip OF((int in, int out)); -extern int file_read OF((char *buf, unsigned size)); +extern int zip OF((int in, int out)); +extern int file_read OF((char *buf, unsigned size)); /* in unzip.c */ -extern int unzip OF((int in, int out)); +extern int unzip OF((int in, int out)); extern int check_zipfile OF((int in)); /* in unpack.c */ -extern int unpack OF((int in, int out)); +extern int unpack OF((int in, int out)); /* in unlzh.c */ -extern int unlzh OF((int in, int out)); +extern int unlzh OF((int in, int out)); /* in gzip.c */ RETSIGTYPE abort_gzip OF((void)); - /* in deflate.c */ -void lm_init OF((ush *flags)); -ulg deflate OF((void)); + /* in deflate.c */ +void lm_init OF((ush * flags)); +ulg deflate OF((void)); - /* in trees.c */ -void ct_init OF((ush *attr, int *method)); -int ct_tally OF((int dist, int lc)); -ulg flush_block OF((char *buf, ulg stored_len, int eof)); + /* in trees.c */ +void ct_init OF((ush * attr, int *method)); +int ct_tally OF((int dist, int lc)); +ulg flush_block OF((char *buf, ulg stored_len, int eof)); - /* in bits.c */ -void bi_init OF((file_t zipfile)); -void send_bits OF((int value, int length)); + /* in bits.c */ +void bi_init OF((file_t zipfile)); +void send_bits OF((int value, int length)); unsigned bi_reverse OF((unsigned value, int length)); -void bi_windup OF((void)); -void copy_block OF((char *buf, unsigned len, int header)); -extern int (*read_buf) OF((char *buf, unsigned size)); +void bi_windup OF((void)); +void copy_block OF((char *buf, unsigned len, int header)); +extern int (*read_buf) OF((char *buf, unsigned size)); /* in util.c: */ -extern int copy OF((int in, int out)); -extern ulg updcrc OF((uch *s, unsigned n)); -extern void clear_bufs OF((void)); -extern int fill_inbuf OF((int eof_ok)); -extern void flush_outbuf OF((void)); -extern void flush_window OF((void)); -extern void write_buf OF((int fd, voidp buf, unsigned cnt)); -extern char *strlwr OF((char *s)); -extern char *add_envopt OF((int *argcp, char ***argvp, char *env)); -extern void error OF((char *m)); -extern void warn OF((char *a, char *b)); -extern void read_error OF((void)); -extern void write_error OF((void)); -extern void display_ratio OF((long num, long den, FILE *file)); +extern int copy OF((int in, int out)); +extern ulg updcrc OF((uch * s, unsigned n)); +extern void clear_bufs OF((void)); +extern int fill_inbuf OF((int eof_ok)); +extern void flush_outbuf OF((void)); +extern void flush_window OF((void)); +extern void write_buf OF((int fd, voidp buf, unsigned cnt)); +extern char *strlwr OF((char *s)); +extern char *add_envopt OF((int *argcp, char ***argvp, char *env)); +extern void error OF((char *m)); +extern void warn OF((char *a, char *b)); +extern void read_error OF((void)); +extern void write_error OF((void)); +extern void display_ratio OF((long num, long den, FILE * file)); /* in inflate.c */ extern int inflate OF((void)); + /* lzw.h -- define the lzw functions. * Copyright (C) 1992-1993 Jean-loup Gailly. * This is free software; you can redistribute it and/or modify it under the @@ -345,9 +349,9 @@ extern int inflate OF((void)); #ifndef BITS # define BITS 16 #endif -#define INIT_BITS 9 /* Initial number of bits per code */ +#define INIT_BITS 9 /* Initial number of bits per code */ -#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ +#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ /* Mask 0x20 is reserved to mean a fourth header byte, and 0x40 is free. * It's a pity that old uncompress does not check bit 0x20. That makes * extension of the format actually undesirable because old compress @@ -362,13 +366,13 @@ extern int inflate OF((void)); * clear the dictionary. */ -#define LZW_RESERVED 0x60 /* reserved bits */ +#define LZW_RESERVED 0x60 /* reserved bits */ -#define CLEAR 256 /* flush the dictionary */ -#define FIRST (CLEAR+1) /* first free entry */ +#define CLEAR 256 /* flush the dictionary */ +#define FIRST (CLEAR+1) /* first free entry */ -extern int maxbits; /* max bits per code for LZW */ -extern int block_mode; /* block compress mode -C compatible with 2.0 */ +extern int maxbits; /* max bits per code for LZW */ +extern int block_mode; /* block compress mode -C compatible with 2.0 */ /* revision.h -- define the version number * Copyright (C) 1992-1993 Jean-loup Gailly. @@ -404,18 +408,18 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # define OS2 #endif -#if defined(OS2) && defined(MSDOS) /* MS C under OS/2 */ +#if defined(OS2) && defined(MSDOS) /* MS C under OS/2 */ # undef MSDOS #endif #ifdef MSDOS # ifdef __GNUC__ - /* DJGPP version 1.09+ on MS-DOS. - * The DJGPP 1.09 stat() function must be upgraded before gzip will - * fully work. - * No need for DIRENT, since <unistd.h> defines POSIX_SOURCE which - * implies DIRENT. - */ + /* DJGPP version 1.09+ on MS-DOS. + * The DJGPP 1.09 stat() function must be upgraded before gzip will + * fully work. + * No need for DIRENT, since <unistd.h> defines POSIX_SOURCE which + * implies DIRENT. + */ # define near # else # define MAXSEG_64K @@ -426,7 +430,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # else # define NO_UTIME # endif -# else /* MSC */ +# else /* MSC */ # define HAVE_SYS_UTIME_H # define NO_UTIME_H # endif @@ -441,7 +445,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # define PROTO # define STDC_HEADERS # define NO_SIZE_CHECK -# define casemap(c) tolow(c) /* Force file names to lower case */ +# define casemap(c) tolow(c) /* Force file names to lower case */ # include <io.h> # define OS_CODE 0x00 # define SET_BINARY_MODE(fd) setmode(fd, O_BINARY) @@ -494,7 +498,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # endif #endif -#ifdef WIN32 /* Windows NT */ +#ifdef WIN32 /* Windows NT */ # define HAVE_SYS_UTIME_H # define NO_UTIME_H # define PATH_SEP2 '\\' @@ -510,7 +514,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # define NO_MULTIPLE_DOTS # define MAX_EXT_CHARS 3 # define Z_SUFFIX "z" -# define casemap(c) tolow(c) /* Force file names to lower case */ +# define casemap(c) tolow(c) /* Force file names to lower case */ # endif # define OS_CODE 0x0b #endif @@ -519,10 +523,10 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # ifdef __TURBOC__ # include <alloc.h> # define DYN_ALLOC - /* Turbo C 2.0 does not accept static allocations of large arrays */ - void * fcalloc (unsigned items, unsigned size); - void fcfree (void *ptr); -# else /* MSC */ + /* Turbo C 2.0 does not accept static allocations of large arrays */ +void *fcalloc(unsigned items, unsigned size); +void fcfree(void *ptr); +# else /* MSC */ # include <malloc.h> # define fcalloc(nitems,itemsize) halloc((long)(nitems),(itemsize)) # define fcfree(ptr) hfree(ptr) @@ -565,17 +569,18 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # ifdef __GNUC__ # define DIRENT # define HAVE_UNISTD_H -# else /* SASC */ +# else /* SASC */ # define NO_STDIN_FSTAT # define SYSDIR # define NO_SYMLINK # define NO_CHOWN # define NO_FCNTL_H -# include <fcntl.h> /* for read() and write() */ +# include <fcntl.h> /* for read() and write() */ # define direct dirent - extern void _expand_args(int *argc, char ***argv); +extern void _expand_args(int *argc, char ***argv); + # define EXPAND(argc,argv) _expand_args(&argc,&argv); -# undef O_BINARY /* disable useless --ascii option */ +# undef O_BINARY /* disable useless --ascii option */ # endif #endif @@ -595,7 +600,7 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # define MAX_EXT_CHARS 3 # define Z_SUFFIX "z" # define NO_CHOWN -# define casemap(c) tolow(c) /* Force file names to lower case */ +# define casemap(c) tolow(c) /* Force file names to lower case */ # define NO_SYMLINK # endif #endif @@ -615,28 +620,28 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ # endif #endif -#ifdef __50SERIES /* Prime/PRIMOS */ +#ifdef __50SERIES /* Prime/PRIMOS */ # define PATH_SEP '>' # define STDC_HEADERS # define NO_MEMORY_H # define NO_UTIME_H # define NO_UTIME -# define NO_CHOWN -# define NO_STDIN_FSTAT -# define NO_SIZE_CHECK +# define NO_CHOWN +# define NO_STDIN_FSTAT +# define NO_SIZE_CHECK # define NO_SYMLINK # define RECORD_IO 1 -# define casemap(c) tolow(c) /* Force file names to lower case */ +# define casemap(c) tolow(c) /* Force file names to lower case */ # define put_char(c) put_byte((c) & 0x7F) # define get_char(c) ascii2pascii(get_byte()) -# define OS_CODE 0x0F /* temporary, subject to change */ +# define OS_CODE 0x0F /* temporary, subject to change */ # ifdef SIGTERM -# undef SIGTERM /* We don't want a signal handler for SIGTERM */ +# undef SIGTERM /* We don't want a signal handler for SIGTERM */ # endif #endif -#if defined(pyr) && !defined(NOMEMCPY) /* Pyramid */ -# define NOMEMCPY /* problem with overlapping copies */ +#if defined(pyr) && !defined(NOMEMCPY) /* Pyramid */ +# define NOMEMCPY /* problem with overlapping copies */ #endif #ifdef TOPS20 @@ -644,14 +649,14 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ #endif #ifndef unix -# define NO_ST_INO /* don't rely on inode numbers */ +# define NO_ST_INO /* don't rely on inode numbers */ #endif /* Common defaults */ #ifndef OS_CODE -# define OS_CODE 0x03 /* assume Unix */ +# define OS_CODE 0x03 /* assume Unix */ #endif #ifndef PATH_SEP @@ -773,9 +778,10 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ * Local data used by the "bit string" routines. */ -local file_t zfile; /* output gzip file */ +local file_t zfile; /* output gzip file */ local unsigned short bi_buf; + /* Output buffer. bits are inserted starting at the bottom (least significant * bits). */ @@ -786,36 +792,38 @@ local unsigned short bi_buf; */ local int bi_valid; + /* Number of valid bits in bi_buf. All bits above the last valid bit * are always zero. */ int (*read_buf) OF((char *buf, unsigned size)); + /* Current input function. Set to mem_read for in-memory compression */ #ifdef DEBUG - ulg bits_sent; /* bit length of the compressed data */ +ulg bits_sent; /* bit length of the compressed data */ #endif /* =========================================================================== * Initialize the bit string routines. */ -void bi_init (zipfile) - file_t zipfile; /* output zip file, NO_FILE for in-memory compression */ +void bi_init(zipfile) +file_t zipfile; /* output zip file, NO_FILE for in-memory compression */ { - zfile = zipfile; - bi_buf = 0; - bi_valid = 0; + zfile = zipfile; + bi_buf = 0; + bi_valid = 0; #ifdef DEBUG - bits_sent = 0L; + bits_sent = 0L; #endif - /* Set the defaults for file compression. They are set by memcompress - * for in-memory compression. - */ - if (zfile != NO_FILE) { - read_buf = file_read; - } + /* Set the defaults for file compression. They are set by memcompress + * for in-memory compression. + */ + if (zfile != NO_FILE) { + read_buf = file_read; + } } /* =========================================================================== @@ -823,27 +831,27 @@ void bi_init (zipfile) * IN assertion: length <= 16 and value fits in length bits. */ void send_bits(value, length) - int value; /* value to send */ - int length; /* number of bits */ +int value; /* value to send */ +int length; /* number of bits */ { #ifdef DEBUG - Tracev((stderr," l %2d v %4x ", length, value)); - Assert(length > 0 && length <= 15, "invalid length"); - bits_sent += (ulg)length; -#endif - /* If not enough room in bi_buf, use (valid) bits from bi_buf and - * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) - * unused bits in value. - */ - if (bi_valid > (int)Buf_size - length) { - bi_buf |= (value << bi_valid); - put_short(bi_buf); - bi_buf = (ush)value >> (Buf_size - bi_valid); - bi_valid += length - Buf_size; - } else { - bi_buf |= value << bi_valid; - bi_valid += length; - } + Tracev((stderr, " l %2d v %4x ", length, value)); + Assert(length > 0 && length <= 15, "invalid length"); + bits_sent += (ulg) length; +#endif + /* If not enough room in bi_buf, use (valid) bits from bi_buf and + * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) + * unused bits in value. + */ + if (bi_valid > (int) Buf_size - length) { + bi_buf |= (value << bi_valid); + put_short(bi_buf); + bi_buf = (ush) value >> (Buf_size - bi_valid); + bi_valid += length - Buf_size; + } else { + bi_buf |= value << bi_valid; + bi_valid += length; + } } /* =========================================================================== @@ -852,15 +860,16 @@ void send_bits(value, length) * IN assertion: 1 <= len <= 15 */ unsigned bi_reverse(code, len) - unsigned code; /* the value to invert */ - int len; /* its bit length */ +unsigned code; /* the value to invert */ +int len; /* its bit length */ { - register unsigned res = 0; - do { - res |= code & 1; - code >>= 1, res <<= 1; - } while (--len > 0); - return res >> 1; + register unsigned res = 0; + + do { + res |= code & 1; + code >>= 1, res <<= 1; + } while (--len > 0); + return res >> 1; } /* =========================================================================== @@ -868,15 +877,15 @@ unsigned bi_reverse(code, len) */ void bi_windup() { - if (bi_valid > 8) { - put_short(bi_buf); - } else if (bi_valid > 0) { - put_byte(bi_buf); - } - bi_buf = 0; - bi_valid = 0; + if (bi_valid > 8) { + put_short(bi_buf); + } else if (bi_valid > 0) { + put_byte(bi_buf); + } + bi_buf = 0; + bi_valid = 0; #ifdef DEBUG - bits_sent = (bits_sent+7) & ~7; + bits_sent = (bits_sent + 7) & ~7; #endif } @@ -885,30 +894,33 @@ void bi_windup() * one's complement if requested. */ void copy_block(buf, len, header) - char *buf; /* the input data */ - unsigned len; /* its length */ - int header; /* true if block header must be written */ +char *buf; /* the input data */ +unsigned len; /* its length */ +int header; /* true if block header must be written */ { - bi_windup(); /* align on byte boundary */ + bi_windup(); /* align on byte boundary */ - if (header) { - put_short((ush)len); - put_short((ush)~len); + if (header) { + put_short((ush) len); + put_short((ush) ~ len); #ifdef DEBUG - bits_sent += 2*16; + bits_sent += 2 * 16; #endif - } + } #ifdef DEBUG - bits_sent += (ulg)len<<3; + bits_sent += (ulg) len << 3; #endif - while (len--) { + while (len--) { #ifdef CRYPT - int t; - if (key) zencode(*buf, t); + int t; + + if (key) + zencode(*buf, t); #endif - put_byte(*buf++); - } + put_byte(*buf++); + } } + /* deflate.c -- compress data using the deflation algorithm * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the @@ -987,7 +999,7 @@ void copy_block(buf, len, header) */ #ifdef SMALL_MEM -# define HASH_BITS 13 /* Number of bits used to hash strings */ +# define HASH_BITS 13 /* Number of bits used to hash strings */ #endif #ifdef MEDIUM_MEM # define HASH_BITS 14 @@ -1001,35 +1013,30 @@ void copy_block(buf, len, header) * window with tab_suffix. Check that we can do this: */ #if (WSIZE<<1) > (1<<BITS) - error: cannot overlay window with tab_suffix and prev with tab_prefix0 +error:cannot overlay window with tab_suffix and prev with tab_prefix0 #endif #if HASH_BITS > BITS-1 - error: cannot overlay head with tab_prefix1 +error:cannot overlay head with tab_prefix1 #endif - #define HASH_SIZE (unsigned)(1<<HASH_BITS) #define HASH_MASK (HASH_SIZE-1) #define WMASK (WSIZE-1) /* HASH_SIZE and WSIZE must be powers of two */ - #define NIL 0 /* Tail of hash chains */ - #define FAST 4 #define SLOW 2 /* speed options for the general purpose bit flag */ - #ifndef TOO_FAR # define TOO_FAR 4096 #endif /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ - /* =========================================================================== * Local data used by the "longest match" routines. */ - typedef ush Pos; typedef unsigned IPos; + /* A Pos is an index in the character window. We use short instead of int to * save space in the various tables. IPos is used only for parameter passing. */ @@ -1054,17 +1061,19 @@ typedef unsigned IPos; /* DECLARE(Pos, head, 1<<HASH_BITS); */ /* Heads of the hash chains or NIL. */ -ulg window_size = (ulg)2*WSIZE; +ulg window_size = (ulg) 2 * WSIZE; + /* window size, 2*WSIZE except for MMAP or BIG_MEM, where it is the * input file length plus MIN_LOOKAHEAD. */ long block_start; + /* window position at the beginning of the current output block. Gets * negative when the window is moved backwards. */ -local unsigned ins_h; /* hash index of string to be inserted */ +local unsigned ins_h; /* hash index of string to be inserted */ #define H_SHIFT ((HASH_BITS+MIN_MATCH-1)/MIN_MATCH) /* Number of bits by which ins_h and del_h must be shifted at each @@ -1074,21 +1083,24 @@ local unsigned ins_h; /* hash index of string to be inserted */ */ unsigned int near prev_length; + /* Length of the best match at previous step. Matches not greater than this * are discarded. This is used in the lazy match evaluation. */ - unsigned near strstart; /* start of string to insert */ - unsigned near match_start; /* start of matching string */ -local int eofile; /* flag set at end of input file */ -local unsigned lookahead; /* number of valid bytes ahead in window */ +unsigned near strstart; /* start of string to insert */ +unsigned near match_start; /* start of matching string */ +local int eofile; /* flag set at end of input file */ +local unsigned lookahead; /* number of valid bytes ahead in window */ unsigned near max_chain_length; + /* To speed up deflation, hash chains are never searched beyond this length. * A higher limit improves compression ratio but degrades the speed. */ local unsigned int max_lazy_match; + /* Attempt to find a better match only when the current match is strictly * smaller than this value. This mechanism is used only for compression * levels >= 4. @@ -1100,6 +1112,7 @@ local unsigned int max_lazy_match; */ unsigned near good_match; + /* Use a faster search when the previous match is longer than this */ @@ -1110,20 +1123,21 @@ unsigned near good_match; */ typedef struct config { - ush good_length; /* reduce lazy search above this match length */ - ush max_lazy; /* do not perform lazy search above this match length */ - ush nice_length; /* quit search above this match length */ - ush max_chain; + ush good_length; /* reduce lazy search above this match length */ + ush max_lazy; /* do not perform lazy search above this match length */ + ush nice_length; /* quit search above this match length */ + ush max_chain; } config; #ifdef FULL_SEARCH # define nice_match MAX_MATCH #else - int near nice_match; /* Stop searching when current match exceeds this */ +int near nice_match; /* Stop searching when current match exceeds this */ #endif -local config configuration_table = -/* 9 */ {32, 258, 258, 4096}; /* maximum compression */ +local config configuration_table = + /* 9 */ { 32, 258, 258, 4096 }; + /* maximum compression */ /* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 * For deflate_fast() (levels <= 3) good is ignored and lazy has a different @@ -1136,15 +1150,16 @@ local config configuration_table = /* =========================================================================== * Prototypes for local functions. */ -local void fill_window OF((void)); +local void fill_window OF((void)); + +int longest_match OF((IPos cur_match)); - int longest_match OF((IPos cur_match)); #ifdef ASMV - void match_init OF((void)); /* asm code initialization */ +void match_init OF((void)); /* asm code initialization */ #endif #ifdef DEBUG -local void check_match OF((IPos start, IPos match, int length)); +local void check_match OF((IPos start, IPos match, int length)); #endif /* =========================================================================== @@ -1171,54 +1186,57 @@ local void check_match OF((IPos start, IPos match, int length)); /* =========================================================================== * Initialize the "longest match" routines for a new file */ -void lm_init (flags) - ush *flags; /* general purpose bit flag */ +void lm_init(flags) +ush *flags; /* general purpose bit flag */ { - register unsigned j; + register unsigned j; - /* Initialize the hash table. */ + /* Initialize the hash table. */ #if defined(MAXSEG_64K) && HASH_BITS == 15 - for (j = 0; j < HASH_SIZE; j++) head[j] = NIL; + for (j = 0; j < HASH_SIZE; j++) + head[j] = NIL; #else - memzero((char*)head, HASH_SIZE*sizeof(*head)); + memzero((char *) head, HASH_SIZE * sizeof(*head)); #endif - /* prev will be initialized on the fly */ + /* prev will be initialized on the fly */ - /* Set the default configuration parameters: - */ - max_lazy_match = configuration_table.max_lazy; - good_match = configuration_table.good_length; + /* Set the default configuration parameters: + */ + max_lazy_match = configuration_table.max_lazy; + good_match = configuration_table.good_length; #ifndef FULL_SEARCH - nice_match = configuration_table.nice_length; + nice_match = configuration_table.nice_length; #endif - max_chain_length = configuration_table.max_chain; - *flags |= SLOW; - /* ??? reduce max_chain_length for binary files */ + max_chain_length = configuration_table.max_chain; + *flags |= SLOW; + /* ??? reduce max_chain_length for binary files */ - strstart = 0; - block_start = 0L; + strstart = 0; + block_start = 0L; #ifdef ASMV - match_init(); /* initialize the asm code */ -#endif - - lookahead = read_buf((char*)window, - sizeof(int) <= 2 ? (unsigned)WSIZE : 2*WSIZE); - - if (lookahead == 0 || lookahead == (unsigned)EOF) { - eofile = 1, lookahead = 0; - return; - } - eofile = 0; - /* Make sure that we always have enough lookahead. This is important - * if input comes from a device such as a tty. - */ - while (lookahead < MIN_LOOKAHEAD && !eofile) fill_window(); - - ins_h = 0; - for (j=0; j<MIN_MATCH-1; j++) UPDATE_HASH(ins_h, window[j]); - /* If lookahead < MIN_MATCH, ins_h is garbage, but this is - * not important since only literal bytes will be emitted. - */ + match_init(); /* initialize the asm code */ +#endif + + lookahead = read_buf((char *) window, + sizeof(int) <= 2 ? (unsigned) WSIZE : 2 * WSIZE); + + if (lookahead == 0 || lookahead == (unsigned) EOF) { + eofile = 1, lookahead = 0; + return; + } + eofile = 0; + /* Make sure that we always have enough lookahead. This is important + * if input comes from a device such as a tty. + */ + while (lookahead < MIN_LOOKAHEAD && !eofile) + fill_window(); + + ins_h = 0; + for (j = 0; j < MIN_MATCH - 1; j++) + UPDATE_HASH(ins_h, window[j]); + /* If lookahead < MIN_MATCH, ins_h is garbage, but this is + * not important since only literal bytes will be emitted. + */ } /* =========================================================================== @@ -1235,151 +1253,157 @@ void lm_init (flags) * if desired. */ int longest_match(cur_match) - IPos cur_match; /* current match */ +IPos cur_match; /* current match */ { - unsigned chain_length = max_chain_length; /* max hash chain length */ - register uch *scan = window + strstart; /* current string */ - register uch *match; /* matched string */ - register int len; /* length of current match */ - int best_len = prev_length; /* best match length so far */ - IPos limit = strstart > (IPos)MAX_DIST ? strstart - (IPos)MAX_DIST : NIL; - /* Stop when cur_match becomes <= limit. To simplify the code, - * we prevent matches with the string of window index 0. - */ + unsigned chain_length = max_chain_length; /* max hash chain length */ + register uch *scan = window + strstart; /* current string */ + register uch *match; /* matched string */ + register int len; /* length of current match */ + int best_len = prev_length; /* best match length so far */ + IPos limit = + + strstart > (IPos) MAX_DIST ? strstart - (IPos) MAX_DIST : NIL; + /* Stop when cur_match becomes <= limit. To simplify the code, + * we prevent matches with the string of window index 0. + */ /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. * It is easy to get rid of this optimization if necessary. */ #if HASH_BITS < 8 || MAX_MATCH != 258 - error: Code too clever + error:Code too clever #endif - #ifdef UNALIGNED_OK - /* Compare two bytes at a time. Note: this is not always beneficial. - * Try with and without -DUNALIGNED_OK to check. - */ - register uch *strend = window + strstart + MAX_MATCH - 1; - register ush scan_start = *(ush*)scan; - register ush scan_end = *(ush*)(scan+best_len-1); + /* Compare two bytes at a time. Note: this is not always beneficial. + * Try with and without -DUNALIGNED_OK to check. + */ + register uch *strend = window + strstart + MAX_MATCH - 1; + register ush scan_start = *(ush *) scan; + register ush scan_end = *(ush *) (scan + best_len - 1); #else - register uch *strend = window + strstart + MAX_MATCH; - register uch scan_end1 = scan[best_len-1]; - register uch scan_end = scan[best_len]; + register uch *strend = window + strstart + MAX_MATCH; + register uch scan_end1 = scan[best_len - 1]; + register uch scan_end = scan[best_len]; #endif - /* Do not waste too much time if we already have a good match: */ - if (prev_length >= good_match) { - chain_length >>= 2; - } - Assert(strstart <= window_size-MIN_LOOKAHEAD, "insufficient lookahead"); + /* Do not waste too much time if we already have a good match: */ + if (prev_length >= good_match) { + chain_length >>= 2; + } + Assert(strstart <= window_size - MIN_LOOKAHEAD, + "insufficient lookahead"); - do { - Assert(cur_match < strstart, "no future"); - match = window + cur_match; + do { + Assert(cur_match < strstart, "no future"); + match = window + cur_match; - /* Skip to next match if the match length cannot increase - * or if the match length is less than 2: - */ + /* Skip to next match if the match length cannot increase + * or if the match length is less than 2: + */ #if (defined(UNALIGNED_OK) && MAX_MATCH == 258) - /* This code assumes sizeof(unsigned short) == 2. Do not use - * UNALIGNED_OK if your compiler uses a different size. - */ - if (*(ush*)(match+best_len-1) != scan_end || - *(ush*)match != scan_start) continue; - - /* It is not necessary to compare scan[2] and match[2] since they are - * always equal when the other bytes match, given that the hash keys - * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at - * strstart+3, +5, ... up to strstart+257. We check for insufficient - * lookahead only every 4th comparison; the 128th check will be made - * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is - * necessary to put more guard bytes at the end of the window, or - * to check more often for insufficient lookahead. - */ - scan++, match++; - do { - } while (*(ush*)(scan+=2) == *(ush*)(match+=2) && - *(ush*)(scan+=2) == *(ush*)(match+=2) && - *(ush*)(scan+=2) == *(ush*)(match+=2) && - *(ush*)(scan+=2) == *(ush*)(match+=2) && - scan < strend); - /* The funny "do {}" generates better code on most compilers */ - - /* Here, scan <= window+strstart+257 */ - Assert(scan <= window+(unsigned)(window_size-1), "wild scan"); - if (*scan == *match) scan++; - - len = (MAX_MATCH - 1) - (int)(strend-scan); - scan = strend - (MAX_MATCH-1); - -#else /* UNALIGNED_OK */ - - if (match[best_len] != scan_end || - match[best_len-1] != scan_end1 || - *match != *scan || - *++match != scan[1]) continue; - - /* The check at best_len-1 can be removed because it will be made - * again later. (This heuristic is not always a win.) - * It is not necessary to compare scan[2] and match[2] since they - * are always equal when the other bytes match, given that - * the hash keys are equal and that HASH_BITS >= 8. - */ - scan += 2, match++; - - /* We check for insufficient lookahead only every 8th comparison; - * the 256th check will be made at strstart+258. - */ - do { - } while (*++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); - - len = MAX_MATCH - (int)(strend - scan); - scan = strend - MAX_MATCH; - -#endif /* UNALIGNED_OK */ - - if (len > best_len) { - match_start = cur_match; - best_len = len; - if (len >= nice_match) break; + /* This code assumes sizeof(unsigned short) == 2. Do not use + * UNALIGNED_OK if your compiler uses a different size. + */ + if (*(ush *) (match + best_len - 1) != scan_end || + *(ush *) match != scan_start) + continue; + + /* It is not necessary to compare scan[2] and match[2] since they are + * always equal when the other bytes match, given that the hash keys + * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at + * strstart+3, +5, ... up to strstart+257. We check for insufficient + * lookahead only every 4th comparison; the 128th check will be made + * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is + * necessary to put more guard bytes at the end of the window, or + * to check more often for insufficient lookahead. + */ + scan++, match++; + do { + } while (*(ush *) (scan += 2) == *(ush *) (match += 2) && + *(ush *) (scan += 2) == *(ush *) (match += 2) && + *(ush *) (scan += 2) == *(ush *) (match += 2) && + *(ush *) (scan += 2) == *(ush *) (match += 2) && + scan < strend); + /* The funny "do {}" generates better code on most compilers */ + + /* Here, scan <= window+strstart+257 */ + Assert(scan <= window + (unsigned) (window_size - 1), "wild scan"); + if (*scan == *match) + scan++; + + len = (MAX_MATCH - 1) - (int) (strend - scan); + scan = strend - (MAX_MATCH - 1); + +#else /* UNALIGNED_OK */ + + if (match[best_len] != scan_end || + match[best_len - 1] != scan_end1 || + *match != *scan || *++match != scan[1]) + continue; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match++; + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + len = MAX_MATCH - (int) (strend - scan); + scan = strend - MAX_MATCH; + +#endif /* UNALIGNED_OK */ + + if (len > best_len) { + match_start = cur_match; + best_len = len; + if (len >= nice_match) + break; #ifdef UNALIGNED_OK - scan_end = *(ush*)(scan+best_len-1); + scan_end = *(ush *) (scan + best_len - 1); #else - scan_end1 = scan[best_len-1]; - scan_end = scan[best_len]; + scan_end1 = scan[best_len - 1]; + scan_end = scan[best_len]; #endif - } - } while ((cur_match = prev[cur_match & WMASK]) > limit - && --chain_length != 0); + } + } while ((cur_match = prev[cur_match & WMASK]) > limit + && --chain_length != 0); - return best_len; + return best_len; } -#endif /* ASMV */ +#endif /* ASMV */ #ifdef DEBUG /* =========================================================================== * Check that the match at match_start is indeed a match. */ local void check_match(start, match, length) - IPos start, match; - int length; +IPos start, match; +int length; { - /* check that the match is indeed a match */ - if (memcmp((char*)window + match, - (char*)window + start, length) != EQUAL) { - fprintf(stderr, - " start %d, match %d, length %d\n", - start, match, length); - error("invalid match"); - } - if (verbose > 1) { - fprintf(stderr,"\\[%d,%d]", start-match, length); - do { putc(window[start++], stderr); } while (--length != 0); - } + /* check that the match is indeed a match */ + if (memcmp((char *) window + match, + (char *) window + start, length) != EQUAL) { + fprintf(stderr, + " start %d, match %d, length %d\n", start, match, length); + error("invalid match"); + } + if (verbose > 1) { + fprintf(stderr, "\\[%d,%d]", start - match, length); + do { + putc(window[start++], stderr); + } while (--length != 0); + } } #else # define check_match(start, match, length) @@ -1395,52 +1419,54 @@ local void check_match(start, match, length) */ local void fill_window() { - register unsigned n, m; - unsigned more = (unsigned)(window_size - (ulg)lookahead - (ulg)strstart); - /* Amount of free space at the end of the window. */ - - /* If the window is almost full and there is insufficient lookahead, - * move the upper half to the lower one to make room in the upper half. - */ - if (more == (unsigned)EOF) { - /* Very unlikely, but possible on 16 bit machine if strstart == 0 - * and lookahead == 1 (input done one byte at time) - */ - more--; - } else if (strstart >= WSIZE+MAX_DIST) { - /* By the IN assertion, the window is not empty so we can't confuse - * more == 0 with more == 64K on a 16 bit machine. - */ - Assert(window_size == (ulg)2*WSIZE, "no sliding with BIG_MEM"); - - memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); - match_start -= WSIZE; - strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ - - block_start -= (long) WSIZE; - - for (n = 0; n < HASH_SIZE; n++) { - m = head[n]; - head[n] = (Pos)(m >= WSIZE ? m-WSIZE : NIL); - } - for (n = 0; n < WSIZE; n++) { - m = prev[n]; - prev[n] = (Pos)(m >= WSIZE ? m-WSIZE : NIL); - /* If n is not on any hash chain, prev[n] is garbage but - * its value will never be used. - */ - } - more += WSIZE; - } - /* At this point, more >= 2 */ - if (!eofile) { - n = read_buf((char*)window+strstart+lookahead, more); - if (n == 0 || n == (unsigned)EOF) { - eofile = 1; - } else { - lookahead += n; - } - } + register unsigned n, m; + unsigned more = + + (unsigned) (window_size - (ulg) lookahead - (ulg) strstart); + /* Amount of free space at the end of the window. */ + + /* If the window is almost full and there is insufficient lookahead, + * move the upper half to the lower one to make room in the upper half. + */ + if (more == (unsigned) EOF) { + /* Very unlikely, but possible on 16 bit machine if strstart == 0 + * and lookahead == 1 (input done one byte at time) + */ + more--; + } else if (strstart >= WSIZE + MAX_DIST) { + /* By the IN assertion, the window is not empty so we can't confuse + * more == 0 with more == 64K on a 16 bit machine. + */ + Assert(window_size == (ulg) 2 * WSIZE, "no sliding with BIG_MEM"); + + memcpy((char *) window, (char *) window + WSIZE, (unsigned) WSIZE); + match_start -= WSIZE; + strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ + + block_start -= (long) WSIZE; + + for (n = 0; n < HASH_SIZE; n++) { + m = head[n]; + head[n] = (Pos) (m >= WSIZE ? m - WSIZE : NIL); + } + for (n = 0; n < WSIZE; n++) { + m = prev[n]; + prev[n] = (Pos) (m >= WSIZE ? m - WSIZE : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } + more += WSIZE; + } + /* At this point, more >= 2 */ + if (!eofile) { + n = read_buf((char *) window + strstart + lookahead, more); + if (n == 0 || n == (unsigned) EOF) { + eofile = 1; + } else { + lookahead += n; + } + } } /* =========================================================================== @@ -1458,105 +1484,114 @@ local void fill_window() */ ulg deflate() { - IPos hash_head; /* head of hash chain */ - IPos prev_match; /* previous match */ - int flush; /* set if current block must be flushed */ - int match_available = 0; /* set if previous match exists */ - register unsigned match_length = MIN_MATCH-1; /* length of best match */ + IPos hash_head; /* head of hash chain */ + IPos prev_match; /* previous match */ + int flush; /* set if current block must be flushed */ + int match_available = 0; /* set if previous match exists */ + register unsigned match_length = MIN_MATCH - 1; /* length of best match */ + #ifdef DEBUG - extern long isize; /* byte length of input file, for debug only */ -#endif - - /* Process the input block. */ - while (lookahead != 0) { - /* Insert the string window[strstart .. strstart+2] in the - * dictionary, and set hash_head to the head of the hash chain: - */ - INSERT_STRING(strstart, hash_head); - - /* Find the longest match, discarding those <= prev_length. - */ - prev_length = match_length, prev_match = match_start; - match_length = MIN_MATCH-1; - - if (hash_head != NIL && prev_length < max_lazy_match && - strstart - hash_head <= MAX_DIST) { - /* To simplify the code, we prevent matches with the string - * of window index 0 (in particular we have to avoid a match - * of the string with itself at the start of the input file). - */ - match_length = longest_match (hash_head); - /* longest_match() sets match_start */ - if (match_length > lookahead) match_length = lookahead; - - /* Ignore a length 3 match if it is too distant: */ - if (match_length == MIN_MATCH && strstart-match_start > TOO_FAR){ - /* If prev_match is also MIN_MATCH, match_start is garbage - * but we will ignore the current match anyway. - */ - match_length--; - } - } - /* If there was a match at the previous step and the current - * match is not better, output the previous match: - */ - if (prev_length >= MIN_MATCH && match_length <= prev_length) { - - check_match(strstart-1, prev_match, prev_length); - - flush = ct_tally(strstart-1-prev_match, prev_length - MIN_MATCH); - - /* Insert in hash table all strings up to the end of the match. - * strstart-1 and strstart are already inserted. - */ - lookahead -= prev_length-1; - prev_length -= 2; - do { - strstart++; - INSERT_STRING(strstart, hash_head); - /* strstart never exceeds WSIZE-MAX_MATCH, so there are - * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH - * these bytes are garbage, but it does not matter since the - * next lookahead bytes will always be emitted as literals. - */ - } while (--prev_length != 0); - match_available = 0; - match_length = MIN_MATCH-1; - strstart++; - if (flush) FLUSH_BLOCK(0), block_start = strstart; - - } else if (match_available) { - /* If there was no match at the previous position, output a - * single literal. If there was a match but the current match - * is longer, truncate the previous match to a single literal. - */ - Tracevv((stderr,"%c",window[strstart-1])); - if (ct_tally (0, window[strstart-1])) { - FLUSH_BLOCK(0), block_start = strstart; - } - strstart++; - lookahead--; - } else { - /* There is no previous match to compare with, wait for - * the next step to decide. - */ - match_available = 1; - strstart++; - lookahead--; - } - Assert (strstart <= isize && lookahead <= isize, "a bit too far"); - - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the next match, plus MIN_MATCH bytes to insert the - * string following the next match. - */ - while (lookahead < MIN_LOOKAHEAD && !eofile) fill_window(); - } - if (match_available) ct_tally (0, window[strstart-1]); - - return FLUSH_BLOCK(1); /* eof */ + extern long isize; /* byte length of input file, for debug only */ +#endif + + /* Process the input block. */ + while (lookahead != 0) { + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + INSERT_STRING(strstart, hash_head); + + /* Find the longest match, discarding those <= prev_length. + */ + prev_length = match_length, prev_match = match_start; + match_length = MIN_MATCH - 1; + + if (hash_head != NIL && prev_length < max_lazy_match && + strstart - hash_head <= MAX_DIST) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ + match_length = longest_match(hash_head); + /* longest_match() sets match_start */ + if (match_length > lookahead) + match_length = lookahead; + + /* Ignore a length 3 match if it is too distant: */ + if (match_length == MIN_MATCH + && strstart - match_start > TOO_FAR) { + /* If prev_match is also MIN_MATCH, match_start is garbage + * but we will ignore the current match anyway. + */ + match_length--; + } + } + /* If there was a match at the previous step and the current + * match is not better, output the previous match: + */ + if (prev_length >= MIN_MATCH && match_length <= prev_length) { + + check_match(strstart - 1, prev_match, prev_length); + + flush = + ct_tally(strstart - 1 - prev_match, + prev_length - MIN_MATCH); + + /* Insert in hash table all strings up to the end of the match. + * strstart-1 and strstart are already inserted. + */ + lookahead -= prev_length - 1; + prev_length -= 2; + do { + strstart++; + INSERT_STRING(strstart, hash_head); + /* strstart never exceeds WSIZE-MAX_MATCH, so there are + * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH + * these bytes are garbage, but it does not matter since the + * next lookahead bytes will always be emitted as literals. + */ + } while (--prev_length != 0); + match_available = 0; + match_length = MIN_MATCH - 1; + strstart++; + if (flush) + FLUSH_BLOCK(0), block_start = strstart; + + } else if (match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr, "%c", window[strstart - 1])); + if (ct_tally(0, window[strstart - 1])) { + FLUSH_BLOCK(0), block_start = strstart; + } + strstart++; + lookahead--; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ + match_available = 1; + strstart++; + lookahead--; + } + Assert(strstart <= isize && lookahead <= isize, "a bit too far"); + + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + while (lookahead < MIN_LOOKAHEAD && !eofile) + fill_window(); + } + if (match_available) + ct_tally(0, window[strstart - 1]); + + return FLUSH_BLOCK(1); /* eof */ } + /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface * Copyright (C) 1992-1993 Jean-loup Gailly * The unzip code was written and put in the public domain by Mark Adler. @@ -1611,29 +1646,33 @@ ulg deflate() #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) # include <stdlib.h> #else - extern int errno; +extern int errno; #endif #if defined(DIRENT) # include <dirent.h> - typedef struct dirent dir_type; +typedef struct dirent dir_type; + # define NLENGTH(dirent) ((int)strlen((dirent)->d_name)) # define DIR_OPT "DIRENT" #else # define NLENGTH(dirent) ((dirent)->d_namlen) # ifdef SYSDIR # include <sys/dir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "SYSDIR" # else # ifdef SYSNDIR # include <sys/ndir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "SYSNDIR" # else # ifdef NDIR # include <ndir.h> - typedef struct direct dir_type; +typedef struct direct dir_type; + # define DIR_OPT "NDIR" # else # define NO_DIR @@ -1652,10 +1691,11 @@ ulg deflate() # include <sys/utime.h> # define TIME_OPT "SYS_UTIME" # else - struct utimbuf { - time_t actime; - time_t modtime; - }; +struct utimbuf { + time_t actime; + time_t modtime; +}; + # define TIME_OPT "" # endif # endif @@ -1670,10 +1710,10 @@ ulg deflate() # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif -typedef RETSIGTYPE (*sig_type) OF((int)); +typedef RETSIGTYPE(*sig_type) OF((int)); #ifndef O_BINARY -# define O_BINARY 0 /* creation mode for open() */ +# define O_BINARY 0 /* creation mode for open() */ #endif #ifndef O_CREAT @@ -1693,10 +1733,10 @@ typedef RETSIGTYPE (*sig_type) OF((int)); #ifndef S_IWUSR # define S_IWUSR 0200 #endif -#define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ +#define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ #ifndef MAX_PATH_LEN -# define MAX_PATH_LEN 1024 /* max pathname length */ +# define MAX_PATH_LEN 1024 /* max pathname length */ #endif #ifndef SEEK_END @@ -1704,8 +1744,8 @@ typedef RETSIGTYPE (*sig_type) OF((int)); #endif #ifdef NO_OFF_T - typedef long off_t; - off_t lseek OF((int fd, off_t offset, int whence)); +typedef long off_t; +off_t lseek OF((int fd, off_t offset, int whence)); #endif /* Separator for file name parts (see shorten_name()) */ @@ -1717,48 +1757,48 @@ typedef RETSIGTYPE (*sig_type) OF((int)); /* global buffers */ -DECLARE(uch, inbuf, INBUFSIZ +INBUF_EXTRA); -DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); -DECLARE(ush, d_buf, DIST_BUFSIZE); -DECLARE(uch, window, 2L*WSIZE); +DECLARE(uch, inbuf, INBUFSIZ + INBUF_EXTRA); +DECLARE(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); +DECLARE(ush, d_buf, DIST_BUFSIZE); +DECLARE(uch, window, 2L * WSIZE); #ifndef MAXSEG_64K - DECLARE(ush, tab_prefix, 1L<<BITS); +DECLARE(ush, tab_prefix, 1L << BITS); #else - DECLARE(ush, tab_prefix0, 1L<<(BITS-1)); - DECLARE(ush, tab_prefix1, 1L<<(BITS-1)); +DECLARE(ush, tab_prefix0, 1L << (BITS - 1)); +DECLARE(ush, tab_prefix1, 1L << (BITS - 1)); #endif /* local variables */ -int ascii = 0; /* convert end-of-lines to local OS conventions */ -int decompress = 0; /* decompress (-d) */ -int no_name = -1; /* don't save or restore the original file name */ -int no_time = -1; /* don't save or restore the original file time */ -int foreground; /* set if program run in foreground */ -char *progname; /* program name */ -static int method = DEFLATED;/* compression method */ -static int exit_code = OK; /* program exit code */ -int save_orig_name; /* set if original name must be saved */ -int last_member; /* set for .zip and .Z files */ -int part_nb; /* number of parts in .gz file */ -long time_stamp; /* original time stamp (modification time) */ -long ifile_size; /* input file size, -1 for devices (debug only) */ -char *env; /* contents of GZIP env variable */ -char **args = NULL; /* argv pointer if GZIP env variable defined */ -char z_suffix[MAX_SUFFIX+1]; /* default suffix (can be set with --suffix) */ -int z_len; /* strlen(z_suffix) */ - -long bytes_in; /* number of input bytes */ -long bytes_out; /* number of output bytes */ -char ifname[MAX_PATH_LEN]; /* input file name */ -char ofname[MAX_PATH_LEN]; /* output file name */ -int remove_ofname = 0; /* remove output file on error */ -struct stat istat; /* status for input file */ -int ifd; /* input file descriptor */ -int ofd; /* output file descriptor */ -unsigned insize; /* valid bytes in inbuf */ -unsigned inptr; /* index of next byte to be processed in inbuf */ -unsigned outcnt; /* bytes in output buffer */ +int ascii = 0; /* convert end-of-lines to local OS conventions */ +int decompress = 0; /* decompress (-d) */ +int no_name = -1; /* don't save or restore the original file name */ +int no_time = -1; /* don't save or restore the original file time */ +int foreground; /* set if program run in foreground */ +char *progname; /* program name */ +static int method = DEFLATED; /* compression method */ +static int exit_code = OK; /* program exit code */ +int save_orig_name; /* set if original name must be saved */ +int last_member; /* set for .zip and .Z files */ +int part_nb; /* number of parts in .gz file */ +long time_stamp; /* original time stamp (modification time) */ +long ifile_size; /* input file size, -1 for devices (debug only) */ +char *env; /* contents of GZIP env variable */ +char **args = NULL; /* argv pointer if GZIP env variable defined */ +char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */ +int z_len; /* strlen(z_suffix) */ + +long bytes_in; /* number of input bytes */ +long bytes_out; /* number of output bytes */ +char ifname[MAX_PATH_LEN]; /* input file name */ +char ofname[MAX_PATH_LEN]; /* output file name */ +int remove_ofname = 0; /* remove output file on error */ +struct stat istat; /* status for input file */ +int ifd; /* input file descriptor */ +int ofd; /* output file descriptor */ +unsigned insize; /* valid bytes in inbuf */ +unsigned inptr; /* index of next byte to be processed in inbuf */ +unsigned outcnt; /* bytes in output buffer */ /* local functions */ @@ -1768,148 +1808,148 @@ unsigned outcnt; /* bytes in output buffer */ // int main (argc, argv) // int argc; // char **argv; -int gzip_main(int argc, char ** argv) +int gzip_main(int argc, char **argv) { - int result; - int inFileNum; - int outFileNum; - struct stat statBuf; - char* delFileName; - int tostdout = 0; - int fromstdin = 0; - - if (argc==1) - usage(gzip_usage); - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv)+1) == '\0') { - fromstdin = 1; - tostdout = 1; - } - while (*(++(*argv))) { - switch (**argv) { - case 'c': - tostdout = 1; - break; - default: + int result; + int inFileNum; + int outFileNum; + struct stat statBuf; + char *delFileName; + int tostdout = 0; + int fromstdin = 0; + + if (argc == 1) usage(gzip_usage); - } + + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + if (*((*argv) + 1) == '\0') { + fromstdin = 1; + tostdout = 1; + } + while (*(++(*argv))) { + switch (**argv) { + case 'c': + tostdout = 1; + break; + default: + usage(gzip_usage); + } + } } - } - foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; - if (foreground) { - (void) signal (SIGINT, (sig_type)abort_gzip); - } + foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; + if (foreground) { + (void) signal(SIGINT, (sig_type) abort_gzip); + } #ifdef SIGTERM - if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { - (void) signal(SIGTERM, (sig_type)abort_gzip); - } + if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { + (void) signal(SIGTERM, (sig_type) abort_gzip); + } #endif #ifdef SIGHUP - if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { - (void) signal(SIGHUP, (sig_type)abort_gzip); - } + if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { + (void) signal(SIGHUP, (sig_type) abort_gzip); + } #endif - strncpy(z_suffix, Z_SUFFIX, sizeof(z_suffix)-1); - z_len = strlen(z_suffix); + strncpy(z_suffix, Z_SUFFIX, sizeof(z_suffix) - 1); + z_len = strlen(z_suffix); - /* Allocate all global buffers (for DYN_ALLOC option) */ - ALLOC(uch, inbuf, INBUFSIZ +INBUF_EXTRA); - ALLOC(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); - ALLOC(ush, d_buf, DIST_BUFSIZE); - ALLOC(uch, window, 2L*WSIZE); + /* Allocate all global buffers (for DYN_ALLOC option) */ + ALLOC(uch, inbuf, INBUFSIZ + INBUF_EXTRA); + ALLOC(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); + ALLOC(ush, d_buf, DIST_BUFSIZE); + ALLOC(uch, window, 2L * WSIZE); #ifndef MAXSEG_64K - ALLOC(ush, tab_prefix, 1L<<BITS); + ALLOC(ush, tab_prefix, 1L << BITS); #else - ALLOC(ush, tab_prefix0, 1L<<(BITS-1)); - ALLOC(ush, tab_prefix1, 1L<<(BITS-1)); -#endif - - if (fromstdin==1) { - strcpy(ofname, "stdin"); - - inFileNum=fileno(stdin); - time_stamp = 0; /* time unknown by default */ - ifile_size = -1L; /* convention for unknown size */ - } else { - /* Open up the input file */ - if (*argv=='\0') - usage(gzip_usage); - strncpy(ifname, *argv, MAX_PATH_LEN); - - /* Open input fille */ - inFileNum=open( ifname, O_RDONLY); - if (inFileNum < 0) { - perror(ifname); - do_exit(WARNING); - } - /* Get the time stamp on the input file. */ - result = stat(ifname, &statBuf); - if (result < 0) { - perror(ifname); - do_exit(WARNING); + ALLOC(ush, tab_prefix0, 1L << (BITS - 1)); + ALLOC(ush, tab_prefix1, 1L << (BITS - 1)); +#endif + + if (fromstdin == 1) { + strcpy(ofname, "stdin"); + + inFileNum = fileno(stdin); + time_stamp = 0; /* time unknown by default */ + ifile_size = -1L; /* convention for unknown size */ + } else { + /* Open up the input file */ + if (*argv == '\0') + usage(gzip_usage); + strncpy(ifname, *argv, MAX_PATH_LEN); + + /* Open input fille */ + inFileNum = open(ifname, O_RDONLY); + if (inFileNum < 0) { + perror(ifname); + do_exit(WARNING); + } + /* Get the time stamp on the input file. */ + result = stat(ifname, &statBuf); + if (result < 0) { + perror(ifname); + do_exit(WARNING); + } + time_stamp = statBuf.st_ctime; + ifile_size = statBuf.st_size; } - time_stamp = statBuf.st_ctime; - ifile_size = statBuf.st_size; - } - if (tostdout==1) { - /* And get to work */ - strcpy(ofname, "stdout"); - outFileNum=fileno(stdout); - SET_BINARY_MODE(fileno(stdout)); + if (tostdout == 1) { + /* And get to work */ + strcpy(ofname, "stdout"); + outFileNum = fileno(stdout); + SET_BINARY_MODE(fileno(stdout)); - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; + clear_bufs(); /* clear input and output buffers */ + part_nb = 0; - /* Actually do the compression/decompression. */ - zip(inFileNum, outFileNum); + /* Actually do the compression/decompression. */ + zip(inFileNum, outFileNum); - } else { + } else { - /* And get to work */ - strncpy(ofname, ifname, MAX_PATH_LEN-4); - strcat(ofname, ".gz"); + /* And get to work */ + strncpy(ofname, ifname, MAX_PATH_LEN - 4); + strcat(ofname, ".gz"); - /* Open output fille */ + /* Open output fille */ #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW); + outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW); #else - outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL); -#endif - if (outFileNum < 0) { - perror(ofname); - do_exit(WARNING); - } - SET_BINARY_MODE(outFileNum); - /* Set permissions on the file */ - fchmod(outFileNum, statBuf.st_mode); - - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; - - /* Actually do the compression/decompression. */ - result=zip(inFileNum, outFileNum); - close( outFileNum); - close( inFileNum); - /* Delete the original file */ - if (result == OK) - delFileName=ifname; - else - delFileName=ofname; - - if (unlink (delFileName) < 0) { - perror (delFileName); - exit( FALSE); + outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL); +#endif + if (outFileNum < 0) { + perror(ofname); + do_exit(WARNING); + } + SET_BINARY_MODE(outFileNum); + /* Set permissions on the file */ + fchmod(outFileNum, statBuf.st_mode); + + clear_bufs(); /* clear input and output buffers */ + part_nb = 0; + + /* Actually do the compression/decompression. */ + result = zip(inFileNum, outFileNum); + close(outFileNum); + close(inFileNum); + /* Delete the original file */ + if (result == OK) + delFileName = ifname; + else + delFileName = ofname; + + if (unlink(delFileName) < 0) { + perror(delFileName); + exit(FALSE); + } } - } - do_exit(exit_code); + do_exit(exit_code); } /* trees.c -- output deflated data using Huffman coding @@ -1998,14 +2038,16 @@ int gzip_main(int argc, char ** argv) /* number of codes used to transfer the bit lengths */ -local int near extra_lbits[LENGTH_CODES] /* extra bits for each length code */ - = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; +local int near extra_lbits[LENGTH_CODES] /* extra bits for each length code */ + = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, + 4, 4, 5, 5, 5, 5, 0 }; -local int near extra_dbits[D_CODES] /* extra bits for each distance code */ - = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; +local int near extra_dbits[D_CODES] /* extra bits for each distance code */ + = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, + 10, 10, 11, 11, 12, 12, 13, 13 }; -local int near extra_blbits[BL_CODES]/* extra bits for each bit length code */ - = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; +local int near extra_blbits[BL_CODES] /* extra bits for each bit length code */ += { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7 }; #define STORED_BLOCK 0 #define STATIC_TREES 1 @@ -2047,32 +2089,24 @@ local int near extra_blbits[BL_CODES]/* extra bits for each bit length code */ * if we rely on DIST_BUFSIZE == LIT_BUFSIZE. */ #if LIT_BUFSIZE > INBUFSIZ - error cannot overlay l_buf and inbuf +error cannot overlay l_buf and inbuf #endif - #define REP_3_6 16 /* repeat previous bit length 3-6 times (2 bits of repeat count) */ - #define REPZ_3_10 17 /* repeat a zero length 3-10 times (3 bits of repeat count) */ - #define REPZ_11_138 18 -/* repeat a zero length 11-138 times (7 bits of repeat count) */ - -/* =========================================================================== +/* repeat a zero length 11-138 times (7 bits of repeat count) *//* =========================================================================== * Local data - */ - -/* Data structure describing a single value and its code string. */ -typedef struct ct_data { - union { - ush freq; /* frequency count */ - ush code; /* bit string */ - } fc; - union { - ush dad; /* father node in Huffman tree */ - ush len; /* length of bit string */ - } dl; + *//* Data structure describing a single value and its code string. */ typedef struct ct_data { + union { + ush freq; /* frequency count */ + ush code; /* bit string */ + } fc; + union { + ush dad; /* father node in Huffman tree */ + ush len; /* length of bit string */ + } dl; } ct_data; #define Freq fc.freq @@ -2083,10 +2117,11 @@ typedef struct ct_data { #define HEAP_SIZE (2*L_CODES+1) /* maximum heap size */ -local ct_data near dyn_ltree[HEAP_SIZE]; /* literal and length tree */ -local ct_data near dyn_dtree[2*D_CODES+1]; /* distance tree */ +local ct_data near dyn_ltree[HEAP_SIZE]; /* literal and length tree */ +local ct_data near dyn_dtree[2 * D_CODES + 1]; /* distance tree */ + +local ct_data near static_ltree[L_CODES + 2]; -local ct_data near static_ltree[L_CODES+2]; /* The static literal tree. Since the bit lengths are imposed, there is no * need for the L_CODES extra codes used during heap construction. However * The codes 286 and 287 are needed to build a canonical tree (see ct_init @@ -2094,65 +2129,77 @@ local ct_data near static_ltree[L_CODES+2]; */ local ct_data near static_dtree[D_CODES]; + /* The static distance tree. (Actually a trivial tree since all codes use * 5 bits.) */ -local ct_data near bl_tree[2*BL_CODES+1]; +local ct_data near bl_tree[2 * BL_CODES + 1]; + /* Huffman tree for the bit lengths */ typedef struct tree_desc { - ct_data near *dyn_tree; /* the dynamic tree */ - ct_data near *static_tree; /* corresponding static tree or NULL */ - int near *extra_bits; /* extra bits for each code or NULL */ - int extra_base; /* base index for extra_bits */ - int elems; /* max number of elements in the tree */ - int max_length; /* max bit length for the codes */ - int max_code; /* largest code with non zero frequency */ + ct_data near *dyn_tree; /* the dynamic tree */ + ct_data near *static_tree; /* corresponding static tree or NULL */ + int near *extra_bits; /* extra bits for each code or NULL */ + int extra_base; /* base index for extra_bits */ + int elems; /* max number of elements in the tree */ + int max_length; /* max bit length for the codes */ + int max_code; /* largest code with non zero frequency */ } tree_desc; local tree_desc near l_desc = -{dyn_ltree, static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS, 0}; + { dyn_ltree, static_ltree, extra_lbits, LITERALS + 1, L_CODES, + MAX_BITS, 0 }; local tree_desc near d_desc = -{dyn_dtree, static_dtree, extra_dbits, 0, D_CODES, MAX_BITS, 0}; + { dyn_dtree, static_dtree, extra_dbits, 0, D_CODES, MAX_BITS, 0 }; local tree_desc near bl_desc = -{bl_tree, (ct_data near *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS, 0}; + { bl_tree, (ct_data near *) 0, extra_blbits, 0, BL_CODES, MAX_BL_BITS, + 0 }; -local ush near bl_count[MAX_BITS+1]; +local ush near bl_count[MAX_BITS + 1]; + /* number of codes at each bit length for an optimal tree */ local uch near bl_order[BL_CODES] - = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; += { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; + /* The lengths of the bit length codes are sent in order of decreasing * probability, to avoid transmitting the lengths for unused bit length codes. */ -local int near heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ -local int heap_len; /* number of elements in the heap */ -local int heap_max; /* element of largest frequency */ +local int near heap[2 * L_CODES + 1]; /* heap used to build the Huffman trees */ +local int heap_len; /* number of elements in the heap */ +local int heap_max; /* element of largest frequency */ + /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. * The same heap array is used to build all trees. */ -local uch near depth[2*L_CODES+1]; +local uch near depth[2 * L_CODES + 1]; + /* Depth of each subtree used as tie breaker for trees of equal frequency */ -local uch length_code[MAX_MATCH-MIN_MATCH+1]; +local uch length_code[MAX_MATCH - MIN_MATCH + 1]; + /* length code for each normalized match length (0 == MIN_MATCH) */ local uch dist_code[512]; + /* distance codes. The first 256 values correspond to the distances * 3 .. 258, the last 256 values correspond to the top 8 bits of * the 15 bit distances. */ local int near base_length[LENGTH_CODES]; + /* First normalized length for each code (0 = MIN_MATCH) */ local int near base_dist[D_CODES]; + /* First normalized distance for each code (0 = distance of 1) */ #define l_buf inbuf @@ -2160,62 +2207,65 @@ local int near base_dist[D_CODES]; /* DECLARE(ush, d_buf, DIST_BUFSIZE); buffer for distances */ -local uch near flag_buf[(LIT_BUFSIZE/8)]; +local uch near flag_buf[(LIT_BUFSIZE / 8)]; + /* flag_buf is a bit array distinguishing literals from lengths in * l_buf, thus indicating the presence or absence of a distance. */ -local unsigned last_lit; /* running index in l_buf */ -local unsigned last_dist; /* running index in d_buf */ -local unsigned last_flags; /* running index in flag_buf */ -local uch flags; /* current flags not yet saved in flag_buf */ -local uch flag_bit; /* current bit used in flags */ +local unsigned last_lit; /* running index in l_buf */ +local unsigned last_dist; /* running index in d_buf */ +local unsigned last_flags; /* running index in flag_buf */ +local uch flags; /* current flags not yet saved in flag_buf */ +local uch flag_bit; /* current bit used in flags */ + /* bits are filled in flags starting at bit 0 (least significant). * Note: these flags are overkill in the current code since we don't * take advantage of DIST_BUFSIZE == LIT_BUFSIZE. */ -local ulg opt_len; /* bit length of current block with optimal trees */ -local ulg static_len; /* bit length of current block with static trees */ +local ulg opt_len; /* bit length of current block with optimal trees */ +local ulg static_len; /* bit length of current block with static trees */ + +local ulg compressed_len; /* total bit length of compressed file */ -local ulg compressed_len; /* total bit length of compressed file */ +local ulg input_len; /* total byte length of input file */ -local ulg input_len; /* total byte length of input file */ /* input_len is for debugging only since we can get it by other means. */ -ush *file_type; /* pointer to UNKNOWN, BINARY or ASCII */ -int *file_method; /* pointer to DEFLATE or STORE */ +ush *file_type; /* pointer to UNKNOWN, BINARY or ASCII */ +int *file_method; /* pointer to DEFLATE or STORE */ #ifdef DEBUG -extern ulg bits_sent; /* bit length of the compressed data */ -extern long isize; /* byte length of input file */ +extern ulg bits_sent; /* bit length of the compressed data */ +extern long isize; /* byte length of input file */ #endif -extern long block_start; /* window offset of current block */ -extern unsigned near strstart; /* window offset of current string */ +extern long block_start; /* window offset of current block */ +extern unsigned near strstart; /* window offset of current string */ /* =========================================================================== * Local (static) routines in this file. */ -local void init_block OF((void)); -local void pqdownheap OF((ct_data near *tree, int k)); -local void gen_bitlen OF((tree_desc near *desc)); -local void gen_codes OF((ct_data near *tree, int max_code)); -local void build_tree OF((tree_desc near *desc)); -local void scan_tree OF((ct_data near *tree, int max_code)); -local void send_tree OF((ct_data near *tree, int max_code)); -local int build_bl_tree OF((void)); +local void init_block OF((void)); +local void pqdownheap OF((ct_data near * tree, int k)); +local void gen_bitlen OF((tree_desc near * desc)); +local void gen_codes OF((ct_data near * tree, int max_code)); +local void build_tree OF((tree_desc near * desc)); +local void scan_tree OF((ct_data near * tree, int max_code)); +local void send_tree OF((ct_data near * tree, int max_code)); +local int build_bl_tree OF((void)); local void send_all_trees OF((int lcodes, int dcodes, int blcodes)); -local void compress_block OF((ct_data near *ltree, ct_data near *dtree)); -local void set_file_type OF((void)); +local void compress_block OF((ct_data near * ltree, ct_data near * dtree)); +local void set_file_type OF((void)); #ifndef DEBUG # define send_code(c, tree) send_bits(tree[c].Code, tree[c].Len) /* Send a code of the given tree. c and tree must not have side effects */ -#else /* DEBUG */ +#else /* DEBUG */ # define send_code(c, tree) \ { if (verbose>1) fprintf(stderr,"\ncd %3d ",(c)); \ send_bits(tree[c].Code, tree[c].Len); } @@ -2237,75 +2287,81 @@ local void set_file_type OF((void)); * (DEFLATE/STORE). */ void ct_init(attr, methodp) - ush *attr; /* pointer to internal file attribute */ - int *methodp; /* pointer to compression method */ +ush *attr; /* pointer to internal file attribute */ +int *methodp; /* pointer to compression method */ { - int n; /* iterates over tree elements */ - int bits; /* bit counter */ - int length; /* length value */ - int code; /* code value */ - int dist; /* distance index */ - - file_type = attr; - file_method = methodp; - compressed_len = input_len = 0L; - - if (static_dtree[0].Len != 0) return; /* ct_init already called */ - - /* Initialize the mapping length (0..255) -> length code (0..28) */ - length = 0; - for (code = 0; code < LENGTH_CODES-1; code++) { - base_length[code] = length; - for (n = 0; n < (1<<extra_lbits[code]); n++) { - length_code[length++] = (uch)code; - } - } - Assert (length == 256, "ct_init: length != 256"); - /* Note that the length 255 (match length 258) can be represented - * in two different ways: code 284 + 5 bits or code 285, so we - * overwrite length_code[255] to use the best encoding: - */ - length_code[length-1] = (uch)code; - - /* Initialize the mapping dist (0..32K) -> dist code (0..29) */ - dist = 0; - for (code = 0 ; code < 16; code++) { - base_dist[code] = dist; - for (n = 0; n < (1<<extra_dbits[code]); n++) { - dist_code[dist++] = (uch)code; - } - } - Assert (dist == 256, "ct_init: dist != 256"); - dist >>= 7; /* from now on, all distances are divided by 128 */ - for ( ; code < D_CODES; code++) { - base_dist[code] = dist << 7; - for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { - dist_code[256 + dist++] = (uch)code; - } - } - Assert (dist == 256, "ct_init: 256+dist != 512"); - - /* Construct the codes of the static literal tree */ - for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; - n = 0; - while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; - while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; - while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; - while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; - /* Codes 286 and 287 do not exist, but we must include them in the - * tree construction to get a canonical Huffman tree (longest code - * all ones) - */ - gen_codes((ct_data near *)static_ltree, L_CODES+1); - - /* The static distance tree is trivial: */ - for (n = 0; n < D_CODES; n++) { - static_dtree[n].Len = 5; - static_dtree[n].Code = bi_reverse(n, 5); - } - - /* Initialize the first block of the first file: */ - init_block(); + int n; /* iterates over tree elements */ + int bits; /* bit counter */ + int length; /* length value */ + int code; /* code value */ + int dist; /* distance index */ + + file_type = attr; + file_method = methodp; + compressed_len = input_len = 0L; + + if (static_dtree[0].Len != 0) + return; /* ct_init already called */ + + /* Initialize the mapping length (0..255) -> length code (0..28) */ + length = 0; + for (code = 0; code < LENGTH_CODES - 1; code++) { + base_length[code] = length; + for (n = 0; n < (1 << extra_lbits[code]); n++) { + length_code[length++] = (uch) code; + } + } + Assert(length == 256, "ct_init: length != 256"); + /* Note that the length 255 (match length 258) can be represented + * in two different ways: code 284 + 5 bits or code 285, so we + * overwrite length_code[255] to use the best encoding: + */ + length_code[length - 1] = (uch) code; + + /* Initialize the mapping dist (0..32K) -> dist code (0..29) */ + dist = 0; + for (code = 0; code < 16; code++) { + base_dist[code] = dist; + for (n = 0; n < (1 << extra_dbits[code]); n++) { + dist_code[dist++] = (uch) code; + } + } + Assert(dist == 256, "ct_init: dist != 256"); + dist >>= 7; /* from now on, all distances are divided by 128 */ + for (; code < D_CODES; code++) { + base_dist[code] = dist << 7; + for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) { + dist_code[256 + dist++] = (uch) code; + } + } + Assert(dist == 256, "ct_init: 256+dist != 512"); + + /* Construct the codes of the static literal tree */ + for (bits = 0; bits <= MAX_BITS; bits++) + bl_count[bits] = 0; + n = 0; + while (n <= 143) + static_ltree[n++].Len = 8, bl_count[8]++; + while (n <= 255) + static_ltree[n++].Len = 9, bl_count[9]++; + while (n <= 279) + static_ltree[n++].Len = 7, bl_count[7]++; + while (n <= 287) + static_ltree[n++].Len = 8, bl_count[8]++; + /* Codes 286 and 287 do not exist, but we must include them in the + * tree construction to get a canonical Huffman tree (longest code + * all ones) + */ + gen_codes((ct_data near *) static_ltree, L_CODES + 1); + + /* The static distance tree is trivial: */ + for (n = 0; n < D_CODES; n++) { + static_dtree[n].Len = 5; + static_dtree[n].Code = bi_reverse(n, 5); + } + + /* Initialize the first block of the first file: */ + init_block(); } /* =========================================================================== @@ -2313,17 +2369,21 @@ void ct_init(attr, methodp) */ local void init_block() { - int n; /* iterates over tree elements */ - - /* Initialize the trees. */ - for (n = 0; n < L_CODES; n++) dyn_ltree[n].Freq = 0; - for (n = 0; n < D_CODES; n++) dyn_dtree[n].Freq = 0; - for (n = 0; n < BL_CODES; n++) bl_tree[n].Freq = 0; - - dyn_ltree[END_BLOCK].Freq = 1; - opt_len = static_len = 0L; - last_lit = last_dist = last_flags = 0; - flags = 0; flag_bit = 1; + int n; /* iterates over tree elements */ + + /* Initialize the trees. */ + for (n = 0; n < L_CODES; n++) + dyn_ltree[n].Freq = 0; + for (n = 0; n < D_CODES; n++) + dyn_dtree[n].Freq = 0; + for (n = 0; n < BL_CODES; n++) + bl_tree[n].Freq = 0; + + dyn_ltree[END_BLOCK].Freq = 1; + opt_len = static_len = 0L; + last_lit = last_dist = last_flags = 0; + flags = 0; + flag_bit = 1; } #define SMALLEST 1 @@ -2356,25 +2416,29 @@ local void init_block() * two sons). */ local void pqdownheap(tree, k) - ct_data near *tree; /* the tree to restore */ - int k; /* node to move down */ +ct_data near *tree; /* the tree to restore */ +int k; /* node to move down */ { - int v = heap[k]; - int j = k << 1; /* left son of k */ - while (j <= heap_len) { - /* Set j to the smallest of the two sons: */ - if (j < heap_len && smaller(tree, heap[j+1], heap[j])) j++; - - /* Exit if v is smaller than both sons */ - if (smaller(tree, v, heap[j])) break; - - /* Exchange v with the smallest son */ - heap[k] = heap[j]; k = j; - - /* And continue down the tree, setting j to the left son of k */ - j <<= 1; - } - heap[k] = v; + int v = heap[k]; + int j = k << 1; /* left son of k */ + + while (j <= heap_len) { + /* Set j to the smallest of the two sons: */ + if (j < heap_len && smaller(tree, heap[j + 1], heap[j])) + j++; + + /* Exit if v is smaller than both sons */ + if (smaller(tree, v, heap[j])) + break; + + /* Exchange v with the smallest son */ + heap[k] = heap[j]; + k = j; + + /* And continue down the tree, setting j to the left son of k */ + j <<= 1; + } + heap[k] = v; } /* =========================================================================== @@ -2388,80 +2452,93 @@ local void pqdownheap(tree, k) * not null. */ local void gen_bitlen(desc) - tree_desc near *desc; /* the tree descriptor */ +tree_desc near *desc; /* the tree descriptor */ { - ct_data near *tree = desc->dyn_tree; - int near *extra = desc->extra_bits; - int base = desc->extra_base; - int max_code = desc->max_code; - int max_length = desc->max_length; - ct_data near *stree = desc->static_tree; - int h; /* heap index */ - int n, m; /* iterate over the tree elements */ - int bits; /* bit length */ - int xbits; /* extra bits */ - ush f; /* frequency */ - int overflow = 0; /* number of elements with bit length too large */ - - for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; - - /* In a first pass, compute the optimal bit lengths (which may - * overflow in the case of the bit length tree). - */ - tree[heap[heap_max]].Len = 0; /* root of the heap */ - - for (h = heap_max+1; h < HEAP_SIZE; h++) { - n = heap[h]; - bits = tree[tree[n].Dad].Len + 1; - if (bits > max_length) bits = max_length, overflow++; - tree[n].Len = (ush)bits; - /* We overwrite tree[n].Dad which is no longer needed */ - - if (n > max_code) continue; /* not a leaf node */ - - bl_count[bits]++; - xbits = 0; - if (n >= base) xbits = extra[n-base]; - f = tree[n].Freq; - opt_len += (ulg)f * (bits + xbits); - if (stree) static_len += (ulg)f * (stree[n].Len + xbits); - } - if (overflow == 0) return; - - Trace((stderr,"\nbit length overflow\n")); - /* This happens for example on obj2 and pic of the Calgary corpus */ - - /* Find the first bit length which could increase: */ - do { - bits = max_length-1; - while (bl_count[bits] == 0) bits--; - bl_count[bits]--; /* move one leaf down the tree */ - bl_count[bits+1] += 2; /* move one overflow item as its brother */ - bl_count[max_length]--; - /* The brother of the overflow item also moves one step up, - * but this does not affect bl_count[max_length] - */ - overflow -= 2; - } while (overflow > 0); - - /* Now recompute all bit lengths, scanning in increasing frequency. - * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all - * lengths instead of fixing only the wrong ones. This idea is taken - * from 'ar' written by Haruhiko Okumura.) - */ - for (bits = max_length; bits != 0; bits--) { - n = bl_count[bits]; - while (n != 0) { - m = heap[--h]; - if (m > max_code) continue; - if (tree[m].Len != (unsigned) bits) { - Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); - opt_len += ((long)bits-(long)tree[m].Len)*(long)tree[m].Freq; - tree[m].Len = (ush)bits; - } - n--; - } - } + ct_data near *tree = desc->dyn_tree; + int near *extra = desc->extra_bits; + int base = desc->extra_base; + int max_code = desc->max_code; + int max_length = desc->max_length; + ct_data near *stree = desc->static_tree; + int h; /* heap index */ + int n, m; /* iterate over the tree elements */ + int bits; /* bit length */ + int xbits; /* extra bits */ + ush f; /* frequency */ + int overflow = 0; /* number of elements with bit length too large */ + + for (bits = 0; bits <= MAX_BITS; bits++) + bl_count[bits] = 0; + + /* In a first pass, compute the optimal bit lengths (which may + * overflow in the case of the bit length tree). + */ + tree[heap[heap_max]].Len = 0; /* root of the heap */ + + for (h = heap_max + 1; h < HEAP_SIZE; h++) { + n = heap[h]; + bits = tree[tree[n].Dad].Len + 1; + if (bits > max_length) + bits = max_length, overflow++; + tree[n].Len = (ush) bits; + /* We overwrite tree[n].Dad which is no longer needed */ + + if (n > max_code) + continue; /* not a leaf node */ + + bl_count[bits]++; + xbits = 0; + if (n >= base) + xbits = extra[n - base]; + f = tree[n].Freq; + opt_len += (ulg) f *(bits + xbits); + + if (stree) + static_len += (ulg) f *(stree[n].Len + xbits); + } + if (overflow == 0) + return; + + Trace((stderr, "\nbit length overflow\n")); + /* This happens for example on obj2 and pic of the Calgary corpus */ + + /* Find the first bit length which could increase: */ + do { + bits = max_length - 1; + while (bl_count[bits] == 0) + bits--; + bl_count[bits]--; /* move one leaf down the tree */ + bl_count[bits + 1] += 2; /* move one overflow item as its brother */ + bl_count[max_length]--; + /* The brother of the overflow item also moves one step up, + * but this does not affect bl_count[max_length] + */ + overflow -= 2; + } while (overflow > 0); + + /* Now recompute all bit lengths, scanning in increasing frequency. + * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all + * lengths instead of fixing only the wrong ones. This idea is taken + * from 'ar' written by Haruhiko Okumura.) + */ + for (bits = max_length; bits != 0; bits--) { + n = bl_count[bits]; + while (n != 0) { + m = heap[--h]; + if (m > max_code) + continue; + if (tree[m].Len != (unsigned) bits) { + Trace( + (stderr, "code %d bits %d->%d\n", m, tree[m].Len, + bits)); + opt_len += + ((long) bits - + (long) tree[m].Len) * (long) tree[m].Freq; + tree[m].Len = (ush) bits; + } + n--; + } + } } /* =========================================================================== @@ -2472,37 +2549,41 @@ local void gen_bitlen(desc) * OUT assertion: the field code is set for all tree elements of non * zero code length. */ -local void gen_codes (tree, max_code) - ct_data near *tree; /* the tree to decorate */ - int max_code; /* largest code with non zero frequency */ +local void gen_codes(tree, max_code) +ct_data near *tree; /* the tree to decorate */ +int max_code; /* largest code with non zero frequency */ { - ush next_code[MAX_BITS+1]; /* next code value for each bit length */ - ush code = 0; /* running code value */ - int bits; /* bit index */ - int n; /* code index */ - - /* The distribution counts are first used to generate the code values - * without bit reversal. - */ - for (bits = 1; bits <= MAX_BITS; bits++) { - next_code[bits] = code = (code + bl_count[bits-1]) << 1; - } - /* Check that the bit counts in bl_count are consistent. The last code - * must be all ones. - */ - Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1, - "inconsistent bit counts"); - Tracev((stderr,"\ngen_codes: max_code %d ", max_code)); - - for (n = 0; n <= max_code; n++) { - int len = tree[n].Len; - if (len == 0) continue; - /* Now reverse the bits */ - tree[n].Code = bi_reverse(next_code[len]++, len); - - Tracec(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ", - n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1)); - } + ush next_code[MAX_BITS + 1]; /* next code value for each bit length */ + ush code = 0; /* running code value */ + int bits; /* bit index */ + int n; /* code index */ + + /* The distribution counts are first used to generate the code values + * without bit reversal. + */ + for (bits = 1; bits <= MAX_BITS; bits++) { + next_code[bits] = code = (code + bl_count[bits - 1]) << 1; + } + /* Check that the bit counts in bl_count are consistent. The last code + * must be all ones. + */ + Assert(code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1, + "inconsistent bit counts"); + Tracev((stderr, "\ngen_codes: max_code %d ", max_code)); + + for (n = 0; n <= max_code; n++) { + int len = tree[n].Len; + + if (len == 0) + continue; + /* Now reverse the bits */ + tree[n].Code = bi_reverse(next_code[len]++, len); + + Tracec(tree != static_ltree, + (stderr, "\nn %3d %c l %2d c %4x (%x) ", n, + (isgraph(n) ? n : ' '), len, tree[n].Code, + next_code[len] - 1)); + } } /* =========================================================================== @@ -2514,84 +2595,89 @@ local void gen_codes (tree, max_code) * also updated if stree is not null. The field max_code is set. */ local void build_tree(desc) - tree_desc near *desc; /* the tree descriptor */ +tree_desc near *desc; /* the tree descriptor */ { - ct_data near *tree = desc->dyn_tree; - ct_data near *stree = desc->static_tree; - int elems = desc->elems; - int n, m; /* iterate over heap elements */ - int max_code = -1; /* largest code with non zero frequency */ - int node = elems; /* next internal node of the tree */ - - /* Construct the initial heap, with least frequent element in - * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. - * heap[0] is not used. - */ - heap_len = 0, heap_max = HEAP_SIZE; - - for (n = 0; n < elems; n++) { - if (tree[n].Freq != 0) { - heap[++heap_len] = max_code = n; - depth[n] = 0; - } else { - tree[n].Len = 0; - } - } - - /* The pkzip format requires that at least one distance code exists, - * and that at least one bit should be sent even if there is only one - * possible code. So to avoid special checks later on we force at least - * two codes of non zero frequency. - */ - while (heap_len < 2) { - int new = heap[++heap_len] = (max_code < 2 ? ++max_code : 0); - tree[new].Freq = 1; - depth[new] = 0; - opt_len--; if (stree) static_len -= stree[new].Len; - /* new is 0 or 1 so it does not have extra bits */ - } - desc->max_code = max_code; - - /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, - * establish sub-heaps of increasing lengths: - */ - for (n = heap_len/2; n >= 1; n--) pqdownheap(tree, n); - - /* Construct the Huffman tree by repeatedly combining the least two - * frequent nodes. - */ - do { - pqremove(tree, n); /* n = node of least frequency */ - m = heap[SMALLEST]; /* m = node of next least frequency */ - - heap[--heap_max] = n; /* keep the nodes sorted by frequency */ - heap[--heap_max] = m; - - /* Create a new node father of n and m */ - tree[node].Freq = tree[n].Freq + tree[m].Freq; - depth[node] = (uch) (MAX(depth[n], depth[m]) + 1); - tree[n].Dad = tree[m].Dad = (ush)node; + ct_data near *tree = desc->dyn_tree; + ct_data near *stree = desc->static_tree; + int elems = desc->elems; + int n, m; /* iterate over heap elements */ + int max_code = -1; /* largest code with non zero frequency */ + int node = elems; /* next internal node of the tree */ + + /* Construct the initial heap, with least frequent element in + * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. + * heap[0] is not used. + */ + heap_len = 0, heap_max = HEAP_SIZE; + + for (n = 0; n < elems; n++) { + if (tree[n].Freq != 0) { + heap[++heap_len] = max_code = n; + depth[n] = 0; + } else { + tree[n].Len = 0; + } + } + + /* The pkzip format requires that at least one distance code exists, + * and that at least one bit should be sent even if there is only one + * possible code. So to avoid special checks later on we force at least + * two codes of non zero frequency. + */ + while (heap_len < 2) { + int new = heap[++heap_len] = (max_code < 2 ? ++max_code : 0); + + tree[new].Freq = 1; + depth[new] = 0; + opt_len--; + if (stree) + static_len -= stree[new].Len; + /* new is 0 or 1 so it does not have extra bits */ + } + desc->max_code = max_code; + + /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, + * establish sub-heaps of increasing lengths: + */ + for (n = heap_len / 2; n >= 1; n--) + pqdownheap(tree, n); + + /* Construct the Huffman tree by repeatedly combining the least two + * frequent nodes. + */ + do { + pqremove(tree, n); /* n = node of least frequency */ + m = heap[SMALLEST]; /* m = node of next least frequency */ + + heap[--heap_max] = n; /* keep the nodes sorted by frequency */ + heap[--heap_max] = m; + + /* Create a new node father of n and m */ + tree[node].Freq = tree[n].Freq + tree[m].Freq; + depth[node] = (uch) (MAX(depth[n], depth[m]) + 1); + tree[n].Dad = tree[m].Dad = (ush) node; #ifdef DUMP_BL_TREE - if (tree == bl_tree) { - fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", - node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); - } + if (tree == bl_tree) { + fprintf(stderr, "\nnode %d(%d), sons %d(%d) %d(%d)", + node, tree[node].Freq, n, tree[n].Freq, m, + tree[m].Freq); + } #endif - /* and insert the new node in the heap */ - heap[SMALLEST] = node++; - pqdownheap(tree, SMALLEST); + /* and insert the new node in the heap */ + heap[SMALLEST] = node++; + pqdownheap(tree, SMALLEST); - } while (heap_len >= 2); + } while (heap_len >= 2); - heap[--heap_max] = heap[SMALLEST]; + heap[--heap_max] = heap[SMALLEST]; - /* At this point, the fields freq and dad are set. We can now - * generate the bit lengths. - */ - gen_bitlen((tree_desc near *)desc); + /* At this point, the fields freq and dad are set. We can now + * generate the bit lengths. + */ + gen_bitlen((tree_desc near *) desc); - /* The field len is now set, we can generate the bit codes */ - gen_codes ((ct_data near *)tree, max_code); + /* The field len is now set, we can generate the bit codes */ + gen_codes((ct_data near *) tree, max_code); } /* =========================================================================== @@ -2600,94 +2686,107 @@ local void build_tree(desc) * counts. (The contribution of the bit length codes will be added later * during the construction of bl_tree.) */ -local void scan_tree (tree, max_code) - ct_data near *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ +local void scan_tree(tree, max_code) +ct_data near *tree; /* the tree to be scanned */ +int max_code; /* and its largest code of non zero frequency */ { - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - if (nextlen == 0) max_count = 138, min_count = 3; - tree[max_code+1].Len = (ush)0xffff; /* guard */ - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - bl_tree[curlen].Freq += count; - } else if (curlen != 0) { - if (curlen != prevlen) bl_tree[curlen].Freq++; - bl_tree[REP_3_6].Freq++; - } else if (count <= 10) { - bl_tree[REPZ_3_10].Freq++; - } else { - bl_tree[REPZ_11_138].Freq++; - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + if (nextlen == 0) + max_count = 138, min_count = 3; + tree[max_code + 1].Len = (ush) 0xffff; /* guard */ + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; + nextlen = tree[n + 1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + bl_tree[curlen].Freq += count; + } else if (curlen != 0) { + if (curlen != prevlen) + bl_tree[curlen].Freq++; + bl_tree[REP_3_6].Freq++; + } else if (count <= 10) { + bl_tree[REPZ_3_10].Freq++; + } else { + bl_tree[REPZ_11_138].Freq++; + } + count = 0; + prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } } /* =========================================================================== * Send a literal or distance tree in compressed form, using the codes in * bl_tree. */ -local void send_tree (tree, max_code) - ct_data near *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ +local void send_tree(tree, max_code) +ct_data near *tree; /* the tree to be scanned */ +int max_code; /* and its largest code of non zero frequency */ { - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - /* tree[max_code+1].Len = -1; */ /* guard already set */ - if (nextlen == 0) max_count = 138, min_count = 3; - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - do { send_code(curlen, bl_tree); } while (--count != 0); - - } else if (curlen != 0) { - if (curlen != prevlen) { - send_code(curlen, bl_tree); count--; - } - Assert(count >= 3 && count <= 6, " 3_6?"); - send_code(REP_3_6, bl_tree); send_bits(count-3, 2); - - } else if (count <= 10) { - send_code(REPZ_3_10, bl_tree); send_bits(count-3, 3); - - } else { - send_code(REPZ_11_138, bl_tree); send_bits(count-11, 7); - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + +/* tree[max_code+1].Len = -1; *//* guard already set */ + if (nextlen == 0) + max_count = 138, min_count = 3; + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; + nextlen = tree[n + 1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + do { + send_code(curlen, bl_tree); + } while (--count != 0); + + } else if (curlen != 0) { + if (curlen != prevlen) { + send_code(curlen, bl_tree); + count--; + } + Assert(count >= 3 && count <= 6, " 3_6?"); + send_code(REP_3_6, bl_tree); + send_bits(count - 3, 2); + + } else if (count <= 10) { + send_code(REPZ_3_10, bl_tree); + send_bits(count - 3, 3); + + } else { + send_code(REPZ_11_138, bl_tree); + send_bits(count - 11, 7); + } + count = 0; + prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } } /* =========================================================================== @@ -2696,30 +2795,33 @@ local void send_tree (tree, max_code) */ local int build_bl_tree() { - int max_blindex; /* index of last bit length code of non zero freq */ - - /* Determine the bit length frequencies for literal and distance trees */ - scan_tree((ct_data near *)dyn_ltree, l_desc.max_code); - scan_tree((ct_data near *)dyn_dtree, d_desc.max_code); - - /* Build the bit length tree: */ - build_tree((tree_desc near *)(&bl_desc)); - /* opt_len now includes the length of the tree representations, except - * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. - */ - - /* Determine the number of bit length codes to send. The pkzip format - * requires that at least 4 bit length codes be sent. (appnote.txt says - * 3 but the actual value used is 4.) - */ - for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { - if (bl_tree[bl_order[max_blindex]].Len != 0) break; - } - /* Update opt_len to include the bit length tree and counts */ - opt_len += 3*(max_blindex+1) + 5+5+4; - Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", opt_len, static_len)); - - return max_blindex; + int max_blindex; /* index of last bit length code of non zero freq */ + + /* Determine the bit length frequencies for literal and distance trees */ + scan_tree((ct_data near *) dyn_ltree, l_desc.max_code); + scan_tree((ct_data near *) dyn_dtree, d_desc.max_code); + + /* Build the bit length tree: */ + build_tree((tree_desc near *) (&bl_desc)); + /* opt_len now includes the length of the tree representations, except + * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. + */ + + /* Determine the number of bit length codes to send. The pkzip format + * requires that at least 4 bit length codes be sent. (appnote.txt says + * 3 but the actual value used is 4.) + */ + for (max_blindex = BL_CODES - 1; max_blindex >= 3; max_blindex--) { + if (bl_tree[bl_order[max_blindex]].Len != 0) + break; + } + /* Update opt_len to include the bit length tree and counts */ + opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4; + Tracev( + (stderr, "\ndyn trees: dyn %ld, stat %ld", opt_len, + static_len)); + + return max_blindex; } /* =========================================================================== @@ -2728,28 +2830,29 @@ local int build_bl_tree() * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. */ local void send_all_trees(lcodes, dcodes, blcodes) - int lcodes, dcodes, blcodes; /* number of codes for each tree */ +int lcodes, dcodes, blcodes; /* number of codes for each tree */ { - int rank; /* index in bl_order */ - - Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); - Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, - "too many codes"); - Tracev((stderr, "\nbl counts: ")); - send_bits(lcodes-257, 5); /* not +255 as stated in appnote.txt */ - send_bits(dcodes-1, 5); - send_bits(blcodes-4, 4); /* not -3 as stated in appnote.txt */ - for (rank = 0; rank < blcodes; rank++) { - Tracev((stderr, "\nbl code %2d ", bl_order[rank])); - send_bits(bl_tree[bl_order[rank]].Len, 3); - } - Tracev((stderr, "\nbl tree: sent %ld", bits_sent)); - - send_tree((ct_data near *)dyn_ltree, lcodes-1); /* send the literal tree */ - Tracev((stderr, "\nlit tree: sent %ld", bits_sent)); - - send_tree((ct_data near *)dyn_dtree, dcodes-1); /* send the distance tree */ - Tracev((stderr, "\ndist tree: sent %ld", bits_sent)); + int rank; /* index in bl_order */ + + Assert(lcodes >= 257 && dcodes >= 1 + && blcodes >= 4, "not enough codes"); + Assert(lcodes <= L_CODES && dcodes <= D_CODES + && blcodes <= BL_CODES, "too many codes"); + Tracev((stderr, "\nbl counts: ")); + send_bits(lcodes - 257, 5); /* not +255 as stated in appnote.txt */ + send_bits(dcodes - 1, 5); + send_bits(blcodes - 4, 4); /* not -3 as stated in appnote.txt */ + for (rank = 0; rank < blcodes; rank++) { + Tracev((stderr, "\nbl code %2d ", bl_order[rank])); + send_bits(bl_tree[bl_order[rank]].Len, 3); + } + Tracev((stderr, "\nbl tree: sent %ld", bits_sent)); + + send_tree((ct_data near *) dyn_ltree, lcodes - 1); /* send the literal tree */ + Tracev((stderr, "\nlit tree: sent %ld", bits_sent)); + + send_tree((ct_data near *) dyn_dtree, dcodes - 1); /* send the distance tree */ + Tracev((stderr, "\ndist tree: sent %ld", bits_sent)); } /* =========================================================================== @@ -2758,204 +2861,222 @@ local void send_all_trees(lcodes, dcodes, blcodes) * returns the total compressed length for the file so far. */ ulg flush_block(buf, stored_len, eof) - char *buf; /* input block, or NULL if too old */ - ulg stored_len; /* length of input block */ - int eof; /* true if this is the last block for a file */ +char *buf; /* input block, or NULL if too old */ +ulg stored_len; /* length of input block */ +int eof; /* true if this is the last block for a file */ { - ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ - int max_blindex; /* index of last bit length code of non zero freq */ - - flag_buf[last_flags] = flags; /* Save the flags for the last 8 items */ - - /* Check if the file is ascii or binary */ - if (*file_type == (ush)UNKNOWN) set_file_type(); - - /* Construct the literal and distance trees */ - build_tree((tree_desc near *)(&l_desc)); - Tracev((stderr, "\nlit data: dyn %ld, stat %ld", opt_len, static_len)); - - build_tree((tree_desc near *)(&d_desc)); - Tracev((stderr, "\ndist data: dyn %ld, stat %ld", opt_len, static_len)); - /* At this point, opt_len and static_len are the total bit lengths of - * the compressed block data, excluding the tree representations. - */ - - /* Build the bit length tree for the above two trees, and get the index - * in bl_order of the last bit length code to send. - */ - max_blindex = build_bl_tree(); - - /* Determine the best encoding. Compute first the block length in bytes */ - opt_lenb = (opt_len+3+7)>>3; - static_lenb = (static_len+3+7)>>3; - input_len += stored_len; /* for debugging only */ - - Trace((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ", - opt_lenb, opt_len, static_lenb, static_len, stored_len, - last_lit, last_dist)); - - if (static_lenb <= opt_lenb) opt_lenb = static_lenb; - - /* If compression failed and this is the first and last block, - * and if the zip file can be seeked (to rewrite the local header), - * the whole file is transformed into a stored file: - */ + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ + int max_blindex; /* index of last bit length code of non zero freq */ + + flag_buf[last_flags] = flags; /* Save the flags for the last 8 items */ + + /* Check if the file is ascii or binary */ + if (*file_type == (ush) UNKNOWN) + set_file_type(); + + /* Construct the literal and distance trees */ + build_tree((tree_desc near *) (&l_desc)); + Tracev((stderr, "\nlit data: dyn %ld, stat %ld", opt_len, static_len)); + + build_tree((tree_desc near *) (&d_desc)); + Tracev( + (stderr, "\ndist data: dyn %ld, stat %ld", opt_len, + static_len)); + /* At this point, opt_len and static_len are the total bit lengths of + * the compressed block data, excluding the tree representations. + */ + + /* Build the bit length tree for the above two trees, and get the index + * in bl_order of the last bit length code to send. + */ + max_blindex = build_bl_tree(); + + /* Determine the best encoding. Compute first the block length in bytes */ + opt_lenb = (opt_len + 3 + 7) >> 3; + static_lenb = (static_len + 3 + 7) >> 3; + input_len += stored_len; /* for debugging only */ + + Trace( + (stderr, + "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ", + opt_lenb, opt_len, static_lenb, static_len, stored_len, + last_lit, last_dist)); + + if (static_lenb <= opt_lenb) + opt_lenb = static_lenb; + + /* If compression failed and this is the first and last block, + * and if the zip file can be seeked (to rewrite the local header), + * the whole file is transformed into a stored file: + */ #ifdef FORCE_METHOD #else - if (stored_len <= opt_lenb && eof && compressed_len == 0L && seekable()) { + if (stored_len <= opt_lenb && eof && compressed_len == 0L + && seekable()) { #endif - /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */ - if (buf == (char*)0) error ("block vanished"); + /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */ + if (buf == (char *) 0) + error("block vanished"); - copy_block(buf, (unsigned)stored_len, 0); /* without header */ - compressed_len = stored_len << 3; - *file_method = STORED; + copy_block(buf, (unsigned) stored_len, 0); /* without header */ + compressed_len = stored_len << 3; + *file_method = STORED; #ifdef FORCE_METHOD #else - } else if (stored_len+4 <= opt_lenb && buf != (char*)0) { - /* 4: two words for the lengths */ + } else if (stored_len + 4 <= opt_lenb && buf != (char *) 0) { + /* 4: two words for the lengths */ #endif - /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. - * Otherwise we can't have processed more than WSIZE input bytes since - * the last block flush, because compression would have been - * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to - * transform a block into a stored block. - */ - send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */ - compressed_len = (compressed_len + 3 + 7) & ~7L; - compressed_len += (stored_len + 4) << 3; + /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. + * Otherwise we can't have processed more than WSIZE input bytes since + * the last block flush, because compression would have been + * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to + * transform a block into a stored block. + */ + send_bits((STORED_BLOCK << 1) + eof, 3); /* send block type */ + compressed_len = (compressed_len + 3 + 7) & ~7L; + compressed_len += (stored_len + 4) << 3; - copy_block(buf, (unsigned)stored_len, 1); /* with header */ + copy_block(buf, (unsigned) stored_len, 1); /* with header */ #ifdef FORCE_METHOD #else - } else if (static_lenb == opt_lenb) { -#endif - send_bits((STATIC_TREES<<1)+eof, 3); - compress_block((ct_data near *)static_ltree, (ct_data near *)static_dtree); - compressed_len += 3 + static_len; - } else { - send_bits((DYN_TREES<<1)+eof, 3); - send_all_trees(l_desc.max_code+1, d_desc.max_code+1, max_blindex+1); - compress_block((ct_data near *)dyn_ltree, (ct_data near *)dyn_dtree); - compressed_len += 3 + opt_len; - } - Assert (compressed_len == bits_sent, "bad compressed size"); - init_block(); - - if (eof) { - Assert (input_len == isize, "bad input size"); - bi_windup(); - compressed_len += 7; /* align on byte boundary */ - } - Tracev((stderr,"\ncomprlen %lu(%lu) ", compressed_len>>3, - compressed_len-7*eof)); - - return compressed_len >> 3; + } else if (static_lenb == opt_lenb) { +#endif + send_bits((STATIC_TREES << 1) + eof, 3); + compress_block((ct_data near *) static_ltree, + (ct_data near *) static_dtree); + compressed_len += 3 + static_len; + } else { + send_bits((DYN_TREES << 1) + eof, 3); + send_all_trees(l_desc.max_code + 1, d_desc.max_code + 1, + max_blindex + 1); + compress_block((ct_data near *) dyn_ltree, + (ct_data near *) dyn_dtree); + compressed_len += 3 + opt_len; + } + Assert(compressed_len == bits_sent, "bad compressed size"); + init_block(); + + if (eof) { + Assert(input_len == isize, "bad input size"); + bi_windup(); + compressed_len += 7; /* align on byte boundary */ + } + Tracev((stderr, "\ncomprlen %lu(%lu) ", compressed_len >> 3, + compressed_len - 7 * eof)); + + return compressed_len >> 3; } /* =========================================================================== * Save the match info and tally the frequency counts. Return true if * the current block must be flushed. */ -int ct_tally (dist, lc) - int dist; /* distance of matched string */ - int lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ +int ct_tally(dist, lc) +int dist; /* distance of matched string */ +int lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ { - l_buf[last_lit++] = (uch)lc; - if (dist == 0) { - /* lc is the unmatched char */ - dyn_ltree[lc].Freq++; - } else { - /* Here, lc is the match length - MIN_MATCH */ - dist--; /* dist = match distance - 1 */ - Assert((ush)dist < (ush)MAX_DIST && - (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && - (ush)d_code(dist) < (ush)D_CODES, "ct_tally: bad match"); - - dyn_ltree[length_code[lc]+LITERALS+1].Freq++; - dyn_dtree[d_code(dist)].Freq++; - - d_buf[last_dist++] = (ush)dist; - flags |= flag_bit; - } - flag_bit <<= 1; - - /* Output the flags if they fill a byte: */ - if ((last_lit & 7) == 0) { - flag_buf[last_flags++] = flags; - flags = 0, flag_bit = 1; - } - /* Try to guess if it is profitable to stop the current block here */ - if ((last_lit & 0xfff) == 0) { - /* Compute an upper bound for the compressed length */ - ulg out_length = (ulg)last_lit*8L; - ulg in_length = (ulg)strstart-block_start; - int dcode; - for (dcode = 0; dcode < D_CODES; dcode++) { - out_length += (ulg)dyn_dtree[dcode].Freq*(5L+extra_dbits[dcode]); - } - out_length >>= 3; - Trace((stderr,"\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ", - last_lit, last_dist, in_length, out_length, - 100L - out_length*100L/in_length)); - if (last_dist < last_lit/2 && out_length < in_length/2) return 1; - } - return (last_lit == LIT_BUFSIZE-1 || last_dist == DIST_BUFSIZE); - /* We avoid equality with LIT_BUFSIZE because of wraparound at 64K - * on 16 bit machines and because stored blocks are restricted to - * 64K-1 bytes. - */ + l_buf[last_lit++] = (uch) lc; + if (dist == 0) { + /* lc is the unmatched char */ + dyn_ltree[lc].Freq++; + } else { + /* Here, lc is the match length - MIN_MATCH */ + dist--; /* dist = match distance - 1 */ + Assert((ush) dist < (ush) MAX_DIST && + (ush) lc <= (ush) (MAX_MATCH - MIN_MATCH) && + (ush) d_code(dist) < (ush) D_CODES, "ct_tally: bad match"); + + dyn_ltree[length_code[lc] + LITERALS + 1].Freq++; + dyn_dtree[d_code(dist)].Freq++; + + d_buf[last_dist++] = (ush) dist; + flags |= flag_bit; + } + flag_bit <<= 1; + + /* Output the flags if they fill a byte: */ + if ((last_lit & 7) == 0) { + flag_buf[last_flags++] = flags; + flags = 0, flag_bit = 1; + } + /* Try to guess if it is profitable to stop the current block here */ + if ((last_lit & 0xfff) == 0) { + /* Compute an upper bound for the compressed length */ + ulg out_length = (ulg) last_lit * 8L; + ulg in_length = (ulg) strstart - block_start; + int dcode; + + for (dcode = 0; dcode < D_CODES; dcode++) { + out_length += + (ulg) dyn_dtree[dcode].Freq * (5L + extra_dbits[dcode]); + } + out_length >>= 3; + Trace( + (stderr, + "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ", + last_lit, last_dist, in_length, out_length, + 100L - out_length * 100L / in_length)); + if (last_dist < last_lit / 2 && out_length < in_length / 2) + return 1; + } + return (last_lit == LIT_BUFSIZE - 1 || last_dist == DIST_BUFSIZE); + /* We avoid equality with LIT_BUFSIZE because of wraparound at 64K + * on 16 bit machines and because stored blocks are restricted to + * 64K-1 bytes. + */ } /* =========================================================================== * Send the block data compressed using the given Huffman trees */ local void compress_block(ltree, dtree) - ct_data near *ltree; /* literal tree */ - ct_data near *dtree; /* distance tree */ +ct_data near *ltree; /* literal tree */ +ct_data near *dtree; /* distance tree */ { - unsigned dist; /* distance of matched string */ - int lc; /* match length or unmatched char (if dist == 0) */ - unsigned lx = 0; /* running index in l_buf */ - unsigned dx = 0; /* running index in d_buf */ - unsigned fx = 0; /* running index in flag_buf */ - uch flag = 0; /* current flags */ - unsigned code; /* the code to send */ - int extra; /* number of extra bits to send */ - - if (last_lit != 0) do { - if ((lx & 7) == 0) flag = flag_buf[fx++]; - lc = l_buf[lx++]; - if ((flag & 1) == 0) { - send_code(lc, ltree); /* send a literal byte */ - Tracecv(isgraph(lc), (stderr," '%c' ", lc)); - } else { - /* Here, lc is the match length - MIN_MATCH */ - code = length_code[lc]; - send_code(code+LITERALS+1, ltree); /* send the length code */ - extra = extra_lbits[code]; - if (extra != 0) { - lc -= base_length[code]; - send_bits(lc, extra); /* send the extra length bits */ - } - dist = d_buf[dx++]; - /* Here, dist is the match distance - 1 */ - code = d_code(dist); - Assert (code < D_CODES, "bad d_code"); - - send_code(code, dtree); /* send the distance code */ - extra = extra_dbits[code]; - if (extra != 0) { - dist -= base_dist[code]; - send_bits(dist, extra); /* send the extra distance bits */ - } - } /* literal or match pair ? */ - flag >>= 1; - } while (lx < last_lit); - - send_code(END_BLOCK, ltree); + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ + unsigned lx = 0; /* running index in l_buf */ + unsigned dx = 0; /* running index in d_buf */ + unsigned fx = 0; /* running index in flag_buf */ + uch flag = 0; /* current flags */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + + if (last_lit != 0) + do { + if ((lx & 7) == 0) + flag = flag_buf[fx++]; + lc = l_buf[lx++]; + if ((flag & 1) == 0) { + send_code(lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr, " '%c' ", lc)); + } else { + /* Here, lc is the match length - MIN_MATCH */ + code = length_code[lc]; + send_code(code + LITERALS + 1, ltree); /* send the length code */ + extra = extra_lbits[code]; + if (extra != 0) { + lc -= base_length[code]; + send_bits(lc, extra); /* send the extra length bits */ + } + dist = d_buf[dx++]; + /* Here, dist is the match distance - 1 */ + code = d_code(dist); + Assert(code < D_CODES, "bad d_code"); + + send_code(code, dtree); /* send the distance code */ + extra = extra_dbits[code]; + if (extra != 0) { + dist -= base_dist[code]; + send_bits(dist, extra); /* send the extra distance bits */ + } + } /* literal or match pair ? */ + flag >>= 1; + } while (lx < last_lit); + + send_code(END_BLOCK, ltree); } /* =========================================================================== @@ -2966,17 +3087,22 @@ local void compress_block(ltree, dtree) */ local void set_file_type() { - int n = 0; - unsigned ascii_freq = 0; - unsigned bin_freq = 0; - while (n < 7) bin_freq += dyn_ltree[n++].Freq; - while (n < 128) ascii_freq += dyn_ltree[n++].Freq; - while (n < LITERALS) bin_freq += dyn_ltree[n++].Freq; - *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; - if (*file_type == BINARY && translate_eol) { - warn("-l used on binary file", ""); - } + int n = 0; + unsigned ascii_freq = 0; + unsigned bin_freq = 0; + + while (n < 7) + bin_freq += dyn_ltree[n++].Freq; + while (n < 128) + ascii_freq += dyn_ltree[n++].Freq; + while (n < LITERALS) + bin_freq += dyn_ltree[n++].Freq; + *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; + if (*file_type == BINARY && translate_eol) { + warn("-l used on binary file", ""); + } } + /* util.c -- utility functions for gzip support * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the @@ -2997,7 +3123,7 @@ local void set_file_type() #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) # include <stdlib.h> #else - extern int errno; +extern int errno; #endif /* =========================================================================== @@ -3005,30 +3131,32 @@ local void set_file_type() * IN assertion: insize bytes have already been read in inbuf. */ int copy(in, out) - int in, out; /* input and output file descriptors */ +int in, out; /* input and output file descriptors */ { - errno = 0; - while (insize != 0 && (int)insize != EOF) { - write_buf(out, (char*)inbuf, insize); - bytes_out += insize; - insize = read(in, (char*)inbuf, INBUFSIZ); - } - if ((int)insize == EOF && errno != 0) { - read_error(); - } - bytes_in = bytes_out; - return OK; + errno = 0; + while (insize != 0 && (int) insize != EOF) { + write_buf(out, (char *) inbuf, insize); + bytes_out += insize; + insize = read(in, (char *) inbuf, INBUFSIZ); + } + if ((int) insize == EOF && errno != 0) { + read_error(); + } + bytes_in = bytes_out; + return OK; } /* ======================================================================== * Put string s in lower case, return s. */ char *strlwr(s) - char *s; +char *s; { - char *t; - for (t = s; *t; t++) *t = tolow(*t); - return s; + char *t; + + for (t = s; *t; t++) + *t = tolow(*t); + return s; } #if defined(NO_STRING_H) && !defined(STDC_HEADERS) @@ -3039,7 +3167,7 @@ char *strlwr(s) # define const # endif -int strspn OF((const char *s, const char *accept)); +int strspn OF((const char *s, const char *accept)); int strcspn OF((const char *s, const char *reject)); /* ======================================================================== @@ -3047,21 +3175,23 @@ int strcspn OF((const char *s, const char *reject)); * of s which contains only characters in accept. */ int strspn(s, accept) - const char *s; - const char *accept; +const char *s; +const char *accept; { - register const char *p; - register const char *a; - register int count = 0; - - for (p = s; *p != '\0'; ++p) { - for (a = accept; *a != '\0'; ++a) { - if (*p == *a) break; + register const char *p; + register const char *a; + register int count = 0; + + for (p = s; *p != '\0'; ++p) { + for (a = accept; *a != '\0'; ++a) { + if (*p == *a) + break; + } + if (*a == '\0') + return count; + ++count; } - if (*a == '\0') return count; - ++count; - } - return count; + return count; } /* ======================================================================== @@ -3069,104 +3199,113 @@ int strspn(s, accept) * which contains no characters from reject. */ int strcspn(s, reject) - const char *s; - const char *reject; +const char *s; +const char *reject; { - register int count = 0; + register int count = 0; - while (*s != '\0') { - if (strchr(reject, *s++) != NULL) return count; - ++count; - } - return count; + while (*s != '\0') { + if (strchr(reject, *s++) != NULL) + return count; + ++count; + } + return count; } -#endif /* NO_STRING_H */ +#endif /* NO_STRING_H */ /* ======================================================================== * Add an environment variable (if any) before argv, and update argc. * Return the expanded environment variable to be freed later, or NULL * if no options were added to argv. */ -#define SEPARATOR " \t" /* separators in env variable */ +#define SEPARATOR " \t" /* separators in env variable */ char *add_envopt(argcp, argvp, env) - int *argcp; /* pointer to argc */ - char ***argvp; /* pointer to argv */ - char *env; /* name of environment variable */ +int *argcp; /* pointer to argc */ +char ***argvp; /* pointer to argv */ +char *env; /* name of environment variable */ { - char *p; /* running pointer through env variable */ - char **oargv; /* runs through old argv array */ - char **nargv; /* runs through new argv array */ - int oargc = *argcp; /* old argc */ - int nargc = 0; /* number of arguments in env variable */ - - env = (char*)getenv(env); - if (env == NULL) return NULL; - - p = (char*)xmalloc(strlen(env)+1); - env = strcpy(p, env); /* keep env variable intact */ - - for (p = env; *p; nargc++ ) { /* move through env */ - p += strspn(p, SEPARATOR); /* skip leading separators */ - if (*p == '\0') break; - - p += strcspn(p, SEPARATOR); /* find end of word */ - if (*p) *p++ = '\0'; /* mark it */ - } - if (nargc == 0) { - free(env); - return NULL; - } - *argcp += nargc; - /* Allocate the new argv array, with an extra element just in case - * the original arg list did not end with a NULL. - */ - nargv = (char**)calloc(*argcp+1, sizeof(char *)); - if (nargv == NULL) error("out of memory"); - oargv = *argvp; - *argvp = nargv; - - /* Copy the program name first */ - if (oargc-- < 0) error("argc<=0"); - *(nargv++) = *(oargv++); - - /* Then copy the environment args */ - for (p = env; nargc > 0; nargc--) { - p += strspn(p, SEPARATOR); /* skip separators */ - *(nargv++) = p; /* store start */ - while (*p++) ; /* skip over word */ - } - - /* Finally copy the old args and add a NULL (usual convention) */ - while (oargc--) *(nargv++) = *(oargv++); - *nargv = NULL; - return env; + char *p; /* running pointer through env variable */ + char **oargv; /* runs through old argv array */ + char **nargv; /* runs through new argv array */ + int oargc = *argcp; /* old argc */ + int nargc = 0; /* number of arguments in env variable */ + + env = (char *) getenv(env); + if (env == NULL) + return NULL; + + p = (char *) xmalloc(strlen(env) + 1); + env = strcpy(p, env); /* keep env variable intact */ + + for (p = env; *p; nargc++) { /* move through env */ + p += strspn(p, SEPARATOR); /* skip leading separators */ + if (*p == '\0') + break; + + p += strcspn(p, SEPARATOR); /* find end of word */ + if (*p) + *p++ = '\0'; /* mark it */ + } + if (nargc == 0) { + free(env); + return NULL; + } + *argcp += nargc; + /* Allocate the new argv array, with an extra element just in case + * the original arg list did not end with a NULL. + */ + nargv = (char **) calloc(*argcp + 1, sizeof(char *)); + + if (nargv == NULL) + error("out of memory"); + oargv = *argvp; + *argvp = nargv; + + /* Copy the program name first */ + if (oargc-- < 0) + error("argc<=0"); + *(nargv++) = *(oargv++); + + /* Then copy the environment args */ + for (p = env; nargc > 0; nargc--) { + p += strspn(p, SEPARATOR); /* skip separators */ + *(nargv++) = p; /* store start */ + while (*p++); /* skip over word */ + } + + /* Finally copy the old args and add a NULL (usual convention) */ + while (oargc--) + *(nargv++) = *(oargv++); + *nargv = NULL; + return env; } + /* ======================================================================== * Display compression ratio on the given stream on 6 characters. */ void display_ratio(num, den, file) - long num; - long den; - FILE *file; +long num; +long den; +FILE *file; { - long ratio; /* 1000 times the compression ratio */ - - if (den == 0) { - ratio = 0; /* no compression */ - } else if (den < 2147483L) { /* (2**31 -1)/1000 */ - ratio = 1000L*num/den; - } else { - ratio = num/(den/1000L); - } - if (ratio < 0) { - putc('-', file); - ratio = -ratio; - } else { - putc(' ', file); - } - fprintf(file, "%2ld.%1ld%%", ratio / 10L, ratio % 10L); + long ratio; /* 1000 times the compression ratio */ + + if (den == 0) { + ratio = 0; /* no compression */ + } else if (den < 2147483L) { /* (2**31 -1)/1000 */ + ratio = 1000L * num / den; + } else { + ratio = num / (den / 1000L); + } + if (ratio < 0) { + putc('-', file); + ratio = -ratio; + } else { + putc(' ', file); + } + fprintf(file, "%2ld.%1ld%%", ratio / 10L, ratio % 10L); } @@ -3186,8 +3325,8 @@ void display_ratio(num, den, file) # include <fcntl.h> #endif -local ulg crc; /* crc on uncompressed file data */ -long header_bytes; /* number of bytes in gzip header */ +local ulg crc; /* crc on uncompressed file data */ +long header_bytes; /* number of bytes in gzip header */ /* =========================================================================== * Deflate in to out. @@ -3195,48 +3334,48 @@ long header_bytes; /* number of bytes in gzip header */ * The variables time_stamp and save_orig_name are initialized. */ int zip(in, out) - int in, out; /* input and output file descriptors */ +int in, out; /* input and output file descriptors */ { - uch flags = 0; /* general purpose bit flags */ - ush attr = 0; /* ascii/binary flag */ - ush deflate_flags = 0; /* pkzip -es, -en or -ex equivalent */ + uch flags = 0; /* general purpose bit flags */ + ush attr = 0; /* ascii/binary flag */ + ush deflate_flags = 0; /* pkzip -es, -en or -ex equivalent */ - ifd = in; - ofd = out; - outcnt = 0; + ifd = in; + ofd = out; + outcnt = 0; - /* Write the header to the gzip file. See algorithm.doc for the format */ + /* Write the header to the gzip file. See algorithm.doc for the format */ - method = DEFLATED; - put_byte(GZIP_MAGIC[0]); /* magic header */ - put_byte(GZIP_MAGIC[1]); - put_byte(DEFLATED); /* compression method */ + method = DEFLATED; + put_byte(GZIP_MAGIC[0]); /* magic header */ + put_byte(GZIP_MAGIC[1]); + put_byte(DEFLATED); /* compression method */ - put_byte(flags); /* general flags */ - put_long(time_stamp); + put_byte(flags); /* general flags */ + put_long(time_stamp); - /* Write deflated file to zip file */ - crc = updcrc(0, 0); + /* Write deflated file to zip file */ + crc = updcrc(0, 0); - bi_init(out); - ct_init(&attr, &method); - lm_init(&deflate_flags); + bi_init(out); + ct_init(&attr, &method); + lm_init(&deflate_flags); - put_byte((uch)deflate_flags); /* extra flags */ - put_byte(OS_CODE); /* OS identifier */ + put_byte((uch) deflate_flags); /* extra flags */ + put_byte(OS_CODE); /* OS identifier */ - header_bytes = (long)outcnt; + header_bytes = (long) outcnt; - (void)deflate(); + (void) deflate(); - /* Write the crc and uncompressed size */ - put_long(crc); - put_long(isize); - header_bytes += 2*sizeof(long); + /* Write the crc and uncompressed size */ + put_long(crc); + put_long(isize); + header_bytes += 2 * sizeof(long); - flush_outbuf(); - return OK; + flush_outbuf(); + return OK; } @@ -3246,18 +3385,19 @@ int zip(in, out) * IN assertion: size >= 2 (for end-of-line translation) */ int file_read(buf, size) - char *buf; - unsigned size; +char *buf; +unsigned size; { - unsigned len; + unsigned len; - Assert(insize == 0, "inbuf not empty"); + Assert(insize == 0, "inbuf not empty"); - len = read(ifd, buf, size); - if (len == (unsigned)(-1) || len == 0) return (int)len; + len = read(ifd, buf, size); + if (len == (unsigned) (-1) || len == 0) + return (int) len; - crc = updcrc((uch*)buf, len); - isize += (ulg)len; - return (int)len; + crc = updcrc((uch *) buf, len); + isize += (ulg) len; + return (int) len; } #endif @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini halt implementation for busybox * @@ -23,10 +24,8 @@ #include "internal.h" #include <signal.h> -extern int -halt_main(int argc, char ** argv) +extern int halt_main(int argc, char **argv) { - /* don't assume init's pid == 1 */ - exit( kill(findInitPid(), SIGUSR1)); + /* don't assume init's pid == 1 */ + exit(kill(findInitPid(), SIGUSR1)); } - @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini head implementation for busybox * @@ -26,83 +27,86 @@ #include <stdio.h> const char head_usage[] = -"head [OPTION] [FILE]...\n\n" -"Print first 10 lines of each FILE to standard output.\n" -"With more than one FILE, precede each with a header giving the\n" -"file name. With no FILE, or when FILE is -, read standard input.\n\n" -"Options:\n" -"\t-n NUM\t\tPrint first NUM lines instead of first 10\n"; + "head [OPTION] [FILE]...\n\n" + "Print first 10 lines of each FILE to standard output.\n" + "With more than one FILE, precede each with a header giving the\n" + "file name. With no FILE, or when FILE is -, read standard input.\n\n" -int -head(int len, FILE *src) + "Options:\n" "\t-n NUM\t\tPrint first NUM lines instead of first 10\n"; + +int head(int len, FILE * src) { - int i; - char buffer[1024]; + int i; + char buffer[1024]; - for (i = 0; i < len; i++) { - fgets(buffer, 1024, src); - if (feof(src)) { break; } - fputs(buffer, stdout); - } - return 0; + for (i = 0; i < len; i++) { + fgets(buffer, 1024, src); + if (feof(src)) { + break; + } + fputs(buffer, stdout); + } + return 0; } /* BusyBoxed head(1) */ -int -head_main(int argc, char **argv) +int head_main(int argc, char **argv) { - char opt; - int len = 10, tmplen, i; + char opt; + int len = 10, tmplen, i; - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'n': - tmplen = 0; - if (++i < argc) - tmplen = atoi(argv[i]); - if (tmplen < 1) - usage(head_usage); - len = tmplen; - break; - case '-': - case 'h': - usage(head_usage); - default: - fprintf(stderr, "head: invalid option -- %c\n", opt); - usage(head_usage); - } - } else { - break; + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 'n': + tmplen = 0; + if (++i < argc) + tmplen = atoi(argv[i]); + if (tmplen < 1) + usage(head_usage); + len = tmplen; + break; + case '-': + case 'h': + usage(head_usage); + default: + fprintf(stderr, "head: invalid option -- %c\n", opt); + usage(head_usage); + } + } else { + break; + } } - } - /* get rest of argv[] or stdin if nothing's left */ - if (i >= argc) { - head(len, stdin); + /* get rest of argv[] or stdin if nothing's left */ + if (i >= argc) { + head(len, stdin); - } else { - int need_headers = ((argc - i) > 1); - for ( ; i < argc; i++) { - FILE *src; - src = fopen(argv[i], "r"); - if (!src) { - fprintf(stderr,"head: %s: %s\n", argv[i], strerror(errno)); - } else { - /* emulating GNU behaviour */ - if (need_headers) { - fprintf(stdout, "==> %s <==\n", argv[i]); - } - head(len, src); - if (i < argc - 1) { - fprintf(stdout, "\n"); + } else { + int need_headers = ((argc - i) > 1); + + for (; i < argc; i++) { + FILE *src; + + src = fopen(argv[i], "r"); + if (!src) { + fprintf(stderr, "head: %s: %s\n", argv[i], + strerror(errno)); + } else { + /* emulating GNU behaviour */ + if (need_headers) { + fprintf(stdout, "==> %s <==\n", argv[i]); + } + head(len, src); + if (i < argc - 1) { + fprintf(stdout, "\n"); + } + } } - } } - } - exit(0); + exit(0); } -/* $Id: head.c,v 1.7 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: head.c,v 1.8 2000/02/08 19:58:47 erik Exp $ */ @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini hostid implementation for busybox * @@ -22,7 +23,8 @@ #include "internal.h" #include <stdio.h> -extern int hostid_main(int argc, char **argv) { - printf ("%lx\n", gethostid()); - exit( TRUE); +extern int hostid_main(int argc, char **argv) +{ + printf("%lx\n", gethostid()); + exit(TRUE); } diff --git a/hostname.c b/hostname.c index 68a560950..8cc334da0 100644 --- a/hostname.c +++ b/hostname.c @@ -1,5 +1,6 @@ +/* vi: set sw=4 ts=4: */ /* - * $Id: hostname.c,v 1.6 2000/02/07 05:29:42 erik Exp $ + * $Id: hostname.c,v 1.7 2000/02/08 19:58:47 erik Exp $ * Mini hostname implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> @@ -29,110 +30,116 @@ #include <unistd.h> #include <stdio.h> -static const char* hostname_usage = -"hostname [OPTION] {hostname | -F file}\n\n" -"Get or set the hostname or DNS domain name. If a hostname is given\n" -"(or a file with the -F parameter), the host name will be set.\n\n" -"Options:\n" -"\t-s\t\tShort\n" -"\t-i\t\tAddresses for the hostname\n" -"\t-d\t\tDNS domain name\n" -"\t-F FILE\t\tUse the contents of FILE to specify the hostname\n"; +static const char *hostname_usage = + "hostname [OPTION] {hostname | -F file}\n\n" + "Get or set the hostname or DNS domain name. If a hostname is given\n" + "(or a file with the -F parameter), the host name will be set.\n\n" + "Options:\n" + "\t-s\t\tShort\n" + + "\t-i\t\tAddresses for the hostname\n" + "\t-d\t\tDNS domain name\n" + "\t-F FILE\t\tUse the contents of FILE to specify the hostname\n"; void do_sethostname(char *s, int isfile) { - FILE *f; - char buf[255]; - - if (!s) return; - if (!isfile) { - if (sethostname(s, strlen(s)) < 0) { - if (errno == EPERM) - fprintf(stderr, "hostname: you must be root to change the hostname\n"); - else - perror("sethostname"); - exit(1); - } - } else { - if ((f = fopen(s, "r")) == NULL) { - perror(s); - exit(1); + FILE *f; + char buf[255]; + + if (!s) + return; + if (!isfile) { + if (sethostname(s, strlen(s)) < 0) { + if (errno == EPERM) + fprintf(stderr, + "hostname: you must be root to change the hostname\n"); + else + perror("sethostname"); + exit(1); + } } else { - fgets(buf, 255, f); - fclose(f); - if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0; - if (sethostname(buf, strlen(buf)) < 0) { - perror("sethostname"); - exit(1); - } + if ((f = fopen(s, "r")) == NULL) { + perror(s); + exit(1); + } else { + fgets(buf, 255, f); + fclose(f); + if (buf[strlen(buf) - 1] == '\n') + buf[strlen(buf) - 1] = 0; + if (sethostname(buf, strlen(buf)) < 0) { + perror("sethostname"); + exit(1); + } + } } - } } int hostname_main(int argc, char **argv) { - int opt_short = 0; - int opt_domain = 0; - int opt_ip = 0; - struct hostent *h; - char *filename = NULL; - char buf[255]; - char *s = NULL; - - if (argc < 1) usage(hostname_usage); + int opt_short = 0; + int opt_domain = 0; + int opt_ip = 0; + struct hostent *h; + char *filename = NULL; + char buf[255]; + char *s = NULL; - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 's': - opt_short = 1; - break; - case 'i': - opt_ip = 1; - break; - case 'd': - opt_domain = 1; - break; - case 'F': - filename = optarg; - if (--argc == 0) { - usage(hostname_usage); - } - filename = *(++argv); - break; - default: + if (argc < 1) usage(hostname_usage); - } - if (filename!=NULL) - break; + + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 's': + opt_short = 1; + break; + case 'i': + opt_ip = 1; + break; + case 'd': + opt_domain = 1; + break; + case 'F': + filename = optarg; + if (--argc == 0) { + usage(hostname_usage); + } + filename = *(++argv); + break; + default: + usage(hostname_usage); + } + if (filename != NULL) + break; + } } - } - if (argc >= 1) { - do_sethostname(*argv, 0); - } else if (filename!=NULL) { - do_sethostname(filename, 1); - } else { - gethostname(buf, 255); - if (opt_short) { - s = strchr(buf, '.'); - if (!s) s = buf; *s = 0; - printf("%s\n", buf); - } else if (opt_domain) { - s = strchr(buf, '.'); - printf("%s\n", (s ? s+1 : "")); - } else if (opt_ip) { - h = gethostbyname(buf); - if (!h) { - printf("Host not found\n"); - exit(1); - } - printf("%s\n", inet_ntoa(*(struct in_addr *)(h->h_addr))); - } else { - printf("%s\n", buf); - } - } - exit( 0); + if (argc >= 1) { + do_sethostname(*argv, 0); + } else if (filename != NULL) { + do_sethostname(filename, 1); + } else { + gethostname(buf, 255); + if (opt_short) { + s = strchr(buf, '.'); + if (!s) + s = buf; + *s = 0; + printf("%s\n", buf); + } else if (opt_domain) { + s = strchr(buf, '.'); + printf("%s\n", (s ? s + 1 : "")); + } else if (opt_ip) { + h = gethostbyname(buf); + if (!h) { + printf("Host not found\n"); + exit(1); + } + printf("%s\n", inet_ntoa(*(struct in_addr *) (h->h_addr))); + } else { + printf("%s\n", buf); + } + } + exit(0); } - @@ -41,8 +41,8 @@ #include <sys/kdaemon.h> #include <sys/sysmacros.h> #include <asm/types.h> -#include <linux/serial.h> /* for serial_struct */ -#include <sys/vt.h> /* for vt_stat */ +#include <linux/serial.h> /* for serial_struct */ +#include <sys/vt.h> /* for vt_stat */ #include <sys/ioctl.h> #include <linux/version.h> #ifdef BB_SYSLOGD @@ -58,15 +58,15 @@ #endif -#define VT_PRIMARY "/dev/tty1" /* Primary virtual console */ -#define VT_SECONDARY "/dev/tty2" /* Virtual console */ -#define VT_LOG "/dev/tty3" /* Virtual console */ -#define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */ -#define SERIAL_CON1 "/dev/ttyS1" /* Serial console */ -#define SHELL "/bin/sh" /* Default shell */ -#define INITTAB "/etc/inittab" /* inittab file location */ +#define VT_PRIMARY "/dev/tty1" /* Primary virtual console */ +#define VT_SECONDARY "/dev/tty2" /* Virtual console */ +#define VT_LOG "/dev/tty3" /* Virtual console */ +#define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */ +#define SERIAL_CON1 "/dev/ttyS1" /* Serial console */ +#define SHELL "/bin/sh" /* Default shell */ +#define INITTAB "/etc/inittab" /* inittab file location */ #ifndef INIT_SCRIPT -#define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ +#define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ #endif #define LOG 0x1 @@ -74,38 +74,38 @@ /* Allowed init action types */ typedef enum { - SYSINIT=1, - RESPAWN, - ASKFIRST, - WAIT, - ONCE + SYSINIT = 1, + RESPAWN, + ASKFIRST, + WAIT, + ONCE } initActionEnum; /* And now a list of the actions we support in the version of init */ -typedef struct initActionType{ - const char* name; - initActionEnum action; +typedef struct initActionType { + const char *name; + initActionEnum action; } initActionType; static const struct initActionType actions[] = { - {"sysinit", SYSINIT}, - {"respawn", RESPAWN}, - {"askfirst", ASKFIRST}, - {"wait", WAIT}, - {"once", ONCE}, - {0} + {"sysinit", SYSINIT}, + {"respawn", RESPAWN}, + {"askfirst", ASKFIRST}, + {"wait", WAIT}, + {"once", ONCE}, + {0} }; /* Set up a linked list of initactions, to be read from inittab */ typedef struct initActionTag initAction; struct initActionTag { - pid_t pid; - char process[256]; - char console[256]; - initAction *nextPtr; - initActionEnum action; + pid_t pid; + char process[256]; + char console[256]; + initAction *nextPtr; + initActionEnum action; }; -initAction* initActionList = NULL; +initAction *initActionList = NULL; static char *secondConsole = VT_SECONDARY; @@ -119,517 +119,533 @@ static char console[32] = _PATH_CONSOLE; * device may be bitwise-or'd from LOG | CONSOLE */ void message(int device, char *fmt, ...) { - va_list arguments; - int fd; + va_list arguments; + int fd; #ifdef BB_SYSLOGD - /* Log the message to syslogd */ - if (device & LOG ) { - char msg[1024]; - va_start(arguments, fmt); - vsnprintf(msg, sizeof(msg), fmt, arguments); - va_end(arguments); - openlog( "init", 0, LOG_DAEMON); - syslog(LOG_DAEMON|LOG_NOTICE, msg); - closelog(); - } + /* Log the message to syslogd */ + if (device & LOG) { + char msg[1024]; + va_start(arguments, fmt); + vsnprintf(msg, sizeof(msg), fmt, arguments); + va_end(arguments); + openlog("init", 0, LOG_DAEMON); + syslog(LOG_DAEMON | LOG_NOTICE, msg); + closelog(); + } #else - static int log_fd = -1; - - /* Take full control of the log tty, and never close it. - * It's mine, all mine! Muhahahaha! */ - if (log_fd < 0) { - if (log == NULL) { - /* don't even try to log, because there is no such console */ - log_fd = -2; - /* log to main console instead */ - device = CONSOLE; - } - else if ((log_fd = device_open(log, O_RDWR|O_NDELAY)) < 0) { - log_fd = -1; - fprintf(stderr, "Bummer, can't write to log on %s!\r\n", log); - fflush(stderr); - return; + static int log_fd = -1; + + /* Take full control of the log tty, and never close it. + * It's mine, all mine! Muhahahaha! */ + if (log_fd < 0) { + if (log == NULL) { + /* don't even try to log, because there is no such console */ + log_fd = -2; + /* log to main console instead */ + device = CONSOLE; + } else if ((log_fd = device_open(log, O_RDWR | O_NDELAY)) < 0) { + log_fd = -1; + fprintf(stderr, "Bummer, can't write to log on %s!\r\n", log); + fflush(stderr); + return; + } + } + if ((device & LOG) && (log_fd >= 0)) { + va_start(arguments, fmt); + vdprintf(log_fd, fmt, arguments); + va_end(arguments); } - } - if ( (device & LOG) && (log_fd >= 0) ) { - va_start(arguments, fmt); - vdprintf(log_fd, fmt, arguments); - va_end(arguments); - } #endif - if (device & CONSOLE) { - /* Always send console messages to /dev/console so people will see them. */ - if ((fd = device_open(_PATH_CONSOLE, O_WRONLY|O_NOCTTY|O_NDELAY)) >= 0) { - va_start(arguments, fmt); - vdprintf(fd, fmt, arguments); - va_end(arguments); - close(fd); - } else { - fprintf(stderr, "Bummer, can't print: "); - va_start(arguments, fmt); - vfprintf(stderr, fmt, arguments); - fflush(stderr); - va_end(arguments); + if (device & CONSOLE) { + /* Always send console messages to /dev/console so people will see them. */ + if ( + (fd = + device_open(_PATH_CONSOLE, + O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0) { + va_start(arguments, fmt); + vdprintf(fd, fmt, arguments); + va_end(arguments); + close(fd); + } else { + fprintf(stderr, "Bummer, can't print: "); + va_start(arguments, fmt); + vfprintf(stderr, fmt, arguments); + fflush(stderr); + va_end(arguments); + } } - } } /* Set terminal settings to reasonable defaults */ -void set_term( int fd) +void set_term(int fd) { - struct termios tty; - static const char control_characters[] = { - '\003', '\034', '\177', '\025', '\004', '\0', - '\1', '\0', '\021', '\023', '\032', '\0', '\022', - '\017', '\027', '\026', '\0' + struct termios tty; + static const char control_characters[] = { + '\003', '\034', '\177', '\025', '\004', '\0', + '\1', '\0', '\021', '\023', '\032', '\0', '\022', + '\017', '\027', '\026', '\0' }; - tcgetattr(fd, &tty); + tcgetattr(fd, &tty); - /* set control chars */ - memcpy(tty.c_cc, control_characters, sizeof(control_characters)); + /* set control chars */ + memcpy(tty.c_cc, control_characters, sizeof(control_characters)); - /* use line dicipline 0 */ - tty.c_line = 0; + /* use line dicipline 0 */ + tty.c_line = 0; - /* Make it be sane */ - //tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD; - //tty.c_cflag |= HUPCL|CLOCAL; + /* Make it be sane */ + //tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD; + //tty.c_cflag |= HUPCL|CLOCAL; - /* input modes */ - tty.c_iflag = ICRNL|IXON|IXOFF; + /* input modes */ + tty.c_iflag = ICRNL | IXON | IXOFF; - /* output modes */ - tty.c_oflag = OPOST|ONLCR; + /* output modes */ + tty.c_oflag = OPOST | ONLCR; - /* local modes */ - tty.c_lflag = ISIG|ICANON|ECHO|ECHOE|ECHOK|ECHOCTL|ECHOKE|IEXTEN; + /* local modes */ + tty.c_lflag = + ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE | IEXTEN; - tcsetattr(fd, TCSANOW, &tty); + tcsetattr(fd, TCSANOW, &tty); } /* How much memory does this machine have? */ static int mem_total() { - char s[80]; - char *p = "/proc/meminfo"; - FILE *f; - const char pattern[] = "MemTotal:"; - - if ((f = fopen(p, "r")) < 0) { - message(LOG, "Error opening %s: %s\n", p, strerror( errno)); - return -1; - } - while (NULL != fgets(s, 79, f)) { - p = strstr(s, pattern); - if (NULL != p) { - fclose(f); - return (atoi(p + strlen(pattern))); + char s[80]; + char *p = "/proc/meminfo"; + FILE *f; + const char pattern[] = "MemTotal:"; + + if ((f = fopen(p, "r")) < 0) { + message(LOG, "Error opening %s: %s\n", p, strerror(errno)); + return -1; + } + while (NULL != fgets(s, 79, f)) { + p = strstr(s, pattern); + if (NULL != p) { + fclose(f); + return (atoi(p + strlen(pattern))); + } } - } - return -1; + return -1; } static void console_init() { - int fd; - int tried_devcons = 0; - int tried_vtprimary = 0; - struct serial_struct sr; - char *s; - - if ((s = getenv("TERM")) != NULL) { - snprintf(termType,sizeof(termType)-1,"TERM=%s",s); - } - - if ((s = getenv("CONSOLE")) != NULL) { - snprintf(console, sizeof(console)-1, "%s",s); - } -#if #cpu(sparc) - /* sparc kernel supports console=tty[ab] parameter which is also - * passed to init, so catch it here */ - else if ((s = getenv("console")) != NULL) { - /* remap tty[ab] to /dev/ttyS[01] */ - if (strcmp( s, "ttya" )==0) - snprintf(console, sizeof(console)-1, "%s", SERIAL_CON0); - else if (strcmp( s, "ttyb" )==0) - snprintf(console, sizeof(console)-1, "%s", SERIAL_CON1); - } -#endif - else { - struct vt_stat vt; + int fd; + int tried_devcons = 0; + int tried_vtprimary = 0; + struct serial_struct sr; + char *s; + + if ((s = getenv("TERM")) != NULL) { + snprintf(termType, sizeof(termType) - 1, "TERM=%s", s); + } - /* 2.2 kernels: identify the real console backend and try to use it */ - if (ioctl(0, TIOCGSERIAL, &sr) == 0) { - /* this is a serial console */ - snprintf(console, sizeof(console)-1, "/dev/ttyS%d", sr.line); + if ((s = getenv("CONSOLE")) != NULL) { + snprintf(console, sizeof(console) - 1, "%s", s); } - else if (ioctl(0, VT_GETSTATE, &vt) == 0) { - /* this is linux virtual tty */ - snprintf(console, sizeof(console)-1, "/dev/tty%d", vt.v_active); - } else { - snprintf(console, sizeof(console)-1, "%s", _PATH_CONSOLE); - tried_devcons++; +#if #cpu(sparc) + /* sparc kernel supports console=tty[ab] parameter which is also + * passed to init, so catch it here */ + else if ((s = getenv("console")) != NULL) { + /* remap tty[ab] to /dev/ttyS[01] */ + if (strcmp(s, "ttya") == 0) + snprintf(console, sizeof(console) - 1, "%s", SERIAL_CON0); + else if (strcmp(s, "ttyb") == 0) + snprintf(console, sizeof(console) - 1, "%s", SERIAL_CON1); } - } - - while ((fd = open(console, O_RDONLY | O_NONBLOCK)) < 0) { - /* Can't open selected console -- try /dev/console */ - if (!tried_devcons) { - tried_devcons++; - snprintf(console, sizeof(console)-1, "%s", _PATH_CONSOLE); - continue; +#endif + else { + struct vt_stat vt; + + /* 2.2 kernels: identify the real console backend and try to use it */ + if (ioctl(0, TIOCGSERIAL, &sr) == 0) { + /* this is a serial console */ + snprintf(console, sizeof(console) - 1, "/dev/ttyS%d", sr.line); + } else if (ioctl(0, VT_GETSTATE, &vt) == 0) { + /* this is linux virtual tty */ + snprintf(console, sizeof(console) - 1, "/dev/tty%d", + vt.v_active); + } else { + snprintf(console, sizeof(console) - 1, "%s", _PATH_CONSOLE); + tried_devcons++; + } } - /* Can't open selected console -- try vt1 */ - if (!tried_vtprimary) { - tried_vtprimary++; - snprintf(console, sizeof(console)-1, "%s", VT_PRIMARY); - continue; + + while ((fd = open(console, O_RDONLY | O_NONBLOCK)) < 0) { + /* Can't open selected console -- try /dev/console */ + if (!tried_devcons) { + tried_devcons++; + snprintf(console, sizeof(console) - 1, "%s", _PATH_CONSOLE); + continue; + } + /* Can't open selected console -- try vt1 */ + if (!tried_vtprimary) { + tried_vtprimary++; + snprintf(console, sizeof(console) - 1, "%s", VT_PRIMARY); + continue; + } + break; } - break; - } - if (fd < 0) { - /* Perhaps we should panic here? */ - snprintf(console, sizeof(console)-1, "/dev/null"); - } else { - /* check for serial console and disable logging to tty3 & running a - * shell to tty2 */ - if (ioctl(0,TIOCGSERIAL,&sr) == 0) { - message(LOG|CONSOLE, "serial console detected. Disabling virtual terminals.\r\n" ); - log = NULL; - secondConsole = NULL; + if (fd < 0) { + /* Perhaps we should panic here? */ + snprintf(console, sizeof(console) - 1, "/dev/null"); + } else { + /* check for serial console and disable logging to tty3 & running a + * shell to tty2 */ + if (ioctl(0, TIOCGSERIAL, &sr) == 0) { + message(LOG | CONSOLE, + "serial console detected. Disabling virtual terminals.\r\n"); + log = NULL; + secondConsole = NULL; + } + close(fd); } - close(fd); - } - message(LOG, "console=%s\n", console ); + message(LOG, "console=%s\n", console); } -static pid_t run(char* command, - char *terminal, int get_enter) +static pid_t run(char *command, char *terminal, int get_enter) { - int i, fd; - pid_t pid; - char* tmpCmd; - char* cmd[255]; - static const char press_enter[] = - "\nPlease press Enter to activate this console. "; - char* environment[] = { - "HOME=/", - "PATH=/usr/bin:/bin:/usr/sbin:/sbin", - "SHELL=/bin/sh", - termType, - "USER=root", - 0 - }; - - - if ((pid = fork()) == 0) { - pid_t shell_pgid = getpid (); - - /* Clean up */ - close(0); - close(1); - close(2); - setsid(); + int i, fd; + pid_t pid; + char *tmpCmd; + char *cmd[255]; + static const char press_enter[] = + + "\nPlease press Enter to activate this console. "; + char *environment[] = { + "HOME=/", + "PATH=/usr/bin:/bin:/usr/sbin:/sbin", + "SHELL=/bin/sh", + termType, + "USER=root", + 0 + }; - /* Reset signal handlers set for parent process */ - signal(SIGUSR1, SIG_DFL); - signal(SIGUSR2, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGHUP, SIG_DFL); - if ((fd = device_open(terminal, O_RDWR)) < 0) { - message(LOG|CONSOLE, "Bummer, can't open %s\r\n", terminal); - exit(1); - } - dup2(fd, 0); - dup2(fd, 1); - dup2(fd, 2); - tcsetpgrp (0, getpgrp()); - set_term(0); + if ((pid = fork()) == 0) { + pid_t shell_pgid = getpid(); - if (get_enter==TRUE) { - /* - * Save memory by not exec-ing anything large (like a shell) - * before the user wants it. This is critical if swap is not - * enabled and the system has low memory. Generally this will - * be run on the second virtual console, and the first will - * be allowed to start a shell or whatever an init script - * specifies. - */ - char c; - message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n", - command, shell_pgid, terminal ); - write(fileno(stdout), press_enter, sizeof(press_enter) - 1); - read(fileno(stdin), &c, 1); - } + /* Clean up */ + close(0); + close(1); + close(2); + setsid(); + + /* Reset signal handlers set for parent process */ + signal(SIGUSR1, SIG_DFL); + signal(SIGUSR2, SIG_DFL); + signal(SIGINT, SIG_DFL); + signal(SIGTERM, SIG_DFL); + signal(SIGHUP, SIG_DFL); + + if ((fd = device_open(terminal, O_RDWR)) < 0) { + message(LOG | CONSOLE, "Bummer, can't open %s\r\n", terminal); + exit(1); + } + dup2(fd, 0); + dup2(fd, 1); + dup2(fd, 2); + tcsetpgrp(0, getpgrp()); + set_term(0); + + if (get_enter == TRUE) { + /* + * Save memory by not exec-ing anything large (like a shell) + * before the user wants it. This is critical if swap is not + * enabled and the system has low memory. Generally this will + * be run on the second virtual console, and the first will + * be allowed to start a shell or whatever an init script + * specifies. + */ + char c; + + message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n", + command, shell_pgid, terminal); + write(fileno(stdout), press_enter, sizeof(press_enter) - 1); + read(fileno(stdin), &c, 1); + } - /* Log the process name and args */ - message(LOG, "Starting pid %d, console %s: '", - shell_pgid, terminal, command); - - /* Convert command (char*) into cmd (char**, one word per string) */ - for (tmpCmd=command, i=0; (tmpCmd=strsep(&command, " \t")) != NULL;) { - if (*tmpCmd != '\0') { - cmd[i] = tmpCmd; - message(LOG, "%s ", tmpCmd); - tmpCmd++; - i++; - } + /* Log the process name and args */ + message(LOG, "Starting pid %d, console %s: '", + shell_pgid, terminal, command); + + /* Convert command (char*) into cmd (char**, one word per string) */ + for (tmpCmd = command, i = 0; + (tmpCmd = strsep(&command, " \t")) != NULL;) { + if (*tmpCmd != '\0') { + cmd[i] = tmpCmd; +#ifdef DEBUG_INIT + message(LOG, "%s ", tmpCmd); +#endif + tmpCmd++; + i++; + } + } + cmd[i] = NULL; + message(LOG, "'\r\n"); + + /* Now run it. The new program will take over this PID, + * so nothing further in init.c should be run. */ + execve(cmd[0], cmd, environment); + + /* We're still here? Some error happened. */ + message(LOG | CONSOLE, "Bummer, could not run '%s': %s\n", cmd[0], + strerror(errno)); + exit(-1); } - cmd[i] = NULL; - message(LOG, "'\r\n"); - - /* Now run it. The new program will take over this PID, - * so nothing further in init.c should be run. */ - execve(cmd[0], cmd, environment); - - /* We're still here? Some error happened. */ - message(LOG|CONSOLE, "Bummer, could not run '%s': %s\n", cmd[0], - strerror(errno)); - exit(-1); - } - return pid; + return pid; } -static int waitfor(char* command, - char *terminal, int get_enter) +static int waitfor(char *command, char *terminal, int get_enter) { - int status, wpid; - int pid = run( command, terminal, get_enter); - - while (1) { - wpid = wait(&status); - if (wpid > 0 ) { - message(LOG, "Process '%s' (pid %d) exited.\n", - command, wpid); - break; + int status, wpid; + int pid = run(command, terminal, get_enter); + + while (1) { + wpid = wait(&status); + if (wpid > 0) { + message(LOG, "Process '%s' (pid %d) exited.\n", command, wpid); + break; + } + if (wpid == pid) + break; } - if (wpid == pid ) - break; - } - return wpid; + return wpid; } /* Make sure there is enough memory to do something useful. * * Calls swapon if needed so be sure /proc is mounted. */ static void check_memory() { - struct stat statBuf; - - if (mem_total() > 3500) + struct stat statBuf; + + if (mem_total() > 3500) + return; + + if (stat("/etc/fstab", &statBuf) == 0) { + /* Try to turn on swap */ + waitfor("/bin/swapon swapon -a", log, FALSE); + if (mem_total() < 3500) + goto goodnight; + } else + goto goodnight; return; - if (stat("/etc/fstab", &statBuf) == 0) { - /* Try to turn on swap */ - waitfor("/bin/swapon swapon -a", log, FALSE); - if (mem_total() < 3500) - goto goodnight; - } else - goto goodnight; - return; - -goodnight: - message(CONSOLE, "Sorry, your computer does not have enough memory.\r\n"); - while (1) sleep(1); + goodnight: + message(CONSOLE, + "Sorry, your computer does not have enough memory.\r\n"); + while (1) + sleep(1); } #ifndef DEBUG_INIT static void shutdown_system(void) { - /* first disable our SIGHUP signal */ - signal(SIGHUP, SIG_DFL); - - /* Allow Ctrl-Alt-Del to reboot system. */ - reboot(RB_ENABLE_CAD); - message(CONSOLE, "\r\nThe system is going down NOW !!\r\n"); - sync(); - - /* Send signals to every process _except_ pid 1 */ - message(CONSOLE, "Sending SIGTERM to all processes.\r\n"); - kill(-1, SIGTERM); - sleep(5); - sync(); - - message(CONSOLE, "Sending SIGKILL to all processes.\r\n"); - kill(-1, SIGKILL); - sleep(5); - - message(CONSOLE, "Disabling swap.\r\n"); - waitfor( "swapoff -a", console, FALSE); - message(CONSOLE, "Unmounting filesystems.\r\n"); + /* first disable our SIGHUP signal */ + signal(SIGHUP, SIG_DFL); + + /* Allow Ctrl-Alt-Del to reboot system. */ + reboot(RB_ENABLE_CAD); + message(CONSOLE, "\r\nThe system is going down NOW !!\r\n"); + sync(); + + /* Send signals to every process _except_ pid 1 */ + message(CONSOLE, "Sending SIGTERM to all processes.\r\n"); + kill(-1, SIGTERM); + sleep(5); + sync(); + + message(CONSOLE, "Sending SIGKILL to all processes.\r\n"); + kill(-1, SIGKILL); + sleep(5); + + message(CONSOLE, "Disabling swap.\r\n"); + waitfor("swapoff -a", console, FALSE); + message(CONSOLE, "Unmounting filesystems.\r\n"); waitfor("umount -a -r", console, FALSE); - sync(); - if (kernelVersion > 0 && kernelVersion <= 2 * 65536 + 2 * 256 + 11) { - /* bdflush, kupdate not needed for kernels >2.2.11 */ - bdflush(1, 0); sync(); - } + if (kernelVersion > 0 && kernelVersion <= 2 * 65536 + 2 * 256 + 11) { + /* bdflush, kupdate not needed for kernels >2.2.11 */ + bdflush(1, 0); + sync(); + } } static void halt_signal(int sig) { - shutdown_system(); - message(CONSOLE, "The system is halted. Press %s or turn off power\r\n", - (secondConsole == NULL) /* serial console */ - ? "Reset" : "CTRL-ALT-DEL"); - sync(); + shutdown_system(); + message(CONSOLE, + "The system is halted. Press %s or turn off power\r\n", + (secondConsole == NULL) /* serial console */ + ? "Reset" : "CTRL-ALT-DEL"); + sync(); - /* allow time for last message to reach serial console */ - sleep(5); + /* allow time for last message to reach serial console */ + sleep(5); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) - if (sig == SIGUSR2) - reboot(RB_POWER_OFF); - else + if (sig == SIGUSR2) + reboot(RB_POWER_OFF); + else #endif - reboot(RB_HALT_SYSTEM); - exit(0); + reboot(RB_HALT_SYSTEM); + exit(0); } static void reboot_signal(int sig) { - shutdown_system(); - message(CONSOLE, "Please stand by while rebooting the system.\r\n"); - sync(); + shutdown_system(); + message(CONSOLE, "Please stand by while rebooting the system.\r\n"); + sync(); - /* allow time for last message to reach serial console */ - sleep(2); + /* allow time for last message to reach serial console */ + sleep(2); - reboot(RB_AUTOBOOT); - exit(0); + reboot(RB_AUTOBOOT); + exit(0); } #if defined BB_FEATURE_INIT_CHROOT static void check_chroot(int sig) { - char *argv_init[2] = { "init", NULL, }; - char *envp_init[3] = { "HOME=/", "TERM=linux", NULL, }; - char rootpath[256], *tc; - int fd; + char *argv_init[2] = { "init", NULL, }; + char *envp_init[3] = { "HOME=/", "TERM=linux", NULL, }; + char rootpath[256], *tc; + int fd; + + if ((fd = open("/proc/sys/kernel/init-chroot", O_RDONLY)) == -1) { + message(CONSOLE, + "SIGHUP recived, but could not open proc file\r\n"); + sleep(2); + return; + } + if (read(fd, rootpath, sizeof(rootpath)) == -1) { + message(CONSOLE, + "SIGHUP recived, but could not read proc file\r\n"); + sleep(2); + return; + } + close(fd); - if ((fd = open("/proc/sys/kernel/init-chroot", O_RDONLY)) == -1) { - message(CONSOLE, "SIGHUP recived, but could not open proc file\r\n"); - sleep(2); - return; - } - if (read(fd, rootpath, sizeof(rootpath)) == -1) { - message(CONSOLE, "SIGHUP recived, but could not read proc file\r\n"); + if (rootpath[0] == '\0') { + message(CONSOLE, + "SIGHUP recived, but new root is not valid: %s\r\n", + rootpath); + sleep(2); + return; + } + + tc = strrchr(rootpath, '\n'); + *tc = '\0'; + + /* Ok, making it this far means we commit */ + message(CONSOLE, "Please stand by, changing root to `%s'.\r\n", + rootpath); + + /* kill all other programs first */ + message(CONSOLE, "Sending SIGTERM to all processes.\r\n"); + kill(-1, SIGTERM); sleep(2); - return; - } - close(fd); + sync(); - if (rootpath[0] == '\0') { - message(CONSOLE, "SIGHUP recived, but new root is not valid: %s\r\n", - rootpath); + message(CONSOLE, "Sending SIGKILL to all processes.\r\n"); + kill(-1, SIGKILL); sleep(2); + sync(); + + /* ok, we don't need /proc anymore. we also assume that the signaling + * process left the rest of the filesystems alone for us */ + umount("/proc"); + + /* Ok, now we chroot. Hopefully we only have two things mounted, the + * new chroot'd mount point, and the old "/" mount. s, + * we go ahead and unmount the old "/". This should trigger the kernel + * to set things up the Right Way(tm). */ + + if (!chroot(rootpath)) + umount("/dev/root"); + + /* If the chroot fails, we are already too far to turn back, so we + * continue and hope that executing init below will revive the system */ + + /* close all of our descriptors and open new ones */ + close(0); + close(1); + close(2); + open("/dev/console", O_RDWR, 0); + dup(0); + dup(0); + + message(CONSOLE, "Executing real init...\r\n"); + /* execute init in the (hopefully) new root */ + execve("/sbin/init", argv_init, envp_init); + + message(CONSOLE, + "ERROR: Could not exec new init. Press %s to reboot.\r\n", + (secondConsole == NULL) /* serial console */ + ? "Reset" : "CTRL-ALT-DEL"); return; - } - - tc = strrchr(rootpath, '\n'); - *tc = '\0'; - - /* Ok, making it this far means we commit */ - message(CONSOLE, "Please stand by, changing root to `%s'.\r\n", rootpath); - - /* kill all other programs first */ - message(CONSOLE, "Sending SIGTERM to all processes.\r\n"); - kill(-1, SIGTERM); - sleep(2); - sync(); - - message(CONSOLE, "Sending SIGKILL to all processes.\r\n"); - kill(-1, SIGKILL); - sleep(2); - sync(); - - /* ok, we don't need /proc anymore. we also assume that the signaling - * process left the rest of the filesystems alone for us */ - umount("/proc"); - - /* Ok, now we chroot. Hopefully we only have two things mounted, the - * new chroot'd mount point, and the old "/" mount. s, - * we go ahead and unmount the old "/". This should trigger the kernel - * to set things up the Right Way(tm). */ - - if (!chroot(rootpath)) - umount("/dev/root"); - - /* If the chroot fails, we are already too far to turn back, so we - * continue and hope that executing init below will revive the system */ - - /* close all of our descriptors and open new ones */ - close(0); - close(1); - close(2); - open("/dev/console", O_RDWR, 0); - dup(0); - dup(0); - - message(CONSOLE, "Executing real init...\r\n"); - /* execute init in the (hopefully) new root */ - execve("/sbin/init",argv_init,envp_init); - - message(CONSOLE, "ERROR: Could not exec new init. Press %s to reboot.\r\n", - (secondConsole == NULL) /* serial console */ - ? "Reset" : "CTRL-ALT-DEL"); - return; -} -#endif /* BB_FEATURE_INIT_CHROOT */ - -#endif /* ! DEBUG_INIT */ - -void new_initAction (initActionEnum action, - char* process, char* cons) -{ - initAction* newAction; - - if (*cons == '\0') - cons = console; - - /* If BusyBox detects that a serial console is in use, - * then entries not refering to the console or null devices will _not_ be run. - * The exception to this rule is the null device. - */ - if (secondConsole == NULL && strcmp(cons, console) && strcmp(cons, "/dev/null")) - return; +} +#endif /* BB_FEATURE_INIT_CHROOT */ - newAction = calloc ((size_t)(1), sizeof(initAction)); - if (!newAction) { - message(LOG|CONSOLE,"Memory allocation failure\n"); - while (1) sleep(1); - } - newAction->nextPtr = initActionList; - initActionList = newAction; - strncpy( newAction->process, process, 255); - newAction->action = action; - strncpy(newAction->console, cons, 255); - newAction->pid = 0; +#endif /* ! DEBUG_INIT */ + +void new_initAction(initActionEnum action, char *process, char *cons) +{ + initAction *newAction; + + if (*cons == '\0') + cons = console; + + /* If BusyBox detects that a serial console is in use, + * then entries not refering to the console or null devices will _not_ be run. + * The exception to this rule is the null device. + */ + if (secondConsole == NULL && strcmp(cons, console) + && strcmp(cons, "/dev/null")) + return; + + newAction = calloc((size_t) (1), sizeof(initAction)); + if (!newAction) { + message(LOG | CONSOLE, "Memory allocation failure\n"); + while (1) + sleep(1); + } + newAction->nextPtr = initActionList; + initActionList = newAction; + strncpy(newAction->process, process, 255); + newAction->action = action; + strncpy(newAction->console, cons, 255); + newAction->pid = 0; // message(LOG|CONSOLE, "process='%s' action='%d' console='%s'\n", -// newAction->process, newAction->action, newAction->console); +// newAction->process, newAction->action, newAction->console); } -void delete_initAction (initAction *action) +void delete_initAction(initAction * action) { - initAction *a, *b=NULL; - for( a=initActionList ; a ; b=a, a=a->nextPtr) { - if (a == action) { - if (b==NULL) { - initActionList=a->nextPtr; - } else { - b->nextPtr=a->nextPtr; - } - free( a); - break; + initAction *a, *b = NULL; + + for (a = initActionList; a; b = a, a = a->nextPtr) { + if (a == action) { + if (b == NULL) { + initActionList = a->nextPtr; + } else { + b->nextPtr = a->nextPtr; + } + free(a); + break; + } } - } } /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined, @@ -639,253 +655,258 @@ void delete_initAction (initAction *action) * _is_ defined, but /etc/inittab is missing, this * results in the same set of default behaviors. * */ -void parse_inittab(void) +void parse_inittab(void) { #ifdef BB_FEATURE_USE_INITTAB - FILE* file; - char buf[256], lineAsRead[256], tmpConsole[256]; - char *p, *q, *r, *s; - const struct initActionType *a = actions; - int foundIt; + FILE *file; + char buf[256], lineAsRead[256], tmpConsole[256]; + char *p, *q, *r, *s; + const struct initActionType *a = actions; + int foundIt; - file = fopen(INITTAB, "r"); - if (file == NULL) { - /* No inittab file -- set up some default behavior */ + file = fopen(INITTAB, "r"); + if (file == NULL) { + /* No inittab file -- set up some default behavior */ #endif - /* Askfirst shell on tty1 */ - new_initAction( ASKFIRST, SHELL, console ); - /* Askfirst shell on tty2 */ - if (secondConsole != NULL) - new_initAction( ASKFIRST, SHELL, secondConsole ); - /* sysinit */ - new_initAction( SYSINIT, INIT_SCRIPT, console ); - - return; + /* Askfirst shell on tty1 */ + new_initAction(ASKFIRST, SHELL, console); + /* Askfirst shell on tty2 */ + if (secondConsole != NULL) + new_initAction(ASKFIRST, SHELL, secondConsole); + /* sysinit */ + new_initAction(SYSINIT, INIT_SCRIPT, console); + + return; #ifdef BB_FEATURE_USE_INITTAB - } - - while ( fgets(buf, 255, file) != NULL) { - foundIt=FALSE; - for(p = buf; *p == ' ' || *p == '\t'; p++); - if (*p == '#' || *p == '\n') continue; - - /* Trim the trailing \n */ - q = strrchr( p, '\n'); - if (q != NULL) - *q='\0'; - - /* Keep a copy around for posterity's sake (and error msgs) */ - strcpy(lineAsRead, buf); - - /* Grab the ID field */ - s=p; - p = strchr( p, ':'); - if ( p != NULL || *(p+1) != '\0' ) { - *p='\0'; - ++p; } - /* Now peal off the process field from the end - * of the string */ - q = strrchr( p, ':'); - if ( q == NULL || *(q+1) == '\0' ) { - message(LOG|CONSOLE,"Bad inittab entry: %s\n", lineAsRead); - continue; - } else { - *q='\0'; - ++q; - } + while (fgets(buf, 255, file) != NULL) { + foundIt = FALSE; + for (p = buf; *p == ' ' || *p == '\t'; p++); + if (*p == '#' || *p == '\n') + continue; + + /* Trim the trailing \n */ + q = strrchr(p, '\n'); + if (q != NULL) + *q = '\0'; + + /* Keep a copy around for posterity's sake (and error msgs) */ + strcpy(lineAsRead, buf); + + /* Grab the ID field */ + s = p; + p = strchr(p, ':'); + if (p != NULL || *(p + 1) != '\0') { + *p = '\0'; + ++p; + } - /* Now peal off the action field */ - r = strrchr( p, ':'); - if ( r == NULL || *(r+1) == '\0') { - message(LOG|CONSOLE,"Bad inittab entry: %s\n", lineAsRead); - continue; - } else { - ++r; - } + /* Now peal off the process field from the end + * of the string */ + q = strrchr(p, ':'); + if (q == NULL || *(q + 1) == '\0') { + message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead); + continue; + } else { + *q = '\0'; + ++q; + } - /* Ok, now process it */ - a = actions; - while (a->name != 0) { - if (strcmp(a->name, r) == 0) { - if (*s != '\0') { - struct stat statBuf; - strcpy(tmpConsole, "/dev/"); - strncat(tmpConsole, s, 200); - if (stat(tmpConsole, &statBuf) != 0) { - message(LOG|CONSOLE, "device '%s' does not exist. Did you read the directions?\n", tmpConsole); - break; - } - s = tmpConsole; + /* Now peal off the action field */ + r = strrchr(p, ':'); + if (r == NULL || *(r + 1) == '\0') { + message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead); + continue; + } else { + ++r; + } + + /* Ok, now process it */ + a = actions; + while (a->name != 0) { + if (strcmp(a->name, r) == 0) { + if (*s != '\0') { + struct stat statBuf; + + strcpy(tmpConsole, "/dev/"); + strncat(tmpConsole, s, 200); + if (stat(tmpConsole, &statBuf) != 0) { + message(LOG | CONSOLE, + "device '%s' does not exist. Did you read the directions?\n", + tmpConsole); + break; + } + s = tmpConsole; + } + new_initAction(a->action, q, s); + foundIt = TRUE; + } + a++; + } + if (foundIt == TRUE) + continue; + else { + /* Choke on an unknown action */ + message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead); } - new_initAction( a->action, q, s); - foundIt=TRUE; - } - a++; - } - if (foundIt==TRUE) - continue; - else { - /* Choke on an unknown action */ - message(LOG|CONSOLE, "Bad inittab entry: %s\n", lineAsRead); } - } - return; + return; #endif } extern int init_main(int argc, char **argv) { - initAction *a; - pid_t wpid; - int status; + initAction *a; + pid_t wpid; + int status; #ifndef DEBUG_INIT - /* Expect to be PID 1 if we are run as init (not linuxrc) */ - if (getpid() != 1 && strstr(argv[0], "init")!=NULL ) { - usage( "init\n\nInit is the parent of all processes.\n\n" - "This version of init is designed to be run only by the kernel\n"); - } - /* Fix up argv[0] to be certain we claim to be init */ - strncpy(argv[0], "init", strlen(argv[0])); - - /* Set up sig handlers -- be sure to - * clear all of these in run() */ - signal(SIGUSR1, halt_signal); - signal(SIGUSR2, reboot_signal); - signal(SIGINT, reboot_signal); - signal(SIGTERM, reboot_signal); + /* Expect to be PID 1 if we are run as init (not linuxrc) */ + if (getpid() != 1 && strstr(argv[0], "init") != NULL) { + usage("init\n\nInit is the parent of all processes.\n\n" + "This version of init is designed to be run only by the kernel\n"); + } + /* Fix up argv[0] to be certain we claim to be init */ + strncpy(argv[0], "init", strlen(argv[0])); + + /* Set up sig handlers -- be sure to + * clear all of these in run() */ + signal(SIGUSR1, halt_signal); + signal(SIGUSR2, reboot_signal); + signal(SIGINT, reboot_signal); + signal(SIGTERM, reboot_signal); #if defined BB_FEATURE_INIT_CHROOT - signal(SIGHUP, check_chroot); + signal(SIGHUP, check_chroot); #endif - /* Turn off rebooting via CTL-ALT-DEL -- we get a - * SIGINT on CAD so we can shut things down gracefully... */ - reboot(RB_DISABLE_CAD); -#endif + /* Turn off rebooting via CTL-ALT-DEL -- we get a + * SIGINT on CAD so we can shut things down gracefully... */ + reboot(RB_DISABLE_CAD); +#endif - /* Figure out where the default console should be */ - console_init(); + /* Figure out where the default console should be */ + console_init(); - /* Close whatever files are open, and reset the console. */ - close(0); - close(1); - close(2); - set_term(0); - setsid(); + /* Close whatever files are open, and reset the console. */ + close(0); + close(1); + close(2); + set_term(0); + setsid(); - /* Make sure PATH is set to something sane */ - putenv(_PATH_STDPATH); + /* Make sure PATH is set to something sane */ + putenv(_PATH_STDPATH); - /* Hello world */ + /* Hello world */ #ifndef DEBUG_INIT - message(LOG|CONSOLE, - "init started: BusyBox v%s (%s) multi-call binary\r\n", - BB_VER, BB_BT); + message(LOG | CONSOLE, + "init started: BusyBox v%s (%s) multi-call binary\r\n", + BB_VER, BB_BT); #else - message(LOG|CONSOLE, - "init(%d) started: BusyBox v%s (%s) multi-call binary\r\n", - getpid(), BB_VER, BB_BT); + message(LOG | CONSOLE, + "init(%d) started: BusyBox v%s (%s) multi-call binary\r\n", + getpid(), BB_VER, BB_BT); #endif - - /* Mount /proc */ - if (mount ("proc", "/proc", "proc", 0, 0) == 0) { - message(LOG|CONSOLE, "Mounting /proc: done.\n"); - kernelVersion = get_kernel_revision(); - } else - message(LOG|CONSOLE, "Mounting /proc: failed!\n"); - - /* Make sure there is enough memory to do something useful. */ - check_memory(); - - /* Check if we are supposed to be in single user mode */ - if ( argc > 1 && (!strcmp(argv[1], "single") || - !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) - { - /* Ask first then start a shell on tty2 */ - if (secondConsole != NULL) - new_initAction( ASKFIRST, SHELL, secondConsole); - /* Start a shell on tty1 */ - new_initAction( RESPAWN, SHELL, console); - } else { - /* Not in single user mode -- see what inittab says */ - - /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined, - * then parse_inittab() simply adds in some default - * actions(i.e runs INIT_SCRIPT and then starts a pair - * of "askfirst" shells */ - parse_inittab(); - } - - /* Now run everything that needs to be run */ - - /* First run the sysinit command */ - for( a=initActionList ; a; a=a->nextPtr) { - if (a->action == SYSINIT) { - waitfor(a->process, a->console, FALSE); - /* Now remove the "sysinit" entry from the list */ - delete_initAction( a); + + /* Mount /proc */ + if (mount("proc", "/proc", "proc", 0, 0) == 0) { + message(LOG | CONSOLE, "Mounting /proc: done.\n"); + kernelVersion = get_kernel_revision(); + } else + message(LOG | CONSOLE, "Mounting /proc: failed!\n"); + + /* Make sure there is enough memory to do something useful. */ + check_memory(); + + /* Check if we are supposed to be in single user mode */ + if (argc > 1 && (!strcmp(argv[1], "single") || + !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) { + /* Ask first then start a shell on tty2 */ + if (secondConsole != NULL) + new_initAction(ASKFIRST, SHELL, secondConsole); + /* Start a shell on tty1 */ + new_initAction(RESPAWN, SHELL, console); + } else { + /* Not in single user mode -- see what inittab says */ + + /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined, + * then parse_inittab() simply adds in some default + * actions(i.e runs INIT_SCRIPT and then starts a pair + * of "askfirst" shells */ + parse_inittab(); } - } - /* Next run anything that wants to block */ - for( a=initActionList ; a; a=a->nextPtr) { - if (a->action == WAIT) { - waitfor(a->process, a->console, FALSE); - /* Now remove the "wait" entry from the list */ - delete_initAction( a); + + /* Now run everything that needs to be run */ + + /* First run the sysinit command */ + for (a = initActionList; a; a = a->nextPtr) { + if (a->action == SYSINIT) { + waitfor(a->process, a->console, FALSE); + /* Now remove the "sysinit" entry from the list */ + delete_initAction(a); + } } - } - /* Next run anything to be run only once */ - for( a=initActionList ; a; a=a->nextPtr) { - if (a->action == ONCE) { - run(a->process, a->console, FALSE); - /* Now remove the "once" entry from the list */ - delete_initAction( a); + /* Next run anything that wants to block */ + for (a = initActionList; a; a = a->nextPtr) { + if (a->action == WAIT) { + waitfor(a->process, a->console, FALSE); + /* Now remove the "wait" entry from the list */ + delete_initAction(a); + } } - } - /* If there is nothing else to do, stop */ - if (initActionList == NULL) { - message(LOG|CONSOLE, "No more tasks for init -- sleeping forever.\n"); - while (1) sleep(1); - } - - /* Now run the looping stuff for the rest of forever */ - while (1) { - for( a=initActionList ; a; a=a->nextPtr) { - /* Only run stuff with pid==0. If they have - * a pid, that means they are still running */ - if (a->pid == 0) { - switch(a->action) { - case RESPAWN: - /* run the respawn stuff */ - a->pid = run(a->process, a->console, FALSE); - break; - case ASKFIRST: - /* run the askfirst stuff */ - a->pid = run(a->process, a->console, TRUE); - break; - /* silence the compiler's incessant whining */ - default: - break; + /* Next run anything to be run only once */ + for (a = initActionList; a; a = a->nextPtr) { + if (a->action == ONCE) { + run(a->process, a->console, FALSE); + /* Now remove the "once" entry from the list */ + delete_initAction(a); } - } } - /* Wait for a child process to exit */ - wpid = wait(&status); - if (wpid > 0 ) { - /* Find out who died and clean up their corpse */ - for( a=initActionList ; a; a=a->nextPtr) { - if (a->pid==wpid) { - a->pid=0; - message(LOG, "Process '%s' (pid %d) exited. Scheduling it for restart.\n", - a->process, wpid); + /* If there is nothing else to do, stop */ + if (initActionList == NULL) { + message(LOG | CONSOLE, + "No more tasks for init -- sleeping forever.\n"); + while (1) + sleep(1); + } + + /* Now run the looping stuff for the rest of forever */ + while (1) { + for (a = initActionList; a; a = a->nextPtr) { + /* Only run stuff with pid==0. If they have + * a pid, that means they are still running */ + if (a->pid == 0) { + switch (a->action) { + case RESPAWN: + /* run the respawn stuff */ + a->pid = run(a->process, a->console, FALSE); + break; + case ASKFIRST: + /* run the askfirst stuff */ + a->pid = run(a->process, a->console, TRUE); + break; + /* silence the compiler's incessant whining */ + default: + break; + } + } + } + /* Wait for a child process to exit */ + wpid = wait(&status); + if (wpid > 0) { + /* Find out who died and clean up their corpse */ + for (a = initActionList; a; a = a->nextPtr) { + if (a->pid == wpid) { + a->pid = 0; + message(LOG, + "Process '%s' (pid %d) exited. Scheduling it for restart.\n", + a->process, wpid); + } + } } - } + sleep(1); } - sleep(1); - } } - diff --git a/init/halt.c b/init/halt.c index 23eb23c30..d61c38760 100644 --- a/init/halt.c +++ b/init/halt.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini halt implementation for busybox * @@ -23,10 +24,8 @@ #include "internal.h" #include <signal.h> -extern int -halt_main(int argc, char ** argv) +extern int halt_main(int argc, char **argv) { - /* don't assume init's pid == 1 */ - exit( kill(findInitPid(), SIGUSR1)); + /* don't assume init's pid == 1 */ + exit(kill(findInitPid(), SIGUSR1)); } - diff --git a/init/init.c b/init/init.c index 6dad7181b..899dca48c 100644 --- a/init/init.c +++ b/init/init.c @@ -41,8 +41,8 @@ #include <sys/kdaemon.h> #include <sys/sysmacros.h> #include <asm/types.h> -#include <linux/serial.h> /* for serial_struct */ -#include <sys/vt.h> /* for vt_stat */ +#include <linux/serial.h> /* for serial_struct */ +#include <sys/vt.h> /* for vt_stat */ #include <sys/ioctl.h> #include <linux/version.h> #ifdef BB_SYSLOGD @@ -58,15 +58,15 @@ #endif -#define VT_PRIMARY "/dev/tty1" /* Primary virtual console */ -#define VT_SECONDARY "/dev/tty2" /* Virtual console */ -#define VT_LOG "/dev/tty3" /* Virtual console */ -#define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */ -#define SERIAL_CON1 "/dev/ttyS1" /* Serial console */ -#define SHELL "/bin/sh" /* Default shell */ -#define INITTAB "/etc/inittab" /* inittab file location */ +#define VT_PRIMARY "/dev/tty1" /* Primary virtual console */ +#define VT_SECONDARY "/dev/tty2" /* Virtual console */ +#define VT_LOG "/dev/tty3" /* Virtual console */ +#define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */ +#define SERIAL_CON1 "/dev/ttyS1" /* Serial console */ +#define SHELL "/bin/sh" /* Default shell */ +#define INITTAB "/etc/inittab" /* inittab file location */ #ifndef INIT_SCRIPT -#define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ +#define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ #endif #define LOG 0x1 @@ -74,38 +74,38 @@ /* Allowed init action types */ typedef enum { - SYSINIT=1, - RESPAWN, - ASKFIRST, - WAIT, - ONCE + SYSINIT = 1, + RESPAWN, + ASKFIRST, + WAIT, + ONCE } initActionEnum; /* And now a list of the actions we support in the version of init */ -typedef struct initActionType{ - const char* name; - initActionEnum action; +typedef struct initActionType { + const char *name; + initActionEnum action; } initActionType; static const struct initActionType actions[] = { - {"sysinit", SYSINIT}, - {"respawn", RESPAWN}, - {"askfirst", ASKFIRST}, - {"wait", WAIT}, - {"once", ONCE}, - {0} + {"sysinit", SYSINIT}, + {"respawn", RESPAWN}, + {"askfirst", ASKFIRST}, + {"wait", WAIT}, + {"once", ONCE}, + {0} }; /* Set up a linked list of initactions, to be read from inittab */ typedef struct initActionTag initAction; struct initActionTag { - pid_t pid; - char process[256]; - char console[256]; - initAction *nextPtr; - initActionEnum action; + pid_t pid; + char process[256]; + char console[256]; + initAction *nextPtr; + initActionEnum action; }; -initAction* initActionList = NULL; +initAction *initActionList = NULL; static char *secondConsole = VT_SECONDARY; @@ -119,517 +119,533 @@ static char console[32] = _PATH_CONSOLE; * device may be bitwise-or'd from LOG | CONSOLE */ void message(int device, char *fmt, ...) { - va_list arguments; - int fd; + va_list arguments; + int fd; #ifdef BB_SYSLOGD - /* Log the message to syslogd */ - if (device & LOG ) { - char msg[1024]; - va_start(arguments, fmt); - vsnprintf(msg, sizeof(msg), fmt, arguments); - va_end(arguments); - openlog( "init", 0, LOG_DAEMON); - syslog(LOG_DAEMON|LOG_NOTICE, msg); - closelog(); - } + /* Log the message to syslogd */ + if (device & LOG) { + char msg[1024]; + va_start(arguments, fmt); + vsnprintf(msg, sizeof(msg), fmt, arguments); + va_end(arguments); + openlog("init", 0, LOG_DAEMON); + syslog(LOG_DAEMON | LOG_NOTICE, msg); + closelog(); + } #else - static int log_fd = -1; - - /* Take full control of the log tty, and never close it. - * It's mine, all mine! Muhahahaha! */ - if (log_fd < 0) { - if (log == NULL) { - /* don't even try to log, because there is no such console */ - log_fd = -2; - /* log to main console instead */ - device = CONSOLE; - } - else if ((log_fd = device_open(log, O_RDWR|O_NDELAY)) < 0) { - log_fd = -1; - fprintf(stderr, "Bummer, can't write to log on %s!\r\n", log); - fflush(stderr); - return; + static int log_fd = -1; + + /* Take full control of the log tty, and never close it. + * It's mine, all mine! Muhahahaha! */ + if (log_fd < 0) { + if (log == NULL) { + /* don't even try to log, because there is no such console */ + log_fd = -2; + /* log to main console instead */ + device = CONSOLE; + } else if ((log_fd = device_open(log, O_RDWR | O_NDELAY)) < 0) { + log_fd = -1; + fprintf(stderr, "Bummer, can't write to log on %s!\r\n", log); + fflush(stderr); + return; + } + } + if ((device & LOG) && (log_fd >= 0)) { + va_start(arguments, fmt); + vdprintf(log_fd, fmt, arguments); + va_end(arguments); } - } - if ( (device & LOG) && (log_fd >= 0) ) { - va_start(arguments, fmt); - vdprintf(log_fd, fmt, arguments); - va_end(arguments); - } #endif - if (device & CONSOLE) { - /* Always send console messages to /dev/console so people will see them. */ - if ((fd = device_open(_PATH_CONSOLE, O_WRONLY|O_NOCTTY|O_NDELAY)) >= 0) { - va_start(arguments, fmt); - vdprintf(fd, fmt, arguments); - va_end(arguments); - close(fd); - } else { - fprintf(stderr, "Bummer, can't print: "); - va_start(arguments, fmt); - vfprintf(stderr, fmt, arguments); - fflush(stderr); - va_end(arguments); + if (device & CONSOLE) { + /* Always send console messages to /dev/console so people will see them. */ + if ( + (fd = + device_open(_PATH_CONSOLE, + O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0) { + va_start(arguments, fmt); + vdprintf(fd, fmt, arguments); + va_end(arguments); + close(fd); + } else { + fprintf(stderr, "Bummer, can't print: "); + va_start(arguments, fmt); + vfprintf(stderr, fmt, arguments); + fflush(stderr); + va_end(arguments); + } } - } } /* Set terminal settings to reasonable defaults */ -void set_term( int fd) +void set_term(int fd) { - struct termios tty; - static const char control_characters[] = { - '\003', '\034', '\177', '\025', '\004', '\0', - '\1', '\0', '\021', '\023', '\032', '\0', '\022', - '\017', '\027', '\026', '\0' + struct termios tty; + static const char control_characters[] = { + '\003', '\034', '\177', '\025', '\004', '\0', + '\1', '\0', '\021', '\023', '\032', '\0', '\022', + '\017', '\027', '\026', '\0' }; - tcgetattr(fd, &tty); + tcgetattr(fd, &tty); - /* set control chars */ - memcpy(tty.c_cc, control_characters, sizeof(control_characters)); + /* set control chars */ + memcpy(tty.c_cc, control_characters, sizeof(control_characters)); - /* use line dicipline 0 */ - tty.c_line = 0; + /* use line dicipline 0 */ + tty.c_line = 0; - /* Make it be sane */ - //tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD; - //tty.c_cflag |= HUPCL|CLOCAL; + /* Make it be sane */ + //tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD; + //tty.c_cflag |= HUPCL|CLOCAL; - /* input modes */ - tty.c_iflag = ICRNL|IXON|IXOFF; + /* input modes */ + tty.c_iflag = ICRNL | IXON | IXOFF; - /* output modes */ - tty.c_oflag = OPOST|ONLCR; + /* output modes */ + tty.c_oflag = OPOST | ONLCR; - /* local modes */ - tty.c_lflag = ISIG|ICANON|ECHO|ECHOE|ECHOK|ECHOCTL|ECHOKE|IEXTEN; + /* local modes */ + tty.c_lflag = + ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE | IEXTEN; - tcsetattr(fd, TCSANOW, &tty); + tcsetattr(fd, TCSANOW, &tty); } /* How much memory does this machine have? */ static int mem_total() { - char s[80]; - char *p = "/proc/meminfo"; - FILE *f; - const char pattern[] = "MemTotal:"; - - if ((f = fopen(p, "r")) < 0) { - message(LOG, "Error opening %s: %s\n", p, strerror( errno)); - return -1; - } - while (NULL != fgets(s, 79, f)) { - p = strstr(s, pattern); - if (NULL != p) { - fclose(f); - return (atoi(p + strlen(pattern))); + char s[80]; + char *p = "/proc/meminfo"; + FILE *f; + const char pattern[] = "MemTotal:"; + + if ((f = fopen(p, "r")) < 0) { + message(LOG, "Error opening %s: %s\n", p, strerror(errno)); + return -1; + } + while (NULL != fgets(s, 79, f)) { + p = strstr(s, pattern); + if (NULL != p) { + fclose(f); + return (atoi(p + strlen(pattern))); + } } - } - return -1; + return -1; } static void console_init() { - int fd; - int tried_devcons = 0; - int tried_vtprimary = 0; - struct serial_struct sr; - char *s; - - if ((s = getenv("TERM")) != NULL) { - snprintf(termType,sizeof(termType)-1,"TERM=%s",s); - } - - if ((s = getenv("CONSOLE")) != NULL) { - snprintf(console, sizeof(console)-1, "%s",s); - } -#if #cpu(sparc) - /* sparc kernel supports console=tty[ab] parameter which is also - * passed to init, so catch it here */ - else if ((s = getenv("console")) != NULL) { - /* remap tty[ab] to /dev/ttyS[01] */ - if (strcmp( s, "ttya" )==0) - snprintf(console, sizeof(console)-1, "%s", SERIAL_CON0); - else if (strcmp( s, "ttyb" )==0) - snprintf(console, sizeof(console)-1, "%s", SERIAL_CON1); - } -#endif - else { - struct vt_stat vt; + int fd; + int tried_devcons = 0; + int tried_vtprimary = 0; + struct serial_struct sr; + char *s; + + if ((s = getenv("TERM")) != NULL) { + snprintf(termType, sizeof(termType) - 1, "TERM=%s", s); + } - /* 2.2 kernels: identify the real console backend and try to use it */ - if (ioctl(0, TIOCGSERIAL, &sr) == 0) { - /* this is a serial console */ - snprintf(console, sizeof(console)-1, "/dev/ttyS%d", sr.line); + if ((s = getenv("CONSOLE")) != NULL) { + snprintf(console, sizeof(console) - 1, "%s", s); } - else if (ioctl(0, VT_GETSTATE, &vt) == 0) { - /* this is linux virtual tty */ - snprintf(console, sizeof(console)-1, "/dev/tty%d", vt.v_active); - } else { - snprintf(console, sizeof(console)-1, "%s", _PATH_CONSOLE); - tried_devcons++; +#if #cpu(sparc) + /* sparc kernel supports console=tty[ab] parameter which is also + * passed to init, so catch it here */ + else if ((s = getenv("console")) != NULL) { + /* remap tty[ab] to /dev/ttyS[01] */ + if (strcmp(s, "ttya") == 0) + snprintf(console, sizeof(console) - 1, "%s", SERIAL_CON0); + else if (strcmp(s, "ttyb") == 0) + snprintf(console, sizeof(console) - 1, "%s", SERIAL_CON1); } - } - - while ((fd = open(console, O_RDONLY | O_NONBLOCK)) < 0) { - /* Can't open selected console -- try /dev/console */ - if (!tried_devcons) { - tried_devcons++; - snprintf(console, sizeof(console)-1, "%s", _PATH_CONSOLE); - continue; +#endif + else { + struct vt_stat vt; + + /* 2.2 kernels: identify the real console backend and try to use it */ + if (ioctl(0, TIOCGSERIAL, &sr) == 0) { + /* this is a serial console */ + snprintf(console, sizeof(console) - 1, "/dev/ttyS%d", sr.line); + } else if (ioctl(0, VT_GETSTATE, &vt) == 0) { + /* this is linux virtual tty */ + snprintf(console, sizeof(console) - 1, "/dev/tty%d", + vt.v_active); + } else { + snprintf(console, sizeof(console) - 1, "%s", _PATH_CONSOLE); + tried_devcons++; + } } - /* Can't open selected console -- try vt1 */ - if (!tried_vtprimary) { - tried_vtprimary++; - snprintf(console, sizeof(console)-1, "%s", VT_PRIMARY); - continue; + + while ((fd = open(console, O_RDONLY | O_NONBLOCK)) < 0) { + /* Can't open selected console -- try /dev/console */ + if (!tried_devcons) { + tried_devcons++; + snprintf(console, sizeof(console) - 1, "%s", _PATH_CONSOLE); + continue; + } + /* Can't open selected console -- try vt1 */ + if (!tried_vtprimary) { + tried_vtprimary++; + snprintf(console, sizeof(console) - 1, "%s", VT_PRIMARY); + continue; + } + break; } - break; - } - if (fd < 0) { - /* Perhaps we should panic here? */ - snprintf(console, sizeof(console)-1, "/dev/null"); - } else { - /* check for serial console and disable logging to tty3 & running a - * shell to tty2 */ - if (ioctl(0,TIOCGSERIAL,&sr) == 0) { - message(LOG|CONSOLE, "serial console detected. Disabling virtual terminals.\r\n" ); - log = NULL; - secondConsole = NULL; + if (fd < 0) { + /* Perhaps we should panic here? */ + snprintf(console, sizeof(console) - 1, "/dev/null"); + } else { + /* check for serial console and disable logging to tty3 & running a + * shell to tty2 */ + if (ioctl(0, TIOCGSERIAL, &sr) == 0) { + message(LOG | CONSOLE, + "serial console detected. Disabling virtual terminals.\r\n"); + log = NULL; + secondConsole = NULL; + } + close(fd); } - close(fd); - } - message(LOG, "console=%s\n", console ); + message(LOG, "console=%s\n", console); } -static pid_t run(char* command, - char *terminal, int get_enter) +static pid_t run(char *command, char *terminal, int get_enter) { - int i, fd; - pid_t pid; - char* tmpCmd; - char* cmd[255]; - static const char press_enter[] = - "\nPlease press Enter to activate this console. "; - char* environment[] = { - "HOME=/", - "PATH=/usr/bin:/bin:/usr/sbin:/sbin", - "SHELL=/bin/sh", - termType, - "USER=root", - 0 - }; - - - if ((pid = fork()) == 0) { - pid_t shell_pgid = getpid (); - - /* Clean up */ - close(0); - close(1); - close(2); - setsid(); + int i, fd; + pid_t pid; + char *tmpCmd; + char *cmd[255]; + static const char press_enter[] = + + "\nPlease press Enter to activate this console. "; + char *environment[] = { + "HOME=/", + "PATH=/usr/bin:/bin:/usr/sbin:/sbin", + "SHELL=/bin/sh", + termType, + "USER=root", + 0 + }; - /* Reset signal handlers set for parent process */ - signal(SIGUSR1, SIG_DFL); - signal(SIGUSR2, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGHUP, SIG_DFL); - if ((fd = device_open(terminal, O_RDWR)) < 0) { - message(LOG|CONSOLE, "Bummer, can't open %s\r\n", terminal); - exit(1); - } - dup2(fd, 0); - dup2(fd, 1); - dup2(fd, 2); - tcsetpgrp (0, getpgrp()); - set_term(0); + if ((pid = fork()) == 0) { + pid_t shell_pgid = getpid(); - if (get_enter==TRUE) { - /* - * Save memory by not exec-ing anything large (like a shell) - * before the user wants it. This is critical if swap is not - * enabled and the system has low memory. Generally this will - * be run on the second virtual console, and the first will - * be allowed to start a shell or whatever an init script - * specifies. - */ - char c; - message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n", - command, shell_pgid, terminal ); - write(fileno(stdout), press_enter, sizeof(press_enter) - 1); - read(fileno(stdin), &c, 1); - } + /* Clean up */ + close(0); + close(1); + close(2); + setsid(); + + /* Reset signal handlers set for parent process */ + signal(SIGUSR1, SIG_DFL); + signal(SIGUSR2, SIG_DFL); + signal(SIGINT, SIG_DFL); + signal(SIGTERM, SIG_DFL); + signal(SIGHUP, SIG_DFL); + + if ((fd = device_open(terminal, O_RDWR)) < 0) { + message(LOG | CONSOLE, "Bummer, can't open %s\r\n", terminal); + exit(1); + } + dup2(fd, 0); + dup2(fd, 1); + dup2(fd, 2); + tcsetpgrp(0, getpgrp()); + set_term(0); + + if (get_enter == TRUE) { + /* + * Save memory by not exec-ing anything large (like a shell) + * before the user wants it. This is critical if swap is not + * enabled and the system has low memory. Generally this will + * be run on the second virtual console, and the first will + * be allowed to start a shell or whatever an init script + * specifies. + */ + char c; + + message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n", + command, shell_pgid, terminal); + write(fileno(stdout), press_enter, sizeof(press_enter) - 1); + read(fileno(stdin), &c, 1); + } - /* Log the process name and args */ - message(LOG, "Starting pid %d, console %s: '", - shell_pgid, terminal, command); - - /* Convert command (char*) into cmd (char**, one word per string) */ - for (tmpCmd=command, i=0; (tmpCmd=strsep(&command, " \t")) != NULL;) { - if (*tmpCmd != '\0') { - cmd[i] = tmpCmd; - message(LOG, "%s ", tmpCmd); - tmpCmd++; - i++; - } + /* Log the process name and args */ + message(LOG, "Starting pid %d, console %s: '", + shell_pgid, terminal, command); + + /* Convert command (char*) into cmd (char**, one word per string) */ + for (tmpCmd = command, i = 0; + (tmpCmd = strsep(&command, " \t")) != NULL;) { + if (*tmpCmd != '\0') { + cmd[i] = tmpCmd; +#ifdef DEBUG_INIT + message(LOG, "%s ", tmpCmd); +#endif + tmpCmd++; + i++; + } + } + cmd[i] = NULL; + message(LOG, "'\r\n"); + + /* Now run it. The new program will take over this PID, + * so nothing further in init.c should be run. */ + execve(cmd[0], cmd, environment); + + /* We're still here? Some error happened. */ + message(LOG | CONSOLE, "Bummer, could not run '%s': %s\n", cmd[0], + strerror(errno)); + exit(-1); } - cmd[i] = NULL; - message(LOG, "'\r\n"); - - /* Now run it. The new program will take over this PID, - * so nothing further in init.c should be run. */ - execve(cmd[0], cmd, environment); - - /* We're still here? Some error happened. */ - message(LOG|CONSOLE, "Bummer, could not run '%s': %s\n", cmd[0], - strerror(errno)); - exit(-1); - } - return pid; + return pid; } -static int waitfor(char* command, - char *terminal, int get_enter) +static int waitfor(char *command, char *terminal, int get_enter) { - int status, wpid; - int pid = run( command, terminal, get_enter); - - while (1) { - wpid = wait(&status); - if (wpid > 0 ) { - message(LOG, "Process '%s' (pid %d) exited.\n", - command, wpid); - break; + int status, wpid; + int pid = run(command, terminal, get_enter); + + while (1) { + wpid = wait(&status); + if (wpid > 0) { + message(LOG, "Process '%s' (pid %d) exited.\n", command, wpid); + break; + } + if (wpid == pid) + break; } - if (wpid == pid ) - break; - } - return wpid; + return wpid; } /* Make sure there is enough memory to do something useful. * * Calls swapon if needed so be sure /proc is mounted. */ static void check_memory() { - struct stat statBuf; - - if (mem_total() > 3500) + struct stat statBuf; + + if (mem_total() > 3500) + return; + + if (stat("/etc/fstab", &statBuf) == 0) { + /* Try to turn on swap */ + waitfor("/bin/swapon swapon -a", log, FALSE); + if (mem_total() < 3500) + goto goodnight; + } else + goto goodnight; return; - if (stat("/etc/fstab", &statBuf) == 0) { - /* Try to turn on swap */ - waitfor("/bin/swapon swapon -a", log, FALSE); - if (mem_total() < 3500) - goto goodnight; - } else - goto goodnight; - return; - -goodnight: - message(CONSOLE, "Sorry, your computer does not have enough memory.\r\n"); - while (1) sleep(1); + goodnight: + message(CONSOLE, + "Sorry, your computer does not have enough memory.\r\n"); + while (1) + sleep(1); } #ifndef DEBUG_INIT static void shutdown_system(void) { - /* first disable our SIGHUP signal */ - signal(SIGHUP, SIG_DFL); - - /* Allow Ctrl-Alt-Del to reboot system. */ - reboot(RB_ENABLE_CAD); - message(CONSOLE, "\r\nThe system is going down NOW !!\r\n"); - sync(); - - /* Send signals to every process _except_ pid 1 */ - message(CONSOLE, "Sending SIGTERM to all processes.\r\n"); - kill(-1, SIGTERM); - sleep(5); - sync(); - - message(CONSOLE, "Sending SIGKILL to all processes.\r\n"); - kill(-1, SIGKILL); - sleep(5); - - message(CONSOLE, "Disabling swap.\r\n"); - waitfor( "swapoff -a", console, FALSE); - message(CONSOLE, "Unmounting filesystems.\r\n"); + /* first disable our SIGHUP signal */ + signal(SIGHUP, SIG_DFL); + + /* Allow Ctrl-Alt-Del to reboot system. */ + reboot(RB_ENABLE_CAD); + message(CONSOLE, "\r\nThe system is going down NOW !!\r\n"); + sync(); + + /* Send signals to every process _except_ pid 1 */ + message(CONSOLE, "Sending SIGTERM to all processes.\r\n"); + kill(-1, SIGTERM); + sleep(5); + sync(); + + message(CONSOLE, "Sending SIGKILL to all processes.\r\n"); + kill(-1, SIGKILL); + sleep(5); + + message(CONSOLE, "Disabling swap.\r\n"); + waitfor("swapoff -a", console, FALSE); + message(CONSOLE, "Unmounting filesystems.\r\n"); waitfor("umount -a -r", console, FALSE); - sync(); - if (kernelVersion > 0 && kernelVersion <= 2 * 65536 + 2 * 256 + 11) { - /* bdflush, kupdate not needed for kernels >2.2.11 */ - bdflush(1, 0); sync(); - } + if (kernelVersion > 0 && kernelVersion <= 2 * 65536 + 2 * 256 + 11) { + /* bdflush, kupdate not needed for kernels >2.2.11 */ + bdflush(1, 0); + sync(); + } } static void halt_signal(int sig) { - shutdown_system(); - message(CONSOLE, "The system is halted. Press %s or turn off power\r\n", - (secondConsole == NULL) /* serial console */ - ? "Reset" : "CTRL-ALT-DEL"); - sync(); + shutdown_system(); + message(CONSOLE, + "The system is halted. Press %s or turn off power\r\n", + (secondConsole == NULL) /* serial console */ + ? "Reset" : "CTRL-ALT-DEL"); + sync(); - /* allow time for last message to reach serial console */ - sleep(5); + /* allow time for last message to reach serial console */ + sleep(5); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) - if (sig == SIGUSR2) - reboot(RB_POWER_OFF); - else + if (sig == SIGUSR2) + reboot(RB_POWER_OFF); + else #endif - reboot(RB_HALT_SYSTEM); - exit(0); + reboot(RB_HALT_SYSTEM); + exit(0); } static void reboot_signal(int sig) { - shutdown_system(); - message(CONSOLE, "Please stand by while rebooting the system.\r\n"); - sync(); + shutdown_system(); + message(CONSOLE, "Please stand by while rebooting the system.\r\n"); + sync(); - /* allow time for last message to reach serial console */ - sleep(2); + /* allow time for last message to reach serial console */ + sleep(2); - reboot(RB_AUTOBOOT); - exit(0); + reboot(RB_AUTOBOOT); + exit(0); } #if defined BB_FEATURE_INIT_CHROOT static void check_chroot(int sig) { - char *argv_init[2] = { "init", NULL, }; - char *envp_init[3] = { "HOME=/", "TERM=linux", NULL, }; - char rootpath[256], *tc; - int fd; + char *argv_init[2] = { "init", NULL, }; + char *envp_init[3] = { "HOME=/", "TERM=linux", NULL, }; + char rootpath[256], *tc; + int fd; + + if ((fd = open("/proc/sys/kernel/init-chroot", O_RDONLY)) == -1) { + message(CONSOLE, + "SIGHUP recived, but could not open proc file\r\n"); + sleep(2); + return; + } + if (read(fd, rootpath, sizeof(rootpath)) == -1) { + message(CONSOLE, + "SIGHUP recived, but could not read proc file\r\n"); + sleep(2); + return; + } + close(fd); - if ((fd = open("/proc/sys/kernel/init-chroot", O_RDONLY)) == -1) { - message(CONSOLE, "SIGHUP recived, but could not open proc file\r\n"); - sleep(2); - return; - } - if (read(fd, rootpath, sizeof(rootpath)) == -1) { - message(CONSOLE, "SIGHUP recived, but could not read proc file\r\n"); + if (rootpath[0] == '\0') { + message(CONSOLE, + "SIGHUP recived, but new root is not valid: %s\r\n", + rootpath); + sleep(2); + return; + } + + tc = strrchr(rootpath, '\n'); + *tc = '\0'; + + /* Ok, making it this far means we commit */ + message(CONSOLE, "Please stand by, changing root to `%s'.\r\n", + rootpath); + + /* kill all other programs first */ + message(CONSOLE, "Sending SIGTERM to all processes.\r\n"); + kill(-1, SIGTERM); sleep(2); - return; - } - close(fd); + sync(); - if (rootpath[0] == '\0') { - message(CONSOLE, "SIGHUP recived, but new root is not valid: %s\r\n", - rootpath); + message(CONSOLE, "Sending SIGKILL to all processes.\r\n"); + kill(-1, SIGKILL); sleep(2); + sync(); + + /* ok, we don't need /proc anymore. we also assume that the signaling + * process left the rest of the filesystems alone for us */ + umount("/proc"); + + /* Ok, now we chroot. Hopefully we only have two things mounted, the + * new chroot'd mount point, and the old "/" mount. s, + * we go ahead and unmount the old "/". This should trigger the kernel + * to set things up the Right Way(tm). */ + + if (!chroot(rootpath)) + umount("/dev/root"); + + /* If the chroot fails, we are already too far to turn back, so we + * continue and hope that executing init below will revive the system */ + + /* close all of our descriptors and open new ones */ + close(0); + close(1); + close(2); + open("/dev/console", O_RDWR, 0); + dup(0); + dup(0); + + message(CONSOLE, "Executing real init...\r\n"); + /* execute init in the (hopefully) new root */ + execve("/sbin/init", argv_init, envp_init); + + message(CONSOLE, + "ERROR: Could not exec new init. Press %s to reboot.\r\n", + (secondConsole == NULL) /* serial console */ + ? "Reset" : "CTRL-ALT-DEL"); return; - } - - tc = strrchr(rootpath, '\n'); - *tc = '\0'; - - /* Ok, making it this far means we commit */ - message(CONSOLE, "Please stand by, changing root to `%s'.\r\n", rootpath); - - /* kill all other programs first */ - message(CONSOLE, "Sending SIGTERM to all processes.\r\n"); - kill(-1, SIGTERM); - sleep(2); - sync(); - - message(CONSOLE, "Sending SIGKILL to all processes.\r\n"); - kill(-1, SIGKILL); - sleep(2); - sync(); - - /* ok, we don't need /proc anymore. we also assume that the signaling - * process left the rest of the filesystems alone for us */ - umount("/proc"); - - /* Ok, now we chroot. Hopefully we only have two things mounted, the - * new chroot'd mount point, and the old "/" mount. s, - * we go ahead and unmount the old "/". This should trigger the kernel - * to set things up the Right Way(tm). */ - - if (!chroot(rootpath)) - umount("/dev/root"); - - /* If the chroot fails, we are already too far to turn back, so we - * continue and hope that executing init below will revive the system */ - - /* close all of our descriptors and open new ones */ - close(0); - close(1); - close(2); - open("/dev/console", O_RDWR, 0); - dup(0); - dup(0); - - message(CONSOLE, "Executing real init...\r\n"); - /* execute init in the (hopefully) new root */ - execve("/sbin/init",argv_init,envp_init); - - message(CONSOLE, "ERROR: Could not exec new init. Press %s to reboot.\r\n", - (secondConsole == NULL) /* serial console */ - ? "Reset" : "CTRL-ALT-DEL"); - return; -} -#endif /* BB_FEATURE_INIT_CHROOT */ - -#endif /* ! DEBUG_INIT */ - -void new_initAction (initActionEnum action, - char* process, char* cons) -{ - initAction* newAction; - - if (*cons == '\0') - cons = console; - - /* If BusyBox detects that a serial console is in use, - * then entries not refering to the console or null devices will _not_ be run. - * The exception to this rule is the null device. - */ - if (secondConsole == NULL && strcmp(cons, console) && strcmp(cons, "/dev/null")) - return; +} +#endif /* BB_FEATURE_INIT_CHROOT */ - newAction = calloc ((size_t)(1), sizeof(initAction)); - if (!newAction) { - message(LOG|CONSOLE,"Memory allocation failure\n"); - while (1) sleep(1); - } - newAction->nextPtr = initActionList; - initActionList = newAction; - strncpy( newAction->process, process, 255); - newAction->action = action; - strncpy(newAction->console, cons, 255); - newAction->pid = 0; +#endif /* ! DEBUG_INIT */ + +void new_initAction(initActionEnum action, char *process, char *cons) +{ + initAction *newAction; + + if (*cons == '\0') + cons = console; + + /* If BusyBox detects that a serial console is in use, + * then entries not refering to the console or null devices will _not_ be run. + * The exception to this rule is the null device. + */ + if (secondConsole == NULL && strcmp(cons, console) + && strcmp(cons, "/dev/null")) + return; + + newAction = calloc((size_t) (1), sizeof(initAction)); + if (!newAction) { + message(LOG | CONSOLE, "Memory allocation failure\n"); + while (1) + sleep(1); + } + newAction->nextPtr = initActionList; + initActionList = newAction; + strncpy(newAction->process, process, 255); + newAction->action = action; + strncpy(newAction->console, cons, 255); + newAction->pid = 0; // message(LOG|CONSOLE, "process='%s' action='%d' console='%s'\n", -// newAction->process, newAction->action, newAction->console); +// newAction->process, newAction->action, newAction->console); } -void delete_initAction (initAction *action) +void delete_initAction(initAction * action) { - initAction *a, *b=NULL; - for( a=initActionList ; a ; b=a, a=a->nextPtr) { - if (a == action) { - if (b==NULL) { - initActionList=a->nextPtr; - } else { - b->nextPtr=a->nextPtr; - } - free( a); - break; + initAction *a, *b = NULL; + + for (a = initActionList; a; b = a, a = a->nextPtr) { + if (a == action) { + if (b == NULL) { + initActionList = a->nextPtr; + } else { + b->nextPtr = a->nextPtr; + } + free(a); + break; + } } - } } /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined, @@ -639,253 +655,258 @@ void delete_initAction (initAction *action) * _is_ defined, but /etc/inittab is missing, this * results in the same set of default behaviors. * */ -void parse_inittab(void) +void parse_inittab(void) { #ifdef BB_FEATURE_USE_INITTAB - FILE* file; - char buf[256], lineAsRead[256], tmpConsole[256]; - char *p, *q, *r, *s; - const struct initActionType *a = actions; - int foundIt; + FILE *file; + char buf[256], lineAsRead[256], tmpConsole[256]; + char *p, *q, *r, *s; + const struct initActionType *a = actions; + int foundIt; - file = fopen(INITTAB, "r"); - if (file == NULL) { - /* No inittab file -- set up some default behavior */ + file = fopen(INITTAB, "r"); + if (file == NULL) { + /* No inittab file -- set up some default behavior */ #endif - /* Askfirst shell on tty1 */ - new_initAction( ASKFIRST, SHELL, console ); - /* Askfirst shell on tty2 */ - if (secondConsole != NULL) - new_initAction( ASKFIRST, SHELL, secondConsole ); - /* sysinit */ - new_initAction( SYSINIT, INIT_SCRIPT, console ); - - return; + /* Askfirst shell on tty1 */ + new_initAction(ASKFIRST, SHELL, console); + /* Askfirst shell on tty2 */ + if (secondConsole != NULL) + new_initAction(ASKFIRST, SHELL, secondConsole); + /* sysinit */ + new_initAction(SYSINIT, INIT_SCRIPT, console); + + return; #ifdef BB_FEATURE_USE_INITTAB - } - - while ( fgets(buf, 255, file) != NULL) { - foundIt=FALSE; - for(p = buf; *p == ' ' || *p == '\t'; p++); - if (*p == '#' || *p == '\n') continue; - - /* Trim the trailing \n */ - q = strrchr( p, '\n'); - if (q != NULL) - *q='\0'; - - /* Keep a copy around for posterity's sake (and error msgs) */ - strcpy(lineAsRead, buf); - - /* Grab the ID field */ - s=p; - p = strchr( p, ':'); - if ( p != NULL || *(p+1) != '\0' ) { - *p='\0'; - ++p; } - /* Now peal off the process field from the end - * of the string */ - q = strrchr( p, ':'); - if ( q == NULL || *(q+1) == '\0' ) { - message(LOG|CONSOLE,"Bad inittab entry: %s\n", lineAsRead); - continue; - } else { - *q='\0'; - ++q; - } + while (fgets(buf, 255, file) != NULL) { + foundIt = FALSE; + for (p = buf; *p == ' ' || *p == '\t'; p++); + if (*p == '#' || *p == '\n') + continue; + + /* Trim the trailing \n */ + q = strrchr(p, '\n'); + if (q != NULL) + *q = '\0'; + + /* Keep a copy around for posterity's sake (and error msgs) */ + strcpy(lineAsRead, buf); + + /* Grab the ID field */ + s = p; + p = strchr(p, ':'); + if (p != NULL || *(p + 1) != '\0') { + *p = '\0'; + ++p; + } - /* Now peal off the action field */ - r = strrchr( p, ':'); - if ( r == NULL || *(r+1) == '\0') { - message(LOG|CONSOLE,"Bad inittab entry: %s\n", lineAsRead); - continue; - } else { - ++r; - } + /* Now peal off the process field from the end + * of the string */ + q = strrchr(p, ':'); + if (q == NULL || *(q + 1) == '\0') { + message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead); + continue; + } else { + *q = '\0'; + ++q; + } - /* Ok, now process it */ - a = actions; - while (a->name != 0) { - if (strcmp(a->name, r) == 0) { - if (*s != '\0') { - struct stat statBuf; - strcpy(tmpConsole, "/dev/"); - strncat(tmpConsole, s, 200); - if (stat(tmpConsole, &statBuf) != 0) { - message(LOG|CONSOLE, "device '%s' does not exist. Did you read the directions?\n", tmpConsole); - break; - } - s = tmpConsole; + /* Now peal off the action field */ + r = strrchr(p, ':'); + if (r == NULL || *(r + 1) == '\0') { + message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead); + continue; + } else { + ++r; + } + + /* Ok, now process it */ + a = actions; + while (a->name != 0) { + if (strcmp(a->name, r) == 0) { + if (*s != '\0') { + struct stat statBuf; + + strcpy(tmpConsole, "/dev/"); + strncat(tmpConsole, s, 200); + if (stat(tmpConsole, &statBuf) != 0) { + message(LOG | CONSOLE, + "device '%s' does not exist. Did you read the directions?\n", + tmpConsole); + break; + } + s = tmpConsole; + } + new_initAction(a->action, q, s); + foundIt = TRUE; + } + a++; + } + if (foundIt == TRUE) + continue; + else { + /* Choke on an unknown action */ + message(LOG | CONSOLE, "Bad inittab entry: %s\n", lineAsRead); } - new_initAction( a->action, q, s); - foundIt=TRUE; - } - a++; - } - if (foundIt==TRUE) - continue; - else { - /* Choke on an unknown action */ - message(LOG|CONSOLE, "Bad inittab entry: %s\n", lineAsRead); } - } - return; + return; #endif } extern int init_main(int argc, char **argv) { - initAction *a; - pid_t wpid; - int status; + initAction *a; + pid_t wpid; + int status; #ifndef DEBUG_INIT - /* Expect to be PID 1 if we are run as init (not linuxrc) */ - if (getpid() != 1 && strstr(argv[0], "init")!=NULL ) { - usage( "init\n\nInit is the parent of all processes.\n\n" - "This version of init is designed to be run only by the kernel\n"); - } - /* Fix up argv[0] to be certain we claim to be init */ - strncpy(argv[0], "init", strlen(argv[0])); - - /* Set up sig handlers -- be sure to - * clear all of these in run() */ - signal(SIGUSR1, halt_signal); - signal(SIGUSR2, reboot_signal); - signal(SIGINT, reboot_signal); - signal(SIGTERM, reboot_signal); + /* Expect to be PID 1 if we are run as init (not linuxrc) */ + if (getpid() != 1 && strstr(argv[0], "init") != NULL) { + usage("init\n\nInit is the parent of all processes.\n\n" + "This version of init is designed to be run only by the kernel\n"); + } + /* Fix up argv[0] to be certain we claim to be init */ + strncpy(argv[0], "init", strlen(argv[0])); + + /* Set up sig handlers -- be sure to + * clear all of these in run() */ + signal(SIGUSR1, halt_signal); + signal(SIGUSR2, reboot_signal); + signal(SIGINT, reboot_signal); + signal(SIGTERM, reboot_signal); #if defined BB_FEATURE_INIT_CHROOT - signal(SIGHUP, check_chroot); + signal(SIGHUP, check_chroot); #endif - /* Turn off rebooting via CTL-ALT-DEL -- we get a - * SIGINT on CAD so we can shut things down gracefully... */ - reboot(RB_DISABLE_CAD); -#endif + /* Turn off rebooting via CTL-ALT-DEL -- we get a + * SIGINT on CAD so we can shut things down gracefully... */ + reboot(RB_DISABLE_CAD); +#endif - /* Figure out where the default console should be */ - console_init(); + /* Figure out where the default console should be */ + console_init(); - /* Close whatever files are open, and reset the console. */ - close(0); - close(1); - close(2); - set_term(0); - setsid(); + /* Close whatever files are open, and reset the console. */ + close(0); + close(1); + close(2); + set_term(0); + setsid(); - /* Make sure PATH is set to something sane */ - putenv(_PATH_STDPATH); + /* Make sure PATH is set to something sane */ + putenv(_PATH_STDPATH); - /* Hello world */ + /* Hello world */ #ifndef DEBUG_INIT - message(LOG|CONSOLE, - "init started: BusyBox v%s (%s) multi-call binary\r\n", - BB_VER, BB_BT); + message(LOG | CONSOLE, + "init started: BusyBox v%s (%s) multi-call binary\r\n", + BB_VER, BB_BT); #else - message(LOG|CONSOLE, - "init(%d) started: BusyBox v%s (%s) multi-call binary\r\n", - getpid(), BB_VER, BB_BT); + message(LOG | CONSOLE, + "init(%d) started: BusyBox v%s (%s) multi-call binary\r\n", + getpid(), BB_VER, BB_BT); #endif - - /* Mount /proc */ - if (mount ("proc", "/proc", "proc", 0, 0) == 0) { - message(LOG|CONSOLE, "Mounting /proc: done.\n"); - kernelVersion = get_kernel_revision(); - } else - message(LOG|CONSOLE, "Mounting /proc: failed!\n"); - - /* Make sure there is enough memory to do something useful. */ - check_memory(); - - /* Check if we are supposed to be in single user mode */ - if ( argc > 1 && (!strcmp(argv[1], "single") || - !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) - { - /* Ask first then start a shell on tty2 */ - if (secondConsole != NULL) - new_initAction( ASKFIRST, SHELL, secondConsole); - /* Start a shell on tty1 */ - new_initAction( RESPAWN, SHELL, console); - } else { - /* Not in single user mode -- see what inittab says */ - - /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined, - * then parse_inittab() simply adds in some default - * actions(i.e runs INIT_SCRIPT and then starts a pair - * of "askfirst" shells */ - parse_inittab(); - } - - /* Now run everything that needs to be run */ - - /* First run the sysinit command */ - for( a=initActionList ; a; a=a->nextPtr) { - if (a->action == SYSINIT) { - waitfor(a->process, a->console, FALSE); - /* Now remove the "sysinit" entry from the list */ - delete_initAction( a); + + /* Mount /proc */ + if (mount("proc", "/proc", "proc", 0, 0) == 0) { + message(LOG | CONSOLE, "Mounting /proc: done.\n"); + kernelVersion = get_kernel_revision(); + } else + message(LOG | CONSOLE, "Mounting /proc: failed!\n"); + + /* Make sure there is enough memory to do something useful. */ + check_memory(); + + /* Check if we are supposed to be in single user mode */ + if (argc > 1 && (!strcmp(argv[1], "single") || + !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) { + /* Ask first then start a shell on tty2 */ + if (secondConsole != NULL) + new_initAction(ASKFIRST, SHELL, secondConsole); + /* Start a shell on tty1 */ + new_initAction(RESPAWN, SHELL, console); + } else { + /* Not in single user mode -- see what inittab says */ + + /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined, + * then parse_inittab() simply adds in some default + * actions(i.e runs INIT_SCRIPT and then starts a pair + * of "askfirst" shells */ + parse_inittab(); } - } - /* Next run anything that wants to block */ - for( a=initActionList ; a; a=a->nextPtr) { - if (a->action == WAIT) { - waitfor(a->process, a->console, FALSE); - /* Now remove the "wait" entry from the list */ - delete_initAction( a); + + /* Now run everything that needs to be run */ + + /* First run the sysinit command */ + for (a = initActionList; a; a = a->nextPtr) { + if (a->action == SYSINIT) { + waitfor(a->process, a->console, FALSE); + /* Now remove the "sysinit" entry from the list */ + delete_initAction(a); + } } - } - /* Next run anything to be run only once */ - for( a=initActionList ; a; a=a->nextPtr) { - if (a->action == ONCE) { - run(a->process, a->console, FALSE); - /* Now remove the "once" entry from the list */ - delete_initAction( a); + /* Next run anything that wants to block */ + for (a = initActionList; a; a = a->nextPtr) { + if (a->action == WAIT) { + waitfor(a->process, a->console, FALSE); + /* Now remove the "wait" entry from the list */ + delete_initAction(a); + } } - } - /* If there is nothing else to do, stop */ - if (initActionList == NULL) { - message(LOG|CONSOLE, "No more tasks for init -- sleeping forever.\n"); - while (1) sleep(1); - } - - /* Now run the looping stuff for the rest of forever */ - while (1) { - for( a=initActionList ; a; a=a->nextPtr) { - /* Only run stuff with pid==0. If they have - * a pid, that means they are still running */ - if (a->pid == 0) { - switch(a->action) { - case RESPAWN: - /* run the respawn stuff */ - a->pid = run(a->process, a->console, FALSE); - break; - case ASKFIRST: - /* run the askfirst stuff */ - a->pid = run(a->process, a->console, TRUE); - break; - /* silence the compiler's incessant whining */ - default: - break; + /* Next run anything to be run only once */ + for (a = initActionList; a; a = a->nextPtr) { + if (a->action == ONCE) { + run(a->process, a->console, FALSE); + /* Now remove the "once" entry from the list */ + delete_initAction(a); } - } } - /* Wait for a child process to exit */ - wpid = wait(&status); - if (wpid > 0 ) { - /* Find out who died and clean up their corpse */ - for( a=initActionList ; a; a=a->nextPtr) { - if (a->pid==wpid) { - a->pid=0; - message(LOG, "Process '%s' (pid %d) exited. Scheduling it for restart.\n", - a->process, wpid); + /* If there is nothing else to do, stop */ + if (initActionList == NULL) { + message(LOG | CONSOLE, + "No more tasks for init -- sleeping forever.\n"); + while (1) + sleep(1); + } + + /* Now run the looping stuff for the rest of forever */ + while (1) { + for (a = initActionList; a; a = a->nextPtr) { + /* Only run stuff with pid==0. If they have + * a pid, that means they are still running */ + if (a->pid == 0) { + switch (a->action) { + case RESPAWN: + /* run the respawn stuff */ + a->pid = run(a->process, a->console, FALSE); + break; + case ASKFIRST: + /* run the askfirst stuff */ + a->pid = run(a->process, a->console, TRUE); + break; + /* silence the compiler's incessant whining */ + default: + break; + } + } + } + /* Wait for a child process to exit */ + wpid = wait(&status); + if (wpid > 0) { + /* Find out who died and clean up their corpse */ + for (a = initActionList; a; a = a->nextPtr) { + if (a->pid == wpid) { + a->pid = 0; + message(LOG, + "Process '%s' (pid %d) exited. Scheduling it for restart.\n", + a->process, wpid); + } + } } - } + sleep(1); } - sleep(1); - } } - diff --git a/init/poweroff.c b/init/poweroff.c index 405ca3fe2..7f9abf14a 100644 --- a/init/poweroff.c +++ b/init/poweroff.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini poweroff implementation for busybox * @@ -23,9 +24,8 @@ #include "internal.h" #include <signal.h> -extern int -poweroff_main(int argc, char ** argv) +extern int poweroff_main(int argc, char **argv) { - /* don't assume init's pid == 1 */ - exit( kill(findInitPid(), SIGUSR2)); + /* don't assume init's pid == 1 */ + exit(kill(findInitPid(), SIGUSR2)); } diff --git a/init/reboot.c b/init/reboot.c index 1339a60f4..ef2a848ee 100644 --- a/init/reboot.c +++ b/init/reboot.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini reboot implementation for busybox * @@ -23,9 +24,8 @@ #include "internal.h" #include <signal.h> -extern int -reboot_main(int argc, char ** argv) +extern int reboot_main(int argc, char **argv) { - /* don't assume init's pid == 1 */ - exit( kill(findInitPid(), SIGINT)); + /* don't assume init's pid == 1 */ + exit(kill(findInitPid(), SIGINT)); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini insmod implementation for busybox * @@ -41,8 +42,7 @@ /* Some firendly syscalls to cheer everyone's day... */ _syscall2(int, init_module, const char *, name, - const struct module *, info) - + const struct module *, info) #ifndef BB_RMMOD _syscall1(int, delete_module, const char *, name) #else @@ -52,155 +52,159 @@ extern int delete_module(const char *); #if defined(__i386__) || defined(__m68k__) || defined(__arm__) /* Jump through hoops to fixup error return codes */ #define __NR__create_module __NR_create_module -static inline _syscall2(long, _create_module, const char *, name, size_t, size) +static inline _syscall2(long, _create_module, const char *, name, size_t, + size) unsigned long create_module(const char *name, size_t size) { - long ret = _create_module(name, size); - if (ret == -1 && errno > 125) { - ret = -errno; - errno = 0; - } - return ret; + long ret = _create_module(name, size); + + if (ret == -1 && errno > 125) { + ret = -errno; + errno = 0; + } + return ret; } #else _syscall2(unsigned long, create_module, const char *, name, size_t, size) #endif - - static char m_filename[PATH_MAX + 1] = "\0"; static char m_fullName[PATH_MAX + 1] = "\0"; static const char insmod_usage[] = - "insmod [OPTION]... MODULE [symbol=value]...\n\n" - "Loads the specified kernel modules into the kernel.\n\n" - "Options:\n" - "\t-f\tForce module to load into the wrong kernel version.\n" - "\t-k\tMake module autoclean-able.\n"; + "insmod [OPTION]... MODULE [symbol=value]...\n\n" + "Loads the specified kernel modules into the kernel.\n\n" + "Options:\n" + + "\t-f\tForce module to load into the wrong kernel version.\n" + "\t-k\tMake module autoclean-able.\n"; -static int findNamedModule(const char *fileName, struct stat* statbuf) +static int findNamedModule(const char *fileName, struct stat *statbuf) { - if (m_fullName[0]=='\0') - return( FALSE); - else { - char* tmp = strrchr( fileName, '/'); - if (tmp == NULL) - tmp = (char*)fileName; - else - tmp++; - if (check_wildcard_match(tmp, m_fullName) == TRUE) { - /* Stop searching if we find a match */ - memcpy(m_filename, fileName, strlen(fileName)); - return( FALSE); + if (m_fullName[0] == '\0') + return (FALSE); + else { + char *tmp = strrchr(fileName, '/'); + + if (tmp == NULL) + tmp = (char *) fileName; + else + tmp++; + if (check_wildcard_match(tmp, m_fullName) == TRUE) { + /* Stop searching if we find a match */ + memcpy(m_filename, fileName, strlen(fileName)); + return (FALSE); + } } - } - return( TRUE); + return (TRUE); } extern int insmod_main(int argc, char **argv) { - int len; - char *tmp; - char m_name[PATH_MAX + 1] ="\0"; - FILE *fp; - - if (argc<=1) { - usage( insmod_usage); - } - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 'f': - break; - case 'k': - break; - default: + int len; + char *tmp; + char m_name[PATH_MAX + 1] = "\0"; + FILE *fp; + + if (argc <= 1) { usage(insmod_usage); - } } - } - - if (argc <= 0 ) - usage(insmod_usage); - - /* Grab the module name */ - if ((tmp = strrchr(*argv, '/')) != NULL) - tmp++; - else - tmp = *argv; - len = strlen(tmp); - - if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o') - len -= 2; - memcpy(m_name, tmp, len); - strcpy(m_fullName, m_name); - strcat(m_fullName, ".o"); - - /* Get a filedesc for the module */ - if ((fp = fopen(*argv, "r")) == NULL) { - /* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */ - if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE, - findNamedModule, findNamedModule) == FALSE) { - if ( m_filename[0] == '\0' || ((fp = fopen(m_filename, "r")) == NULL)) { - perror("No module by that name found in " _PATH_MODULES "\n"); - exit( FALSE); - } + + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 'f': + break; + case 'k': + break; + default: + usage(insmod_usage); + } + } } - } else - memcpy(m_filename, *argv, strlen(*argv)); + if (argc <= 0) + usage(insmod_usage); - fprintf(stderr, "m_filename='%s'\n", m_filename); - fprintf(stderr, "m_name='%s'\n", m_name); + /* Grab the module name */ + if ((tmp = strrchr(*argv, '/')) != NULL) + tmp++; + else + tmp = *argv; + len = strlen(tmp); + + if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o') + len -= 2; + memcpy(m_name, tmp, len); + strcpy(m_fullName, m_name); + strcat(m_fullName, ".o"); + + /* Get a filedesc for the module */ + if ((fp = fopen(*argv, "r")) == NULL) { + /* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */ + if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE, + findNamedModule, findNamedModule) == FALSE) { + if (m_filename[0] == '\0' + || ((fp = fopen(m_filename, "r")) == NULL)) { + perror("No module by that name found in " _PATH_MODULES + "\n"); + exit(FALSE); + } + } + } else + memcpy(m_filename, *argv, strlen(*argv)); + + + fprintf(stderr, "m_filename='%s'\n", m_filename); + fprintf(stderr, "m_name='%s'\n", m_name); + + + /* TODO: do something roughtly like this... */ +#if 0 + if ((f = obj_load(fp)) == NULL) { + perror("Could not load the module\n"); + exit(FALSE); + } - /* TODO: do something roughtly like this... */ -#if 0 + /* Let the module know about the kernel symbols. */ + add_kernel_symbols(f); - if ((f = obj_load(fp)) == NULL) { - perror("Could not load the module\n"); - exit( FALSE); - } - - /* Let the module know about the kernel symbols. */ - add_kernel_symbols(f); - - if (!create_this_module(f, m_name)) { - perror("Could not create the module\n"); - exit( FALSE); - } - - if (!obj_check_undefineds(f, quiet)) { - perror("Undefined symbols in the module\n"); - exit( FALSE); - } - obj_allocate_commons(f); - - /* Perse the module's arguments */ - while (argc-- >0 && *(argv++) != '\0') { - if (!process_module_arguments(f, argc - optind, argv + optind)) { - perror("Undefined symbols in the module\n"); - exit( FALSE); + if (!create_this_module(f, m_name)) { + perror("Could not create the module\n"); + exit(FALSE); } - } - /* Find current size of the module */ - m_size = obj_load_size(f); + if (!obj_check_undefineds(f, quiet)) { + perror("Undefined symbols in the module\n"); + exit(FALSE); + } + obj_allocate_commons(f); + + /* Perse the module's arguments */ + while (argc-- > 0 && *(argv++) != '\0') { + if (!process_module_arguments(f, argc - optind, argv + optind)) { + perror("Undefined symbols in the module\n"); + exit(FALSE); + } + } + + /* Find current size of the module */ + m_size = obj_load_size(f); - errno = 0; - m_addr = create_module(m_name, m_size); - switch (errno) { - /* yada yada */ + errno = 0; + m_addr = create_module(m_name, m_size); + switch (errno) { + /* yada yada */ default: - perror("create_module: %m"); + perror("create_module: %m"); - } + } #endif - fclose( fp); - exit( TRUE); + fclose(fp); + exit(TRUE); } diff --git a/internal.h b/internal.h index c3814779b..22f4f2fa1 100644 --- a/internal.h +++ b/internal.h @@ -1,4 +1,4 @@ - +/* vi: set sw=4 ts=4: */ /* * Busybox main internal header file * @@ -218,7 +218,7 @@ static inline int setbit(char * addr,unsigned int nr) { int __res = bit(addr, nr); addr[nr >> 3] |= (1<<(nr & 7)); - return __res != 0; \ + return __res != 0; } static inline int clrbit(char * addr,unsigned int nr) @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini kill implementation for busybox * @@ -29,188 +30,188 @@ #include <sys/stat.h> #include <unistd.h> -static const char* kill_usage = "kill [-signal] process-id [process-id ...]\n\n" -"Send a signal (default is SIGTERM) to the specified process(es).\n\n" -"Options:\n" -"\t-l\tList all signal names and numbers.\n\n"; +static const char *kill_usage = + "kill [-signal] process-id [process-id ...]\n\n" + "Send a signal (default is SIGTERM) to the specified process(es).\n\n" + "Options:\n" "\t-l\tList all signal names and numbers.\n\n"; struct signal_name { - const char *name; - int number; + const char *name; + int number; }; const struct signal_name signames[] = { - {"HUP", SIGHUP}, - {"INT", SIGINT}, - {"QUIT", SIGQUIT}, - {"ILL", SIGILL}, - {"TRAP", SIGTRAP}, - {"ABRT", SIGABRT}, + {"HUP", SIGHUP}, + {"INT", SIGINT}, + {"QUIT", SIGQUIT}, + {"ILL", SIGILL}, + {"TRAP", SIGTRAP}, + {"ABRT", SIGABRT}, #ifndef __alpha__ - {"IOT", SIGIOT}, + {"IOT", SIGIOT}, #endif #if defined(__sparc__) || defined(__alpha__) - {"EMT", SIGEMT}, + {"EMT", SIGEMT}, #else - {"BUS", SIGBUS}, + {"BUS", SIGBUS}, #endif - {"FPE", SIGFPE}, - {"KILL", SIGKILL}, + {"FPE", SIGFPE}, + {"KILL", SIGKILL}, #if defined(__sparc__) || defined(__alpha__) - {"BUS", SIGBUS}, + {"BUS", SIGBUS}, #else - {"USR1", SIGUSR1}, + {"USR1", SIGUSR1}, #endif - {"SEGV", SIGSEGV}, + {"SEGV", SIGSEGV}, #if defined(__sparc__) || defined(__alpha__) - {"SYS", SIGSYS}, + {"SYS", SIGSYS}, #else - {"USR2", SIGUSR2}, + {"USR2", SIGUSR2}, #endif - {"PIPE", SIGPIPE}, - {"ALRM", SIGALRM}, - {"TERM", SIGTERM}, + {"PIPE", SIGPIPE}, + {"ALRM", SIGALRM}, + {"TERM", SIGTERM}, #if defined(__sparc__) || defined(__alpha__) - {"URG", SIGURG}, - {"STOP", SIGSTOP}, - {"TSTP", SIGTSTP}, - {"CONT", SIGCONT}, - {"CHLD", SIGCHLD}, - {"TTIN", SIGTTIN}, - {"TTOU", SIGTTOU}, - {"IO", SIGIO}, + {"URG", SIGURG}, + {"STOP", SIGSTOP}, + {"TSTP", SIGTSTP}, + {"CONT", SIGCONT}, + {"CHLD", SIGCHLD}, + {"TTIN", SIGTTIN}, + {"TTOU", SIGTTOU}, + {"IO", SIGIO}, # ifndef __alpha__ - {"POLL", SIGIO}, + {"POLL", SIGIO}, # endif - {"XCPU", SIGXCPU}, - {"XFSZ", SIGXFSZ}, - {"VTALRM", SIGVTALRM}, - {"PROF", SIGPROF}, - {"WINCH", SIGWINCH}, + {"XCPU", SIGXCPU}, + {"XFSZ", SIGXFSZ}, + {"VTALRM", SIGVTALRM}, + {"PROF", SIGPROF}, + {"WINCH", SIGWINCH}, # ifdef __alpha__ - {"INFO", SIGINFO}, + {"INFO", SIGINFO}, # else - {"LOST", SIGLOST}, + {"LOST", SIGLOST}, # endif - {"USR1", SIGUSR1}, - {"USR2", SIGUSR2}, + {"USR1", SIGUSR1}, + {"USR2", SIGUSR2}, #else - {"STKFLT", SIGSTKFLT}, - {"CHLD", SIGCHLD}, - {"CONT", SIGCONT}, - {"STOP", SIGSTOP}, - {"TSTP", SIGTSTP}, - {"TTIN", SIGTTIN}, - {"TTOU", SIGTTOU}, - {"URG", SIGURG}, - {"XCPU", SIGXCPU}, - {"XFSZ", SIGXFSZ}, - {"VTALRM", SIGVTALRM}, - {"PROF", SIGPROF}, - {"WINCH", SIGWINCH}, - {"IO", SIGIO}, - {"POLL", SIGPOLL}, - {"PWR", SIGPWR}, - {"UNUSED", SIGUNUSED}, + {"STKFLT", SIGSTKFLT}, + {"CHLD", SIGCHLD}, + {"CONT", SIGCONT}, + {"STOP", SIGSTOP}, + {"TSTP", SIGTSTP}, + {"TTIN", SIGTTIN}, + {"TTOU", SIGTTOU}, + {"URG", SIGURG}, + {"XCPU", SIGXCPU}, + {"XFSZ", SIGXFSZ}, + {"VTALRM", SIGVTALRM}, + {"PROF", SIGPROF}, + {"WINCH", SIGWINCH}, + {"IO", SIGIO}, + {"POLL", SIGPOLL}, + {"PWR", SIGPWR}, + {"UNUSED", SIGUNUSED}, #endif - {0, 0} + {0, 0} }; -extern int kill_main (int argc, char **argv) +extern int kill_main(int argc, char **argv) { - int sig = SIGTERM; - - argc--; - argv++; - /* Parse any options */ - if (argc < 1) - usage(kill_usage); - - while (argc > 0 && **argv == '-') { - while (*++(*argv)) { - switch (**argv) { - case 'l': - { - int col=0; - const struct signal_name *s = signames; - - while (s->name != 0) { - col+=fprintf(stderr, "%2d) %-8s", s->number, (s++)->name); - if (col>60) { - fprintf(stderr, "\n"); - col=0; - } - } - fprintf(stderr, "\n\n"); - exit( TRUE); - } - break; - case '-': + int sig = SIGTERM; + + argc--; + argv++; + /* Parse any options */ + if (argc < 1) usage(kill_usage); - default: - { - if (isdigit( **argv)) { - sig = atoi (*argv); - if (sig < 0 || sig >= NSIG) - goto end; - else { - argc--; - argv++; - goto do_it_now; - } - } - else { - const struct signal_name *s = signames; - while (s->name != 0) { - if (strcasecmp (s->name, *argv) == 0) { - sig = s->number; - argc--; - argv++; - goto do_it_now; - } - s++; + + while (argc > 0 && **argv == '-') { + while (*++(*argv)) { + switch (**argv) { + case 'l': + { + int col = 0; + const struct signal_name *s = signames; + + while (s->name != 0) { + col += + fprintf(stderr, "%2d) %-8s", s->number, + (s++)->name); + if (col > 60) { + fprintf(stderr, "\n"); + col = 0; + } + } + fprintf(stderr, "\n\n"); + exit(TRUE); + } + break; + case '-': + usage(kill_usage); + default: + { + if (isdigit(**argv)) { + sig = atoi(*argv); + if (sig < 0 || sig >= NSIG) + goto end; + else { + argc--; + argv++; + goto do_it_now; + } + } else { + const struct signal_name *s = signames; + + while (s->name != 0) { + if (strcasecmp(s->name, *argv) == 0) { + sig = s->number; + argc--; + argv++; + goto do_it_now; + } + s++; + } + if (s->name == 0) + goto end; + } + } } - if (s->name == 0) - goto end; - } + argc--; + argv++; } - } - argc--; - argv++; - } - } - -do_it_now: - - while (--argc >= 0) { - int pid; - struct stat statbuf; - char pidpath[20]="/proc/"; - - if (! isdigit( **argv)) { - fprintf(stderr, "bad PID: %s\n", *argv); - exit( FALSE); - } - pid = atoi (*argv); - snprintf(pidpath, 20, "/proc/%s/stat", *argv); - if (stat( pidpath, &statbuf)!=0) { - fprintf(stderr, "kill: (%d) - No such pid\n", pid); - exit( FALSE); } - fprintf(stderr, "sig = %d\n", sig); - if (kill (pid, sig) != 0) { - perror (*argv); - exit ( FALSE); - } - argv++; - } - exit ( TRUE); + do_it_now: -end: - fprintf(stderr, "bad signal name: %s\n", *argv); - exit (TRUE); -} + while (--argc >= 0) { + int pid; + struct stat statbuf; + char pidpath[20] = "/proc/"; + + if (!isdigit(**argv)) { + fprintf(stderr, "bad PID: %s\n", *argv); + exit(FALSE); + } + pid = atoi(*argv); + snprintf(pidpath, 20, "/proc/%s/stat", *argv); + if (stat(pidpath, &statbuf) != 0) { + fprintf(stderr, "kill: (%d) - No such pid\n", pid); + exit(FALSE); + } + fprintf(stderr, "sig = %d\n", sig); + if (kill(pid, sig) != 0) { + perror(*argv); + exit(FALSE); + } + argv++; + } + exit(TRUE); + end: + fprintf(stderr, "bad signal name: %s\n", *argv); + exit(TRUE); +} @@ -1,14 +1,14 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" #include <stdlib.h> #include <string.h> #include <stdio.h> -extern int -length_main(int argc, char * * argv) +extern int length_main(int argc, char **argv) { - if ( argc != 2 || **(argv+1) == '-' ) { - usage("length string\n"); - } - printf("%d\n", strlen(argv[1])); - return( TRUE); + if (argc != 2 || **(argv + 1) == '-') { + usage("length string\n"); + } + printf("%d\n", strlen(argv[1])); + return (TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini ln implementation for busybox * @@ -30,15 +31,16 @@ #include <stdio.h> #include <dirent.h> #include <errno.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ static const char ln_usage[] = - "ln [OPTION] TARGET... LINK_NAME|DIRECTORY\n\n" - "Create a link named LINK_NAME or DIRECTORY to the specified TARGET\n\n" - "Options:\n" - "\t-s\tmake symbolic links instead of hard links\n" - "\t-f\tremove existing destination files\n" - "\t-n\tno dereference symlinks - treat like normal file\n"; + "ln [OPTION] TARGET... LINK_NAME|DIRECTORY\n\n" + "Create a link named LINK_NAME or DIRECTORY to the specified TARGET\n\n" + "Options:\n" + "\t-s\tmake symbolic links instead of hard links\n" + + "\t-f\tremove existing destination files\n" + "\t-n\tno dereference symlinks - treat like normal file\n"; static int symlinkFlag = FALSE; static int removeoldFlag = FALSE; @@ -46,83 +48,83 @@ static int followLinks = TRUE; extern int ln_main(int argc, char **argv) { - char *linkName; - int linkIntoDirFlag; - - if (argc < 3) { - usage (ln_usage); - } - argc--; - argv++; - - /* Parse any options */ - while (**argv == '-') { - while (*++(*argv)) - switch (**argv) { - case 's': - symlinkFlag = TRUE; - break; - case 'f': - removeoldFlag = TRUE; - break; - case 'n': - followLinks = FALSE; - break; - default: - usage (ln_usage); - } + char *linkName; + int linkIntoDirFlag; + + if (argc < 3) { + usage(ln_usage); + } argc--; argv++; - } - - linkName = argv[argc - 1]; - - if (strlen(linkName) > PATH_MAX) { - fprintf(stderr, name_too_long, "ln"); - exit FALSE; - } - linkIntoDirFlag = isDirectory(linkName, TRUE); - - if ((argc > 3) && !linkIntoDirFlag) { - fprintf(stderr, not_a_directory, "ln", linkName); - exit FALSE; - } + /* Parse any options */ + while (**argv == '-') { + while (*++(*argv)) + switch (**argv) { + case 's': + symlinkFlag = TRUE; + break; + case 'f': + removeoldFlag = TRUE; + break; + case 'n': + followLinks = FALSE; + break; + default: + usage(ln_usage); + } + argc--; + argv++; + } - while (argc-- >= 2) { - char srcName[PATH_MAX + 1]; - int nChars, status; + linkName = argv[argc - 1]; - if (strlen(*argv) > PATH_MAX) { - fprintf(stderr, name_too_long, "ln"); - exit FALSE; + if (strlen(linkName) > PATH_MAX) { + fprintf(stderr, name_too_long, "ln"); + exit FALSE; } - if (followLinks == FALSE) { - strcpy(srcName, *argv); - } else { - /* Warning! This can silently truncate if > PATH_MAX, but - I don't think that there can be one > PATH_MAX anyway. */ - nChars = readlink(*argv, srcName, PATH_MAX); - srcName[nChars] = '\0'; - } + linkIntoDirFlag = isDirectory(linkName, TRUE); - if (removeoldFlag == TRUE) { - status = ( unlink(linkName) && errno != ENOENT ); - if (status != 0) { - perror(linkName); + if ((argc > 3) && !linkIntoDirFlag) { + fprintf(stderr, not_a_directory, "ln", linkName); exit FALSE; - } } - if (symlinkFlag == TRUE) - status = symlink(*argv, linkName); - else - status = link(*argv, linkName); - if (status != 0) { - perror(linkName); - exit FALSE; + while (argc-- >= 2) { + char srcName[PATH_MAX + 1]; + int nChars, status; + + if (strlen(*argv) > PATH_MAX) { + fprintf(stderr, name_too_long, "ln"); + exit FALSE; + } + + if (followLinks == FALSE) { + strcpy(srcName, *argv); + } else { + /* Warning! This can silently truncate if > PATH_MAX, but + I don't think that there can be one > PATH_MAX anyway. */ + nChars = readlink(*argv, srcName, PATH_MAX); + srcName[nChars] = '\0'; + } + + if (removeoldFlag == TRUE) { + status = (unlink(linkName) && errno != ENOENT); + if (status != 0) { + perror(linkName); + exit FALSE; + } + } + + if (symlinkFlag == TRUE) + status = symlink(*argv, linkName); + else + status = link(*argv, linkName); + if (status != 0) { + perror(linkName); + exit FALSE; + } } - } - exit TRUE; + exit TRUE; } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Derived from * mapscrn.c - version 0.92 @@ -23,120 +24,115 @@ typedef unsigned short unicode; static long int ctoi(unsigned char *s, int *is_unicode); -int old_screen_map_read_ascii(FILE *fp, unsigned char buf[]); -int uni_screen_map_read_ascii(FILE *fp, unicode buf[], int* is_unicode); -unicode utf8_to_ucs2 (char* buf); -int screen_map_load(int fd, FILE *fp); +int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]); +int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode); +unicode utf8_to_ucs2(char *buf); +int screen_map_load(int fd, FILE * fp); int loadacm_main(int argc, char **argv) { - int fd; - - fd = open("/dev/tty", O_RDWR); - if (fd < 0) { - fprintf(stderr, "Error opening /dev/tty1: %s\n", strerror(errno)); - return 1; - } - - if (screen_map_load(fd, stdin)) - { - fprintf(stderr, "Error loading acm: %s\n", strerror(errno)); - return 1; - } - - write(fd, "\033(K", 3); - - return 0; + int fd; + + fd = open("/dev/tty", O_RDWR); + if (fd < 0) { + fprintf(stderr, "Error opening /dev/tty1: %s\n", strerror(errno)); + return 1; + } + + if (screen_map_load(fd, stdin)) { + fprintf(stderr, "Error loading acm: %s\n", strerror(errno)); + return 1; + } + + write(fd, "\033(K", 3); + + return 0; } -int screen_map_load(int fd, FILE *fp) +int screen_map_load(int fd, FILE * fp) { - struct stat stbuf; - unicode wbuf[E_TABSZ]; - unsigned char buf[E_TABSZ]; - int parse_failed = 0; - int is_unicode; - - if (fstat(fp->_fileno, &stbuf)) - perror("Cannot stat map file"), exit(1); - - /* first try a UTF screen-map: either ASCII (no restriction) or binary (regular file) */ - if (!(parse_failed = (-1 == uni_screen_map_read_ascii(fp,wbuf,&is_unicode))) || - (S_ISREG(stbuf.st_mode) && - (stbuf.st_size == (sizeof(unicode) * E_TABSZ)))) /* test for binary UTF map by size */ - { - if (parse_failed) - { - if (-1 == fseek (fp, 0, SEEK_SET)) - { - if (errno == ESPIPE) - fprintf (stderr, "16bit screen-map MUST be a regular file.\n"), exit (1); - else - perror ("fseek failed reading binary 16bit screen-map"), exit (1); - } - - if (fread(wbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) - perror("Cannot read [new] map from file"), exit(1); + struct stat stbuf; + unicode wbuf[E_TABSZ]; + unsigned char buf[E_TABSZ]; + int parse_failed = 0; + int is_unicode; + + if (fstat(fp->_fileno, &stbuf)) + perror("Cannot stat map file"), exit(1); + + /* first try a UTF screen-map: either ASCII (no restriction) or binary (regular file) */ + if (! + (parse_failed = + (-1 == uni_screen_map_read_ascii(fp, wbuf, &is_unicode))) +|| (S_ISREG(stbuf.st_mode) && (stbuf.st_size == (sizeof(unicode) * E_TABSZ)))) { /* test for binary UTF map by size */ + if (parse_failed) { + if (-1 == fseek(fp, 0, SEEK_SET)) { + if (errno == ESPIPE) + fprintf(stderr, + "16bit screen-map MUST be a regular file.\n"), + exit(1); + else + perror("fseek failed reading binary 16bit screen-map"), + exit(1); + } + + if (fread(wbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) + perror("Cannot read [new] map from file"), exit(1); #if 0 - else - fprintf(stderr, "Input screen-map is binary.\n"); + else + fprintf(stderr, "Input screen-map is binary.\n"); #endif + } + + /* if it was effectively a 16-bit ASCII, OK, else try to read as 8-bit map */ + /* same if it was binary, ie. if parse_failed */ + if (parse_failed || is_unicode) { + if (ioctl(fd, PIO_UNISCRNMAP, wbuf)) + perror("PIO_UNISCRNMAP ioctl"), exit(1); + else + return 0; + } } - /* if it was effectively a 16-bit ASCII, OK, else try to read as 8-bit map */ - /* same if it was binary, ie. if parse_failed */ - if (parse_failed || is_unicode) - { - if (ioctl(fd,PIO_UNISCRNMAP,wbuf)) - perror("PIO_UNISCRNMAP ioctl"), exit(1); - else - return 0; + /* rewind... */ + if (-1 == fseek(fp, 0, SEEK_SET)) { + if (errno == ESPIPE) + fprintf(stderr, + "Assuming 8bit screen-map - MUST be a regular file.\n"), + exit(1); + else + perror("fseek failed assuming 8bit screen-map"), exit(1); } - } - - /* rewind... */ - if (-1 == fseek (fp, 0, SEEK_SET)) - { - if (errno == ESPIPE) - fprintf (stderr, "Assuming 8bit screen-map - MUST be a regular file.\n"), exit (1); - else - perror ("fseek failed assuming 8bit screen-map"), exit (1); - } - - /* ... and try an old 8-bit screen-map */ - if (!(parse_failed = (-1 == old_screen_map_read_ascii(fp,buf))) || - (S_ISREG(stbuf.st_mode) && - (stbuf.st_size == E_TABSZ))) /* test for binary old 8-bit map by size */ - { - if (parse_failed) - { - if (-1 == fseek (fp, 0, SEEK_SET)) - { - if (errno == ESPIPE) - /* should not - it succedeed above */ - fprintf (stderr, "fseek() returned ESPIPE !\n"), exit (1); - else - perror ("fseek for binary 8bit screen-map"), exit (1); - } - - if (fread(buf,E_TABSZ,1,fp) != 1) - perror("Cannot read [old] map from file"), exit(1); + + /* ... and try an old 8-bit screen-map */ + if (!(parse_failed = (-1 == old_screen_map_read_ascii(fp, buf))) || + (S_ISREG(stbuf.st_mode) && (stbuf.st_size == E_TABSZ))) { /* test for binary old 8-bit map by size */ + if (parse_failed) { + if (-1 == fseek(fp, 0, SEEK_SET)) { + if (errno == ESPIPE) + /* should not - it succedeed above */ + fprintf(stderr, "fseek() returned ESPIPE !\n"), + exit(1); + else + perror("fseek for binary 8bit screen-map"), exit(1); + } + + if (fread(buf, E_TABSZ, 1, fp) != 1) + perror("Cannot read [old] map from file"), exit(1); #if 0 - else - fprintf(stderr, "Input screen-map is binary.\n"); + else + fprintf(stderr, "Input screen-map is binary.\n"); #endif + } + + if (ioctl(fd, PIO_SCRNMAP, buf)) + perror("PIO_SCRNMAP ioctl"), exit(1); + else + return 0; + } else { + fprintf(stderr, "Error parsing symbolic map\n"); + exit(1); } - - if (ioctl(fd,PIO_SCRNMAP,buf)) - perror("PIO_SCRNMAP ioctl"), exit(1); - else - return 0; - } - else - { - fprintf(stderr, "Error parsing symbolic map\n"); - exit(1); - } } @@ -149,116 +145,111 @@ int screen_map_load(int fd, FILE *fp) * * FIXME: ignores everything after second word */ -int uni_screen_map_read_ascii(FILE *fp, unicode buf[], int *is_unicode) +int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) { - char buffer[256]; /* line buffer reading file */ - char *p, *q; /* 1st + 2nd words in line */ - int in, on; /* the same, as numbers */ - int tmp_is_unicode; /* tmp for is_unicode calculation */ - int i; /* loop index - result holder */ - int ret_code = 0; /* return code */ - sigset_t sigset, old_sigset; - - assert (is_unicode); - - *is_unicode = 0; - - /* first 128 codes defaults to ASCII */ - for (i=0; i<128; i++) buf[i] = i; - /* remaining defaults to replacement char (usually E_TABSZ = 256) */ - for ( ; i<E_TABSZ; i++) buf[i] = 0xfffd; - - /* block SIGCHLD */ - sigemptyset (&sigset); - sigaddset (&sigset, SIGCHLD); - sigprocmask (SIG_BLOCK, &sigset, &old_sigset); - - do - { - if (NULL == fgets(buffer, sizeof(buffer),fp)) - { - if (feof (fp)) - break; - else - { - perror ("uni_screen_map_read_ascii() can't read line"); - exit (2); - } - } - - /* get "charset-relative charcode", stripping leading spaces */ - p = strtok(buffer," \t\n"); - - /* skip empty lines and comments */ - if (!p || *p == '#') - continue; - - /* get unicode mapping */ - q = strtok(NULL," \t\n"); - if (q) - { - in = ctoi(p, NULL); - if (in < 0 || in > 255) - { - ret_code = -1; - break; - } - - on = ctoi(q, &tmp_is_unicode); - if (in < 0 && on > 65535) - { - ret_code = -1; - break; - } - - *is_unicode |= tmp_is_unicode; - buf[in] = on; + char buffer[256]; /* line buffer reading file */ + char *p, *q; /* 1st + 2nd words in line */ + int in, on; /* the same, as numbers */ + int tmp_is_unicode; /* tmp for is_unicode calculation */ + int i; /* loop index - result holder */ + int ret_code = 0; /* return code */ + sigset_t sigset, old_sigset; + + assert(is_unicode); + + *is_unicode = 0; + + /* first 128 codes defaults to ASCII */ + for (i = 0; i < 128; i++) + buf[i] = i; + /* remaining defaults to replacement char (usually E_TABSZ = 256) */ + for (; i < E_TABSZ; i++) + buf[i] = 0xfffd; + + /* block SIGCHLD */ + sigemptyset(&sigset); + sigaddset(&sigset, SIGCHLD); + sigprocmask(SIG_BLOCK, &sigset, &old_sigset); + + do { + if (NULL == fgets(buffer, sizeof(buffer), fp)) { + if (feof(fp)) + break; + else { + perror("uni_screen_map_read_ascii() can't read line"); + exit(2); + } + } + + /* get "charset-relative charcode", stripping leading spaces */ + p = strtok(buffer, " \t\n"); + + /* skip empty lines and comments */ + if (!p || *p == '#') + continue; + + /* get unicode mapping */ + q = strtok(NULL, " \t\n"); + if (q) { + in = ctoi(p, NULL); + if (in < 0 || in > 255) { + ret_code = -1; + break; + } + + on = ctoi(q, &tmp_is_unicode); + if (in < 0 && on > 65535) { + ret_code = -1; + break; + } + + *is_unicode |= tmp_is_unicode; + buf[in] = on; + } else { + ret_code = -1; + break; + } } - else - { - ret_code = -1; - break; - } - } - while (1); /* terminated by break on feof() */ + while (1); /* terminated by break on feof() */ - /* restore sig mask */ - sigprocmask (SIG_SETMASK, &old_sigset, NULL); + /* restore sig mask */ + sigprocmask(SIG_SETMASK, &old_sigset, NULL); - return ret_code; + return ret_code; } -int old_screen_map_read_ascii(FILE *fp, unsigned char buf[]) +int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]) { - char buffer[256]; - int in, on; - char *p, *q; - - for (in=0; in<256; in++) buf[in]=in; - - while (fgets(buffer,sizeof(buffer)-1,fp)) - { - p = strtok(buffer," \t\n"); - - if (!p || *p == '#') - continue; - - q = strtok(NULL," \t\n#"); - if (q) - { - in = ctoi(p, NULL); - if (in < 0 || in > 255) return -1; - - on = ctoi(q, NULL); - if (in < 0 && on > 255) return -1; - - buf[in] = on; + char buffer[256]; + int in, on; + char *p, *q; + + for (in = 0; in < 256; in++) + buf[in] = in; + + while (fgets(buffer, sizeof(buffer) - 1, fp)) { + p = strtok(buffer, " \t\n"); + + if (!p || *p == '#') + continue; + + q = strtok(NULL, " \t\n#"); + if (q) { + in = ctoi(p, NULL); + if (in < 0 || in > 255) + return -1; + + on = ctoi(q, NULL); + if (in < 0 && on > 255) + return -1; + + buf[in] = on; + } else + return -1; } - else return -1; - } - - return(0); + + return (0); } @@ -270,172 +261,145 @@ int old_screen_map_read_ascii(FILE *fp, unsigned char buf[]) * * CAVEAT: will report valid UTF mappings using only 1 byte as 8-bit ones. */ -long int ctoi(unsigned char *s, int *is_unicode) +long int ctoi(unsigned char *s, int *is_unicode) { - int i; - size_t ls; - - ls = strlen(s); - if (is_unicode) *is_unicode = 0; - - /* hex-specified UCS2 */ - if ((strncmp(s,"U+",2) == 0) && - (strspn(s+2,"0123456789abcdefABCDEF") == ls-2)) - { - sscanf(s+2,"%x",&i); - if (is_unicode) *is_unicode = 1; - } - - /* hex-specified byte */ - else if ((ls <= 4) && (strncmp(s,"0x",2) == 0) && - (strspn(s+2,"0123456789abcdefABCDEF") == ls-2)) - sscanf(s+2,"%x",&i); - - /* oct-specified number (byte) */ - else if ((*s == '0') && - (strspn(s,"01234567") == ls)) - sscanf(s,"%o",&i); - - /* dec-specified number (byte) */ - else if (strspn(s,"0123456789") == ls) - sscanf(s,"%d",&i); - - /* single-byte quoted char */ - else if ((strlen(s) == 3) && (s[0] == '\'') && (s[2] == '\'')) - i=s[1]; - - /* multi-byte UTF8 quoted char */ - else if ((s[0] == '\'') && (s[ls-1] == '\'')) - { - s[ls-1] = 0; /* ensure we'll not "parse UTF too far" */ - i = utf8_to_ucs2(s+1); - if (is_unicode) *is_unicode = 1; - } - else - return(-1); - - return(i); + int i; + size_t ls; + + ls = strlen(s); + if (is_unicode) + *is_unicode = 0; + + /* hex-specified UCS2 */ + if ((strncmp(s, "U+", 2) == 0) && + (strspn(s + 2, "0123456789abcdefABCDEF") == ls - 2)) { + sscanf(s + 2, "%x", &i); + if (is_unicode) + *is_unicode = 1; + } + + /* hex-specified byte */ + else if ((ls <= 4) && (strncmp(s, "0x", 2) == 0) && + (strspn(s + 2, "0123456789abcdefABCDEF") == ls - 2)) + sscanf(s + 2, "%x", &i); + + /* oct-specified number (byte) */ + else if ((*s == '0') && (strspn(s, "01234567") == ls)) + sscanf(s, "%o", &i); + + /* dec-specified number (byte) */ + else if (strspn(s, "0123456789") == ls) + sscanf(s, "%d", &i); + + /* single-byte quoted char */ + else if ((strlen(s) == 3) && (s[0] == '\'') && (s[2] == '\'')) + i = s[1]; + + /* multi-byte UTF8 quoted char */ + else if ((s[0] == '\'') && (s[ls - 1] == '\'')) { + s[ls - 1] = 0; /* ensure we'll not "parse UTF too far" */ + i = utf8_to_ucs2(s + 1); + if (is_unicode) + *is_unicode = 1; + } else + return (-1); + + return (i); } -void saveoldmap(int fd, char *omfil) +void saveoldmap(int fd, char *omfil) { - FILE *fp; - char buf[E_TABSZ]; + FILE *fp; + char buf[E_TABSZ]; + #ifdef GIO_UNISCRNMAP - unicode xbuf[E_TABSZ]; - int is_old_map = 0; + unicode xbuf[E_TABSZ]; + int is_old_map = 0; - if (ioctl(fd,GIO_UNISCRNMAP,xbuf)) - { - perror("GIO_UNISCRNMAP ioctl error"); + if (ioctl(fd, GIO_UNISCRNMAP, xbuf)) { + perror("GIO_UNISCRNMAP ioctl error"); #endif - if (ioctl(fd,GIO_SCRNMAP,buf)) - { - perror("GIO_SCRNMAP ioctl error"); - exit(1); - } - else - is_old_map = 1; + if (ioctl(fd, GIO_SCRNMAP, buf)) { + perror("GIO_SCRNMAP ioctl error"); + exit(1); + } else + is_old_map = 1; #ifdef GIO_UNISCRNMAP - } + } #endif - - if ((fp = fopen(omfil, "w")) == NULL) - { - perror(omfil); - exit(1); - } + if ((fp = fopen(omfil, "w")) == NULL) { + perror(omfil); + exit(1); + } #ifdef GIO_UNISCRNMAP - if (is_old_map) - { + if (is_old_map) { #endif - if (fwrite(buf,E_TABSZ,1,fp) != 1) - { - perror("Error writing map to file"); - exit(1); - } + if (fwrite(buf, E_TABSZ, 1, fp) != 1) { + perror("Error writing map to file"); + exit(1); + } #ifdef GIO_UNISCRNMAP - } - else - if (fwrite(xbuf, sizeof(unicode) * E_TABSZ,1,fp) != 1) - { - perror("Error writing map to file"); - exit(1); + } else if (fwrite(xbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) { + perror("Error writing map to file"); + exit(1); } #endif - - fclose(fp); + + fclose(fp); } -unicode utf8_to_ucs2 (char* buf) +unicode utf8_to_ucs2(char *buf) { - int utf_count = 0; - long utf_char; - unicode tc; - unsigned char c; - - do - { - c = *buf; - buf++; - - /* if byte should be part of multi-byte sequence */ - if(c & 0x80) - { - /* if we have already started to parse a UTF8 sequence */ - if (utf_count > 0 && (c & 0xc0) == 0x80) - { - utf_char = (utf_char << 6) | (c & 0x3f); - utf_count--; - if (utf_count == 0) - tc = utf_char; - else - continue; - } - else /* Possibly 1st char of a UTF8 sequence */ - { - if ((c & 0xe0) == 0xc0) - { - utf_count = 1; - utf_char = (c & 0x1f); - } - else if ((c & 0xf0) == 0xe0) - { - utf_count = 2; - utf_char = (c & 0x0f); - } - else if ((c & 0xf8) == 0xf0) - { - utf_count = 3; - utf_char = (c & 0x07); - } - else if ((c & 0xfc) == 0xf8) - { - utf_count = 4; - utf_char = (c & 0x03); - } - else if ((c & 0xfe) == 0xfc) - { - utf_count = 5; - utf_char = (c & 0x01); - } - else - utf_count = 0; - continue; - } - } - else /* not part of multi-byte sequence - treat as ASCII - * this makes incomplete sequences to be ignored - */ - { - tc = c; - utf_count = 0; - } - } - while (utf_count); - - return tc; -} + int utf_count = 0; + long utf_char; + unicode tc; + unsigned char c; + + do { + c = *buf; + buf++; + + /* if byte should be part of multi-byte sequence */ + if (c & 0x80) { + /* if we have already started to parse a UTF8 sequence */ + if (utf_count > 0 && (c & 0xc0) == 0x80) { + utf_char = (utf_char << 6) | (c & 0x3f); + utf_count--; + if (utf_count == 0) + tc = utf_char; + else + continue; + } else { /* Possibly 1st char of a UTF8 sequence */ + + if ((c & 0xe0) == 0xc0) { + utf_count = 1; + utf_char = (c & 0x1f); + } else if ((c & 0xf0) == 0xe0) { + utf_count = 2; + utf_char = (c & 0x0f); + } else if ((c & 0xf8) == 0xf0) { + utf_count = 3; + utf_char = (c & 0x07); + } else if ((c & 0xfc) == 0xf8) { + utf_count = 4; + utf_char = (c & 0x03); + } else if ((c & 0xfe) == 0xfc) { + utf_count = 5; + utf_char = (c & 0x01); + } else + utf_count = 0; + continue; + } + } else { /* not part of multi-byte sequence - treat as ASCII + * this makes incomplete sequences to be ignored + */ + tc = c; + utf_count = 0; + } + } + while (utf_count); + return tc; +} diff --git a/loadfont.c b/loadfont.c index e44525d9c..64b725610 100644 --- a/loadfont.c +++ b/loadfont.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * loadfont.c - Eugene Crosser & Andries Brouwer * @@ -30,72 +31,69 @@ #define PSF_SEPARATOR 0xFFFF static const char loadfont_usage[] = "loadfont\n" -"\n" -"\tLoad a console font from standard input.\n" -"\n"; + "\n" "\tLoad a console font from standard input.\n" "\n"; -struct psf_header -{ - unsigned char magic1, magic2; /* Magic number */ - unsigned char mode; /* PSF font mode */ - unsigned char charsize; /* Character size */ +struct psf_header { + unsigned char magic1, magic2; /* Magic number */ + unsigned char mode; /* PSF font mode */ + unsigned char charsize; /* Character size */ }; #define PSF_MAGIC_OK(x) ((x).magic1 == PSF_MAGIC1 && (x).magic2 == PSF_MAGIC2) static void loadnewfont(int fd); -extern int -loadfont_main(int argc, char **argv) +extern int loadfont_main(int argc, char **argv) { int fd; fd = open("/dev/tty0", O_RDWR); if (fd < 0) { - fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno)); - return 1; + fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno)); + return 1; } loadnewfont(fd); return 0; } -static void -do_loadfont(int fd, char *inbuf, int unit, int fontsize) { +static void do_loadfont(int fd, char *inbuf, int unit, int fontsize) +{ char buf[16384]; int i; - memset(buf,0,sizeof(buf)); + memset(buf, 0, sizeof(buf)); if (unit < 1 || unit > 32) { - fprintf(stderr, "Bad character size %d\n", unit); - exit(1); + fprintf(stderr, "Bad character size %d\n", unit); + exit(1); } for (i = 0; i < fontsize; i++) - memcpy(buf+(32*i), inbuf+(unit*i), unit); + memcpy(buf + (32 * i), inbuf + (unit * i), unit); #if defined( PIO_FONTX ) && !defined( __sparc__ ) { - struct consolefontdesc cfd; + struct consolefontdesc cfd; - cfd.charcount = fontsize; - cfd.charheight = unit; - cfd.chardata = buf; + cfd.charcount = fontsize; + cfd.charheight = unit; + cfd.chardata = buf; - if (ioctl(fd, PIO_FONTX, &cfd) == 0) - return; /* success */ - perror("PIO_FONTX ioctl error (trying PIO_FONT)"); + if (ioctl(fd, PIO_FONTX, &cfd) == 0) + return; /* success */ + perror("PIO_FONTX ioctl error (trying PIO_FONT)"); } #endif if (ioctl(fd, PIO_FONT, buf)) { - perror("PIO_FONT ioctl error"); - exit(1); + perror("PIO_FONT ioctl error"); + exit(1); } } static void -do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) { +do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) +{ struct unimapinit advice; struct unimapdesc ud; struct unipair *up; @@ -103,23 +101,24 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) { int glyph; u_short unicode; - maxct = tailsz; /* more than enough */ + maxct = tailsz; /* more than enough */ up = (struct unipair *) malloc(maxct * sizeof(struct unipair)); + if (!up) { - fprintf(stderr, "Out of memory?\n"); - exit(1); + fprintf(stderr, "Out of memory?\n"); + exit(1); } for (glyph = 0; glyph < fontsize; glyph++) { - while (tailsz >= 2) { - unicode = (((u_short) inbuf[1]) << 8) + inbuf[0]; - tailsz -= 2; - inbuf += 2; - if (unicode == PSF_SEPARATOR) - break; - up[ct].unicode = unicode; - up[ct].fontpos = glyph; - ct++; - } + while (tailsz >= 2) { + unicode = (((u_short) inbuf[1]) << 8) + inbuf[0]; + tailsz -= 2; + inbuf += 2; + if (unicode == PSF_SEPARATOR) + break; + up[ct].unicode = unicode; + up[ct].fontpos = glyph; + ct++; + } } /* Note: after PIO_UNIMAPCLR and before PIO_UNIMAP @@ -128,33 +127,33 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) { advice.advised_hashsize = 0; advice.advised_hashstep = 0; advice.advised_hashlevel = 0; - if(ioctl(fd, PIO_UNIMAPCLR, &advice)) { + if (ioctl(fd, PIO_UNIMAPCLR, &advice)) { #ifdef ENOIOCTLCMD - if (errno == ENOIOCTLCMD) { - fprintf(stderr, "It seems this kernel is older than 1.1.92\n"); - fprintf(stderr, "No Unicode mapping table loaded.\n"); - } else + if (errno == ENOIOCTLCMD) { + fprintf(stderr, "It seems this kernel is older than 1.1.92\n"); + fprintf(stderr, "No Unicode mapping table loaded.\n"); + } else #endif - perror("PIO_UNIMAPCLR"); - exit(1); + perror("PIO_UNIMAPCLR"); + exit(1); } ud.entry_ct = ct; ud.entries = up; - if(ioctl(fd, PIO_UNIMAP, &ud)) { + if (ioctl(fd, PIO_UNIMAP, &ud)) { #if 0 - if (errno == ENOMEM) { - /* change advice parameters */ - } + if (errno == ENOMEM) { + /* change advice parameters */ + } #endif - perror("PIO_UNIMAP"); - exit(1); + perror("PIO_UNIMAP"); + exit(1); } } -static void -loadnewfont(int fd) { +static void loadnewfont(int fd) +{ int unit; - char inbuf[32768]; /* primitive */ + char inbuf[32768]; /* primitive */ int inputlth, offset; /* @@ -178,57 +177,58 @@ loadnewfont(int fd) { /* test for psf first */ { - struct psf_header psfhdr; - int fontsize; - int hastable; - int head0, head; + struct psf_header psfhdr; + int fontsize; + int hastable; + int head0, head; - if (inputlth < sizeof(struct psf_header)) - goto no_psf; + if (inputlth < sizeof(struct psf_header)) + goto no_psf; - psfhdr = * (struct psf_header *) &inbuf[0]; + psfhdr = *(struct psf_header *) &inbuf[0]; - if (!PSF_MAGIC_OK(psfhdr)) - goto no_psf; + if (!PSF_MAGIC_OK(psfhdr)) + goto no_psf; - if (psfhdr.mode > PSF_MAXMODE) { - fprintf(stderr, "Unsupported psf file mode\n"); - exit(1); - } - fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); + if (psfhdr.mode > PSF_MAXMODE) { + fprintf(stderr, "Unsupported psf file mode\n"); + exit(1); + } + fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); #if !defined( PIO_FONTX ) || defined( __sparc__ ) - if (fontsize != 256) { - fprintf(stderr, "Only fontsize 256 supported\n"); - exit(1); - } + if (fontsize != 256) { + fprintf(stderr, "Only fontsize 256 supported\n"); + exit(1); + } #endif - hastable = (psfhdr.mode & PSF_MODEHASTAB); - unit = psfhdr.charsize; - head0 = sizeof(struct psf_header); - head = head0 + fontsize*unit; - if (head > inputlth || (!hastable && head != inputlth)) { - fprintf(stderr, "Input file: bad length\n"); - exit(1); - } - do_loadfont(fd, inbuf + head0, unit, fontsize); - if (hastable) - do_loadtable(fd, inbuf + head, inputlth-head, fontsize); - return; + hastable = (psfhdr.mode & PSF_MODEHASTAB); + unit = psfhdr.charsize; + head0 = sizeof(struct psf_header); + + head = head0 + fontsize * unit; + if (head > inputlth || (!hastable && head != inputlth)) { + fprintf(stderr, "Input file: bad length\n"); + exit(1); + } + do_loadfont(fd, inbuf + head0, unit, fontsize); + if (hastable) + do_loadtable(fd, inbuf + head, inputlth - head, fontsize); + return; } - no_psf: + no_psf: /* file with three code pages? */ if (inputlth == 9780) { - offset = 40; - unit = 16; + offset = 40; + unit = 16; } else { - /* bare font */ - if (inputlth & 0377) { - fprintf(stderr, "Bad input file size\n"); - exit(1); - } - offset = 0; - unit = inputlth/256; + /* bare font */ + if (inputlth & 0377) { + fprintf(stderr, "Bad input file size\n"); + exit(1); + } + offset = 0; + unit = inputlth / 256; } - do_loadfont(fd, inbuf+offset, unit, 256); + do_loadfont(fd, inbuf + offset, unit, 256); } diff --git a/loadkmap.c b/loadkmap.c index a228ca460..aa4f6bbc8 100644 --- a/loadkmap.c +++ b/loadkmap.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini loadkmap implementation for busybox * @@ -29,61 +30,63 @@ static const char loadkmap_usage[] = "loadkmap\n" -"\n" -"\tLoad a binary keyboard translation table from standard input.\n" -"\n"; + "\n" + "\tLoad a binary keyboard translation table from standard input.\n" + "\n"; -int -loadkmap_main(int argc, char * * argv) -{ - struct kbentry ke; - u_short *ibuff; - int i,j,fd,readsz,pos,ibuffsz=NR_KEYS * sizeof(u_short); - char flags[MAX_NR_KEYMAPS],magic[]="bkeymap",buff[7]; - fd = open("/dev/tty0", O_RDWR); - if (fd < 0) { - fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno)); - return 1; - } +int loadkmap_main(int argc, char **argv) +{ + struct kbentry ke; + u_short *ibuff; + int i, j, fd, readsz, pos, ibuffsz = NR_KEYS * sizeof(u_short); + char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap", buff[7]; - read(0,buff,7); - if (0 != strncmp(buff,magic,7)) { - fprintf(stderr, "This is not a valid binary keymap.\n"); - return 1; - } - - if ( MAX_NR_KEYMAPS != read(0,flags,MAX_NR_KEYMAPS) ) { - fprintf(stderr, "Error reading keymap flags: %s\n", strerror(errno)); - return 1; - } + fd = open("/dev/tty0", O_RDWR); + if (fd < 0) { + fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno)); + return 1; + } + + read(0, buff, 7); + if (0 != strncmp(buff, magic, 7)) { + fprintf(stderr, "This is not a valid binary keymap.\n"); + return 1; + } - ibuff=(u_short *) malloc(ibuffsz); - if (!ibuff) { - fprintf(stderr, "Out of memory.\n"); - return 1; - } + if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS)) { + fprintf(stderr, "Error reading keymap flags: %s\n", + strerror(errno)); + return 1; + } + + ibuff = (u_short *) malloc(ibuffsz); + if (!ibuff) { + fprintf(stderr, "Out of memory.\n"); + return 1; + } - for(i=0; i<MAX_NR_KEYMAPS; i++) { - if (flags[i]==1){ - pos=0; - while (pos < ibuffsz) { - if ( (readsz = read(0,(char *)ibuff+pos,ibuffsz-pos)) < 0 ) { - fprintf(stderr, "Error reading keymap: %s\n", - strerror(errno)); - return 1; - } - pos += readsz; - } - for(j=0; j<NR_KEYS; j++) { - ke.kb_index = j; - ke.kb_table = i; - ke.kb_value = ibuff[j]; - ioctl(fd, KDSKBENT, &ke); - } + for (i = 0; i < MAX_NR_KEYMAPS; i++) { + if (flags[i] == 1) { + pos = 0; + while (pos < ibuffsz) { + if ((readsz = read(0, (char *) ibuff + pos, ibuffsz - pos)) + < 0) { + fprintf(stderr, "Error reading keymap: %s\n", + strerror(errno)); + return 1; + } + pos += readsz; + } + for (j = 0; j < NR_KEYS; j++) { + ke.kb_index = j; + ke.kb_table = i; + ke.kb_value = ibuff[j]; + ioctl(fd, KDSKBENT, &ke); + } + } } - } - close (fd); - return 0; + close(fd); + return 0; } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini logger implementation for busybox * @@ -39,21 +40,22 @@ */ #include <sys/syslog.h> typedef struct _code { - char *c_name; - int c_val; + char *c_name; + int c_val; } CODE; extern CODE prioritynames[]; extern CODE facilitynames[]; #endif static const char logger_usage[] = - "logger [OPTION]... [MESSAGE]\n\n" - "Write MESSAGE to the system log. If MESSAGE is '-', log stdin.\n\n" - "Options:\n" - "\t-s\tLog to stderr as well as the system log.\n" - "\t-t\tLog using the specified tag (defaults to user name).\n" - "\t-p\tEnter the message with the specified priority.\n" - "\t\tThis may be numerical or a ``facility.level'' pair.\n"; + "logger [OPTION]... [MESSAGE]\n\n" + "Write MESSAGE to the system log. If MESSAGE is '-', log stdin.\n\n" + "Options:\n" + "\t-s\tLog to stderr as well as the system log.\n" + "\t-t\tLog using the specified tag (defaults to user name).\n" + + "\t-p\tEnter the message with the specified priority.\n" + "\t\tThis may be numerical or a ``facility.level'' pair.\n"; /* Decode a symbolic name to a numeric value @@ -61,20 +63,19 @@ static const char logger_usage[] = * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. */ -static int -decode(char* name, CODE* codetab) +static int decode(char *name, CODE * codetab) { - CODE *c; + CODE *c; - if (isdigit(*name)) - return (atoi(name)); - for (c = codetab; c->c_name; c++) { - if (!strcasecmp(name, c->c_name)) { - return (c->c_val); + if (isdigit(*name)) + return (atoi(name)); + for (c = codetab; c->c_name; c++) { + if (!strcasecmp(name, c->c_name)) { + return (c->c_val); + } } - } - return (-1); + return (-1); } /* Decode a symbolic name to a numeric value @@ -82,96 +83,94 @@ decode(char* name, CODE* codetab) * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. */ -static int -pencode(char* s) +static int pencode(char *s) { - char *save; - int lev, fac=LOG_USER; - - for (save = s; *s && *s != '.'; ++s); - if (*s) { - *s = '\0'; - fac = decode(save, facilitynames); - if (fac < 0) { - fprintf(stderr, "unknown facility name: %s\n", save); - exit( FALSE); + char *save; + int lev, fac = LOG_USER; + + for (save = s; *s && *s != '.'; ++s); + if (*s) { + *s = '\0'; + fac = decode(save, facilitynames); + if (fac < 0) { + fprintf(stderr, "unknown facility name: %s\n", save); + exit(FALSE); + } + *s++ = '.'; + } else { + s = save; + } + lev = decode(s, prioritynames); + if (lev < 0) { + fprintf(stderr, "unknown priority name: %s\n", save); + exit(FALSE); } - *s++ = '.'; - } - else { - s = save; - } - lev = decode(s, prioritynames); - if (lev < 0) { - fprintf(stderr, "unknown priority name: %s\n", save); - exit( FALSE); - } - return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); + return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); } extern int logger_main(int argc, char **argv) { - int pri = LOG_USER|LOG_NOTICE; - int option = 0; - int fromStdinFlag=FALSE; - int stopLookingAtMeLikeThat=FALSE; - char *message, buf[1024], name[128]; - - /* Fill out the name string early (may be overwritten later */ - my_getpwuid(name, geteuid()); - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv)+1) == '\0') { - fromStdinFlag=TRUE; - } - stopLookingAtMeLikeThat=FALSE; - while (*(++(*argv)) && stopLookingAtMeLikeThat==FALSE) { - switch (**argv) { - case 's': - option |= LOG_PERROR; - break; - case 'p': - if (--argc == 0) { - usage(logger_usage); + int pri = LOG_USER | LOG_NOTICE; + int option = 0; + int fromStdinFlag = FALSE; + int stopLookingAtMeLikeThat = FALSE; + char *message, buf[1024], name[128]; + + /* Fill out the name string early (may be overwritten later */ + my_getpwuid(name, geteuid()); + + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + if (*((*argv) + 1) == '\0') { + fromStdinFlag = TRUE; } - pri = pencode(*(++argv)); - stopLookingAtMeLikeThat=TRUE; - break; - case 't': - if (--argc == 0) { - usage(logger_usage); + stopLookingAtMeLikeThat = FALSE; + while (*(++(*argv)) && stopLookingAtMeLikeThat == FALSE) { + switch (**argv) { + case 's': + option |= LOG_PERROR; + break; + case 'p': + if (--argc == 0) { + usage(logger_usage); + } + pri = pencode(*(++argv)); + stopLookingAtMeLikeThat = TRUE; + break; + case 't': + if (--argc == 0) { + usage(logger_usage); + } + strncpy(name, *(++argv), sizeof(name)); + stopLookingAtMeLikeThat = TRUE; + break; + default: + usage(logger_usage); + } } - strncpy(name, *(++argv), sizeof(name)); - stopLookingAtMeLikeThat=TRUE; - break; - default: - usage(logger_usage); - } } - } - if (fromStdinFlag==TRUE) { - /* read from stdin */ - int c, i=0; - while ((c = getc(stdin)) != EOF && i<sizeof(buf)) { - buf[i++]=c; - } - message=buf; - } else { - if (argc>=1) { - message = *argv; + if (fromStdinFlag == TRUE) { + /* read from stdin */ + int c, i = 0; + + while ((c = getc(stdin)) != EOF && i < sizeof(buf)) { + buf[i++] = c; + } + message = buf; } else { - fprintf(stderr, "No message\n"); - exit( FALSE); + if (argc >= 1) { + message = *argv; + } else { + fprintf(stderr, "No message\n"); + exit(FALSE); + } } - } - openlog( name, option, (pri | LOG_FACMASK)); - syslog( pri, message); - closelog(); + openlog(name, option, (pri | LOG_FACMASK)); + syslog(pri, message); + closelog(); - exit( TRUE); + exit(TRUE); } - @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini logname implementation for busybox * @@ -23,18 +24,21 @@ #include <stdio.h> static const char logname_usage[] = "logname\n\n" -"Print the name of the current user.\n"; -extern int logname_main(int argc, char **argv) { + "Print the name of the current user.\n"; + +extern int logname_main(int argc, char **argv) +{ char *cp; - if (argc > 1) usage (logname_usage); + if (argc > 1) + usage(logname_usage); - cp = getlogin (); + cp = getlogin(); if (cp) { - puts (cp); - exit (TRUE); - } - fprintf (stderr, "%s: no login name\n", argv[0]); - exit (FALSE); + puts(cp); + exit(TRUE); + } + fprintf(stderr, "%s: no login name\n", argv[0]); + exit(FALSE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * tiny-ls.c version 0.1.0: A minimalist 'ls' * Copyright (C) 1996 Brian Candler <B.Candler@pobox.com> @@ -40,18 +41,18 @@ * 1. requires lstat (BSD) - how do you do it without? */ -#define TERMINAL_WIDTH 80 /* use 79 if your terminal has linefold bug */ -#define COLUMN_WIDTH 14 /* default if AUTOWIDTH not defined */ -#define COLUMN_GAP 2 /* includes the file type char, if present */ +#define TERMINAL_WIDTH 80 /* use 79 if your terminal has linefold bug */ +#define COLUMN_WIDTH 14 /* default if AUTOWIDTH not defined */ +#define COLUMN_GAP 2 /* includes the file type char, if present */ #define HAS_REWINDDIR /************************************************************************/ #include "internal.h" #if !defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) -# include <linux/types.h> +# include <linux/types.h> #else -# include <sys/types.h> +# include <sys/types.h> #endif #include <sys/stat.h> #include <stdio.h> @@ -75,28 +76,28 @@ #endif #define FMT_AUTO 0 -#define FMT_LONG 1 /* one record per line, extended info */ -#define FMT_SINGLE 2 /* one record per line */ -#define FMT_ROWS 3 /* print across rows */ -#define FMT_COLUMNS 3 /* fill columns (same, since we don't sort) */ +#define FMT_LONG 1 /* one record per line, extended info */ +#define FMT_SINGLE 2 /* one record per line */ +#define FMT_ROWS 3 /* print across rows */ +#define FMT_COLUMNS 3 /* fill columns (same, since we don't sort) */ #define TIME_MOD 0 #define TIME_CHANGE 1 #define TIME_ACCESS 2 -#define DISP_FTYPE 1 /* show character for file type */ -#define DISP_EXEC 2 /* show '*' if regular executable file */ -#define DISP_HIDDEN 4 /* show files starting . (except . and ..) */ -#define DISP_DOT 8 /* show . and .. */ -#define DISP_NUMERIC 16 /* numeric uid and gid */ -#define DISP_FULLTIME 32 /* show extended time display */ -#define DIR_NOLIST 64 /* show directory as itself, not contents */ -#define DISP_DIRNAME 128 /* show directory name (for internal use) */ -#define DIR_RECURSE 256 /* -R (not yet implemented) */ +#define DISP_FTYPE 1 /* show character for file type */ +#define DISP_EXEC 2 /* show '*' if regular executable file */ +#define DISP_HIDDEN 4 /* show files starting . (except . and ..) */ +#define DISP_DOT 8 /* show . and .. */ +#define DISP_NUMERIC 16 /* numeric uid and gid */ +#define DISP_FULLTIME 32 /* show extended time display */ +#define DIR_NOLIST 64 /* show directory as itself, not contents */ +#define DISP_DIRNAME 128 /* show directory name (for internal use) */ +#define DIR_RECURSE 256 /* -R (not yet implemented) */ -static unsigned char display_fmt = FMT_AUTO; -static unsigned short opts = 0; -static unsigned short column = 0; +static unsigned char display_fmt = FMT_AUTO; +static unsigned short opts = 0; +static unsigned short column = 0; #ifdef BB_FEATURE_AUTOWIDTH static unsigned short terminal_width = 0, column_width = 0; @@ -113,13 +114,14 @@ static unsigned char time_fmt = TIME_MOD; static void writenum(long val, short minwidth) { - char scratch[128]; + char scratch[128]; char *p = scratch + sizeof(scratch); short len = 0; short neg = (val < 0); - - if (neg) val = -val; + + if (neg) + val = -val; do *--p = (val % 10) + '0', len++, val /= 10; while (val); @@ -142,8 +144,9 @@ static void newline(void) static void tab(short col) { static const char spaces[] = " "; - #define nspaces ((sizeof spaces)-1) /* null terminator! */ - + +#define nspaces ((sizeof spaces)-1) /* null terminator! */ + short n = col - column; if (n > 0) { @@ -155,7 +158,7 @@ static void tab(short col) /* must be 1...(sizeof spaces) left */ wr(spaces, n); } - #undef nspaces +#undef nspaces } #ifdef BB_FEATURE_LS_FILETYPES @@ -163,8 +166,8 @@ static char append_char(mode_t mode) { if (!(opts & DISP_FTYPE)) return '\0'; - if ((opts & DISP_EXEC) && S_ISREG(mode) && (mode & (S_IXUSR|S_IXGRP|S_IXOTH))) - return '*'; + if ((opts & DISP_EXEC) && S_ISREG(mode) + && (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) return '*'; return APPCHAR(mode); } #endif @@ -176,89 +179,93 @@ static char append_char(mode_t mode) ** **/ -static void list_single(const char *name, struct stat *info, const char *fullname) +static void list_single(const char *name, struct stat *info, + const char *fullname) { char scratch[PATH_MAX + 1]; short len = strlen(name); + #ifdef BB_FEATURE_LS_FILETYPES char append = append_char(info->st_mode); #endif - + if (display_fmt == FMT_LONG) { - mode_t mode = info->st_mode; + mode_t mode = info->st_mode; + newline(); wr(modeString(mode), 10); - column=10; - writenum((long)info->st_nlink,(short)5); + column = 10; + writenum((long) info->st_nlink, (short) 5); fputs(" ", stdout); #ifdef BB_FEATURE_LS_USERNAME if (!(opts & DISP_NUMERIC)) { - memset ( scratch, 0, sizeof (scratch)); - my_getpwuid( scratch, info->st_uid); + memset(scratch, 0, sizeof(scratch)); + my_getpwuid(scratch, info->st_uid); if (*scratch) { - fputs(scratch, stdout); - if ( strlen( scratch) <= 8 ) - wr(" ", 9-strlen( scratch)); - } - else { - writenum((long) info->st_uid,(short)8); + fputs(scratch, stdout); + if (strlen(scratch) <= 8) + wr(" ", 9 - strlen(scratch)); + } else { + writenum((long) info->st_uid, (short) 8); fputs(" ", stdout); } } else #endif { - writenum((long) info->st_uid,(short)8); - fputs(" ", stdout); + writenum((long) info->st_uid, (short) 8); + fputs(" ", stdout); } #ifdef BB_FEATURE_LS_USERNAME if (!(opts & DISP_NUMERIC)) { - memset ( scratch, 0, sizeof (scratch)); - my_getgrgid( scratch, info->st_gid); + memset(scratch, 0, sizeof(scratch)); + my_getgrgid(scratch, info->st_gid); if (*scratch) { - fputs(scratch, stdout); - if ( strlen( scratch) <= 8 ) - wr(" ", 8-strlen( scratch)); - } - else - writenum((long) info->st_gid,(short)8); + fputs(scratch, stdout); + if (strlen(scratch) <= 8) + wr(" ", 8 - strlen(scratch)); + } else + writenum((long) info->st_gid, (short) 8); } else #endif - writenum((long) info->st_gid,(short)8); + writenum((long) info->st_gid, (short) 8); //tab(26); if (S_ISBLK(mode) || S_ISCHR(mode)) { - writenum((long)MAJOR(info->st_rdev),(short)3); + writenum((long) MAJOR(info->st_rdev), (short) 3); fputs(", ", stdout); - writenum((long)MINOR(info->st_rdev),(short)3); - } - else - writenum((long)info->st_size,(short)8); + writenum((long) MINOR(info->st_rdev), (short) 3); + } else + writenum((long) info->st_size, (short) 8); fputs(" ", stdout); //tab(32); #ifdef BB_FEATURE_LS_TIMESTAMPS { time_t cal; char *string; - - switch(time_fmt) { + + switch (time_fmt) { case TIME_CHANGE: - cal=info->st_ctime; break; + cal = info->st_ctime; + break; case TIME_ACCESS: - cal=info->st_atime; break; + cal = info->st_atime; + break; default: - cal=info->st_mtime; break; + cal = info->st_mtime; + break; } - string=ctime(&cal); + string = ctime(&cal); if (opts & DISP_FULLTIME) - wr(string,24); + wr(string, 24); else { time_t age = time(NULL) - cal; - wr(string+4,7); /* mmm_dd_ */ - if(age < 3600L*24*365/2 && age > -15*60) + + wr(string + 4, 7); /* mmm_dd_ */ + if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) /* hh:mm if less than 6 months old */ - wr(string+11,5); + wr(string + 11, 5); else /* _yyyy otherwise */ - wr(string+19,5); + wr(string + 19, 5); } wr(" ", 1); } @@ -269,7 +276,8 @@ static void list_single(const char *name, struct stat *info, const char *fullnam if (S_ISLNK(mode)) { wr(" -> ", 4); len = readlink(fullname, scratch, sizeof scratch); - if (len > 0) fwrite(scratch, 1, len, stdout); + if (len > 0) + fwrite(scratch, 1, len, stdout); #ifdef BB_FEATURE_LS_FILETYPES /* show type of destination */ if (opts & DISP_FTYPE) { @@ -287,18 +295,17 @@ static void list_single(const char *name, struct stat *info, const char *fullnam #endif } else { static short nexttab = 0; - + /* sort out column alignment */ - if (column == 0) - ; /* nothing to do */ + if (column == 0); /* nothing to do */ else if (display_fmt == FMT_SINGLE) newline(); else { if (nexttab + column_width > terminal_width #ifndef BB_FEATURE_AUTOWIDTH - || nexttab + len >= terminal_width + || nexttab + len >= terminal_width #endif - ) + ) newline(); else tab(nexttab); @@ -336,32 +343,33 @@ static int list_item(const char *name) struct stat info; DIR *dir; struct dirent *entry; - char fullname[MAXNAMLEN+1], *fnend; - + char fullname[MAXNAMLEN + 1], *fnend; + if (lstat(name, &info)) goto listerr; - - if (!S_ISDIR(info.st_mode) || - (opts & DIR_NOLIST)) { + + if (!S_ISDIR(info.st_mode) || (opts & DIR_NOLIST)) { list_single(name, &info, name); return 0; } /* Otherwise, it's a directory we want to list the contents of */ - if (opts & DISP_DIRNAME) { /* identify the directory */ + if (opts & DISP_DIRNAME) { /* identify the directory */ if (column) wr("\n\n", 2), column = 0; wr(name, strlen(name)); wr(":\n", 2); } - + dir = opendir(name); - if (!dir) goto listerr; + if (!dir) + goto listerr; #ifdef BB_FEATURE_AUTOWIDTH column_width = 0; while ((entry = readdir(dir)) != NULL) { short w = strlen(entry->d_name); + if (column_width < w) column_width = w; } @@ -370,39 +378,40 @@ static int list_item(const char *name) #else closedir(dir); dir = opendir(name); - if (!dir) goto listerr; + if (!dir) + goto listerr; #endif #endif /* List the contents */ - - strcpy(fullname,name); /* *** ignore '.' by itself */ - fnend=fullname+strlen(fullname); + + strcpy(fullname, name); /* *** ignore '.' by itself */ + fnend = fullname + strlen(fullname); if (fnend[-1] != '/') *fnend++ = '/'; - + while ((entry = readdir(dir)) != NULL) { - const char *en=entry->d_name; + const char *en = entry->d_name; + if (en[0] == '.') { - if (!en[1] || (en[1] == '.' && !en[2])) { /* . or .. */ + if (!en[1] || (en[1] == '.' && !en[2])) { /* . or .. */ if (!(opts & DISP_DOT)) continue; - } - else if (!(opts & DISP_HIDDEN)) + } else if (!(opts & DISP_HIDDEN)) continue; } /* FIXME: avoid stat if not required */ strcpy(fnend, entry->d_name); if (lstat(fullname, &info)) - goto direrr; /* (shouldn't fail) */ + goto direrr; /* (shouldn't fail) */ list_single(entry->d_name, &info, fullname); } closedir(dir); return 0; -direrr: - closedir(dir); -listerr: + direrr: + closedir(dir); + listerr: newline(); perror(name); return 1; @@ -432,50 +441,79 @@ static const char ls_usage[] = "ls [-1a" #endif "] [filenames...]\n"; -extern int -ls_main(int argc, char * * argv) +extern int ls_main(int argc, char **argv) { - int argi=1, i; - + int argi = 1, i; + /* process options */ while (argi < argc && argv[argi][0] == '-') { const char *p = &argv[argi][1]; - - if (!*p) goto print_usage_message; /* "-" by itself not allowed */ + + if (!*p) + goto print_usage_message; /* "-" by itself not allowed */ if (*p == '-') { - if (!p[1]) { /* "--" forces end of options */ + if (!p[1]) { /* "--" forces end of options */ argi++; break; } /* it's a long option name - we don't support them */ goto print_usage_message; } - + while (*p) switch (*p++) { - case 'l': display_fmt = FMT_LONG; break; - case '1': display_fmt = FMT_SINGLE; break; - case 'x': display_fmt = FMT_ROWS; break; - case 'C': display_fmt = FMT_COLUMNS; break; + case 'l': + display_fmt = FMT_LONG; + break; + case '1': + display_fmt = FMT_SINGLE; + break; + case 'x': + display_fmt = FMT_ROWS; + break; + case 'C': + display_fmt = FMT_COLUMNS; + break; #ifdef BB_FEATURE_LS_FILETYPES - case 'p': opts |= DISP_FTYPE; break; - case 'F': opts |= DISP_FTYPE|DISP_EXEC; break; + case 'p': + opts |= DISP_FTYPE; + break; + case 'F': + opts |= DISP_FTYPE | DISP_EXEC; + break; #endif - case 'A': opts |= DISP_HIDDEN; break; - case 'a': opts |= DISP_HIDDEN|DISP_DOT; break; - case 'n': opts |= DISP_NUMERIC; break; - case 'd': opts |= DIR_NOLIST; break; + case 'A': + opts |= DISP_HIDDEN; + break; + case 'a': + opts |= DISP_HIDDEN | DISP_DOT; + break; + case 'n': + opts |= DISP_NUMERIC; + break; + case 'd': + opts |= DIR_NOLIST; + break; #ifdef FEATURE_RECURSIVE - case 'R': opts |= DIR_RECURSE; break; + case 'R': + opts |= DIR_RECURSE; + break; #endif #ifdef BB_FEATURE_LS_TIMESTAMPS - case 'u': time_fmt = TIME_ACCESS; break; - case 'c': time_fmt = TIME_CHANGE; break; - case 'e': opts |= DISP_FULLTIME; break; + case 'u': + time_fmt = TIME_ACCESS; + break; + case 'c': + time_fmt = TIME_CHANGE; + break; + case 'e': + opts |= DISP_FULLTIME; + break; #endif - default: goto print_usage_message; + default: + goto print_usage_message; } - + argi++; } @@ -483,29 +521,30 @@ ls_main(int argc, char * * argv) if (display_fmt == FMT_AUTO) display_fmt = isatty(fileno(stdout)) ? FMT_COLUMNS : FMT_SINGLE; if (argi < argc - 1) - opts |= DISP_DIRNAME; /* 2 or more items? label directories */ + opts |= DISP_DIRNAME; /* 2 or more items? label directories */ #ifdef BB_FEATURE_AUTOWIDTH /* could add a -w option and/or TIOCGWINSZ call */ - if (terminal_width < 1) terminal_width = TERMINAL_WIDTH; - + if (terminal_width < 1) + terminal_width = TERMINAL_WIDTH; + for (i = argi; i < argc; i++) { int len = strlen(argv[i]); + if (column_width < len) column_width = len; } #endif /* process files specified, or current directory if none */ - i=0; + i = 0; if (argi == argc) i = list_item("."); while (argi < argc) i |= list_item(argv[argi++]); newline(); - exit( i); + exit(i); -print_usage_message: - usage (ls_usage); - exit( FALSE); + print_usage_message: + usage(ls_usage); + exit(FALSE); } - @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini lsmod implementation for busybox * @@ -30,6 +31,7 @@ extern int lsmod_main(int argc, char **argv) { - char* cmd[] = { "cat", "/proc/modules", "\0" }; - exit(cat_main( 3, cmd)); + char *cmd[] = { "cat", "/proc/modules", "\0" }; + + exit(cat_main(3, cmd)); } diff --git a/makedevs.c b/makedevs.c index f7fbeb2fe..5948bacc8 100644 --- a/makedevs.c +++ b/makedevs.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com> * @@ -5,7 +6,7 @@ * Make ranges of device files quickly. * known bugs: can't deal with alpha ranges */ - + #include "internal.h" #include <stdio.h> #include <stdlib.h> @@ -15,60 +16,64 @@ #include <sys/types.h> #include <sys/stat.h> -static const char makedevs_usage[] = -"makedevs 0.01 -- Create an entire range of device files\n\n" -"\tmakedevs /dev/ttyS c 4 64 0 63 (ttyS0-ttyS63)\n" -"\tmakedevs /dev/hda b 3 0 0 8 s (hda,hda1-hda8)\n"; +static const char makedevs_usage[] = + "makedevs 0.01 -- Create an entire range of device files\n\n" + "\tmakedevs /dev/ttyS c 4 64 0 63 (ttyS0-ttyS63)\n" + + "\tmakedevs /dev/hda b 3 0 0 8 s (hda,hda1-hda8)\n"; -int -makedevs_main(int argc, char * * argv) +int makedevs_main(int argc, char **argv) { -const char *basedev = argv[1]; -const char *type = argv[2]; -int major = atoi(argv[3]); -int Sminor = atoi(argv[4]); -int S = atoi(argv[5]); -int E = atoi(argv[6]); -int sbase = argc == 8 ? 1 : 0; + const char *basedev = argv[1]; + const char *type = argv[2]; + int major = atoi(argv[3]); + int Sminor = atoi(argv[4]); + int S = atoi(argv[5]); + int E = atoi(argv[6]); + int sbase = argc == 8 ? 1 : 0; -mode_t mode = 0; -dev_t dev = 0; -char devname[255]; -char buf[255]; + mode_t mode = 0; + dev_t dev = 0; + char devname[255]; + char buf[255]; switch (type[0]) { - case 'c': - mode = S_IFCHR; break; - case 'b': - mode = S_IFBLK; break; - case 'f': - mode = S_IFIFO; break; - default: - usage( makedevs_usage); - } - mode |= 0660; - - while ( S <= E ) { - + case 'c': + mode = S_IFCHR; + break; + case 'b': + mode = S_IFBLK; + break; + case 'f': + mode = S_IFIFO; + break; + default: + usage(makedevs_usage); + } + mode |= 0660; + + while (S <= E) { + if (type[0] != 'f') dev = (major << 8) | Sminor; strcpy(devname, basedev); - + if (sbase == 0) { - sprintf(buf, "%d", S); + sprintf(buf, "%d", S); strcat(devname, buf); } else { sbase = 0; } - - if (mknod (devname, mode, dev)) - printf("Failed to create: %s\n", devname); - - S++; Sminor++; + + if (mknod(devname, mode, dev)) + printf("Failed to create: %s\n", devname); + + S++; + Sminor++; } -return 0; + return 0; } /* @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" #include <stdio.h> #include <stdlib.h> @@ -8,126 +9,114 @@ static const char math_usage[] = "math expression ..."; -static double stack[100]; -static unsigned int pointer; +static double stack[100]; +static unsigned int pointer; -static void -push(double a) +static void push(double a) { - if ( pointer >= (sizeof(stack) / sizeof(*stack)) ) { + if (pointer >= (sizeof(stack) / sizeof(*stack))) { fprintf(stderr, "math: stack overflow\n"); exit(-1); - } - else + } else stack[pointer++] = a; } -static double -pop() +static double pop() { - if ( pointer == 0 ) { + if (pointer == 0) { fprintf(stderr, "math: stack underflow\n"); exit(-1); } return stack[--pointer]; } -static void -add() +static void add() { push(pop() + pop()); } -static void -sub() +static void sub() { - double subtrahend = pop(); + double subtrahend = pop(); push(pop() - subtrahend); } -static void -mul() +static void mul() { push(pop() * pop()); } -static void -divide() +static void divide() { - double divisor = pop(); + double divisor = pop(); + push(pop() / divisor); } -static void -and() +static void and() { - push((unsigned int)pop() & (unsigned int)pop()); + push((unsigned int) pop() & (unsigned int) pop()); } -static void -or() +static void or() { - push((unsigned int)pop() | (unsigned int)pop()); + push((unsigned int) pop() | (unsigned int) pop()); } -static void -eor() +static void eor() { - push((unsigned int)pop() ^ (unsigned int)pop()); + push((unsigned int) pop() ^ (unsigned int) pop()); } -static void -not() +static void not() { - push(~(unsigned int)pop()); + push(~(unsigned int) pop()); } -static void -print() +static void print() { printf("%g\n", pop()); } struct op { - const char * name; - void (*function)(); + const char *name; + void (*function) (); }; -static const struct op operators[] = { - { "add", add }, - { "and", and }, - { "div", divide }, - { "eor", eor }, - { "mul", mul }, - { "not", not }, - { "or", or }, - { "sub", sub }, - { 0, 0 } +static const struct op operators[] = { + {"add", add}, + {"and", and}, + {"div", divide}, + {"eor", eor}, + {"mul", mul}, + {"not", not}, + {"or", or}, + {"sub", sub}, + {0, 0} }; -static void -stack_machine(const char * argument) +static void stack_machine(const char *argument) { - char * endPointer = 0; - double d; - const struct op * o = operators; + char *endPointer = 0; + double d; + const struct op *o = operators; - if ( argument == 0 ) { + if (argument == 0) { print(); return; } d = strtod(argument, &endPointer); - if ( endPointer != argument ) { + if (endPointer != argument) { push(d); return; } - while ( o->name != 0 ) { - if ( strcmp(o->name, argument) == 0 ) { - (*(o->function))(); + while (o->name != 0) { + if (strcmp(o->name, argument) == 0) { + (*(o->function)) (); return; } o++; @@ -136,10 +125,9 @@ stack_machine(const char * argument) exit(-1); } -int -math_main(int argc, char * * argv) +int math_main(int argc, char **argv) { - while ( argc >= 2 ) { + while (argc >= 2) { stack_machine(argv[1]); argv++; argc--; diff --git a/messages.c b/messages.c index bfbf3175b..265c5ade8 100644 --- a/messages.c +++ b/messages.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Copyright (C) 2000 by BitterSweet Enterprises, LLC. * Written by Karl M. Hegbloom <karlheg@debian.org> @@ -40,25 +41,19 @@ #if defined bb_need_name_too_long || ! defined BB_DECLARE_EXTERN BB_DEF_MESSAGE(name_too_long, "%s: file name too long\n") #endif - #if defined bb_need_omitting_directory || ! defined BB_DECLARE_EXTERN -BB_DEF_MESSAGE(omitting_directory, "%s: %s: omitting directory\n") + BB_DEF_MESSAGE(omitting_directory, "%s: %s: omitting directory\n") #endif - #if defined bb_need_not_a_directory || ! defined BB_DECLARE_EXTERN -BB_DEF_MESSAGE(not_a_directory, "%s: %s: not a directory\n") + BB_DEF_MESSAGE(not_a_directory, "%s: %s: not a directory\n") #endif - #if defined bb_need_memory_exhausted || ! defined BB_DECLARE_EXTERN -BB_DEF_MESSAGE(memory_exhausted, "%s: memory exhausted\n") + BB_DEF_MESSAGE(memory_exhausted, "%s: memory exhausted\n") #endif - #if defined bb_need_invalid_date || ! defined BB_DECLARE_EXTERN -BB_DEF_MESSAGE(invalid_date, "%s: invalid date `%s'\n") + BB_DEF_MESSAGE(invalid_date, "%s: invalid date `%s'\n") #endif - #if defined bb_need_invalid_option || ! defined BB_DECLARE_EXTERN -BB_DEF_MESSAGE(invalid_option, "%s: invalid option -- %c\n") + BB_DEF_MESSAGE(invalid_option, "%s: invalid option -- %c\n") #endif - -#endif /* _BB_MESSAGES_C */ +#endif /* _BB_MESSAGES_C */ diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c index a9e879daf..45eab8ae7 100644 --- a/miscutils/dutmp.c +++ b/miscutils/dutmp.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com> * @@ -15,37 +16,38 @@ #include <utmp.h> static const char dutmp_usage[] = "dutmp\n" - "\n" - "\tDump file or stdin utmp file format to stdout, pipe delimited.\n" - "\tdutmp /var/run/utmp\n"; + "\n" -extern int dutmp_main (int argc, char **argv) + "\tDump file or stdin utmp file format to stdout, pipe delimited.\n" + "\tdutmp /var/run/utmp\n"; + +extern int dutmp_main(int argc, char **argv) { - FILE *f = stdin; - struct utmp ut; - - if ((argc < 2) || (**(argv + 1) == '-')) { - usage( dutmp_usage); - } - - if ( **(++argv) == 0 ) { - f = fopen (*(++argv), "r"); - if (f < 0 ) { - perror (*argv); - exit (FALSE); - } - } - - while (fread (&ut, 1, sizeof (struct utmp), f)) { - // printf("%d:%d:%s:%s:%s:%s:%d:%d:%ld:%ld:%ld:%x\n", - printf ("%d|%d|%s|%s|%s|%s|%d|%d|%ld|%ld|%ld|%x\n", - ut.ut_type, ut.ut_pid, ut.ut_line, - ut.ut_id, ut.ut_user, ut.ut_host, - ut.ut_exit.e_termination, ut.ut_exit.e_exit, - ut.ut_session, - ut.ut_tv.tv_sec, ut.ut_tv.tv_usec, ut.ut_addr); - } - - exit (TRUE); + FILE *f = stdin; + struct utmp ut; + + if ((argc < 2) || (**(argv + 1) == '-')) { + usage(dutmp_usage); + } + + if (**(++argv) == 0) { + f = fopen(*(++argv), "r"); + if (f < 0) { + perror(*argv); + exit(FALSE); + } + } + + while (fread(&ut, 1, sizeof(struct utmp), f)) { + // printf("%d:%d:%s:%s:%s:%s:%d:%d:%ld:%ld:%ld:%x\n", + printf("%d|%d|%s|%s|%s|%s|%d|%d|%ld|%ld|%ld|%x\n", + ut.ut_type, ut.ut_pid, ut.ut_line, + ut.ut_id, ut.ut_user, ut.ut_host, + ut.ut_exit.e_termination, ut.ut_exit.e_exit, + ut.ut_session, + ut.ut_tv.tv_sec, ut.ut_tv.tv_usec, ut.ut_addr); + } + + exit(TRUE); } diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index f7fbeb2fe..5948bacc8 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com> * @@ -5,7 +6,7 @@ * Make ranges of device files quickly. * known bugs: can't deal with alpha ranges */ - + #include "internal.h" #include <stdio.h> #include <stdlib.h> @@ -15,60 +16,64 @@ #include <sys/types.h> #include <sys/stat.h> -static const char makedevs_usage[] = -"makedevs 0.01 -- Create an entire range of device files\n\n" -"\tmakedevs /dev/ttyS c 4 64 0 63 (ttyS0-ttyS63)\n" -"\tmakedevs /dev/hda b 3 0 0 8 s (hda,hda1-hda8)\n"; +static const char makedevs_usage[] = + "makedevs 0.01 -- Create an entire range of device files\n\n" + "\tmakedevs /dev/ttyS c 4 64 0 63 (ttyS0-ttyS63)\n" + + "\tmakedevs /dev/hda b 3 0 0 8 s (hda,hda1-hda8)\n"; -int -makedevs_main(int argc, char * * argv) +int makedevs_main(int argc, char **argv) { -const char *basedev = argv[1]; -const char *type = argv[2]; -int major = atoi(argv[3]); -int Sminor = atoi(argv[4]); -int S = atoi(argv[5]); -int E = atoi(argv[6]); -int sbase = argc == 8 ? 1 : 0; + const char *basedev = argv[1]; + const char *type = argv[2]; + int major = atoi(argv[3]); + int Sminor = atoi(argv[4]); + int S = atoi(argv[5]); + int E = atoi(argv[6]); + int sbase = argc == 8 ? 1 : 0; -mode_t mode = 0; -dev_t dev = 0; -char devname[255]; -char buf[255]; + mode_t mode = 0; + dev_t dev = 0; + char devname[255]; + char buf[255]; switch (type[0]) { - case 'c': - mode = S_IFCHR; break; - case 'b': - mode = S_IFBLK; break; - case 'f': - mode = S_IFIFO; break; - default: - usage( makedevs_usage); - } - mode |= 0660; - - while ( S <= E ) { - + case 'c': + mode = S_IFCHR; + break; + case 'b': + mode = S_IFBLK; + break; + case 'f': + mode = S_IFIFO; + break; + default: + usage(makedevs_usage); + } + mode |= 0660; + + while (S <= E) { + if (type[0] != 'f') dev = (major << 8) | Sminor; strcpy(devname, basedev); - + if (sbase == 0) { - sprintf(buf, "%d", S); + sprintf(buf, "%d", S); strcat(devname, buf); } else { sbase = 0; } - - if (mknod (devname, mode, dev)) - printf("Failed to create: %s\n", devname); - - S++; Sminor++; + + if (mknod(devname, mode, dev)) + printf("Failed to create: %s\n", devname); + + S++; + Sminor++; } -return 0; + return 0; } /* diff --git a/miscutils/mt.c b/miscutils/mt.c index 7168ef7ac..9791b64b2 100644 --- a/miscutils/mt.c +++ b/miscutils/mt.c @@ -1,97 +1,97 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" #include <stdio.h> #include <sys/mtio.h> #include <sys/fcntl.h> -static const char mt_usage[] = "mt [-f device] opcode value\n"; +static const char mt_usage[] = "mt [-f device] opcode value\n"; struct mt_opcodes { - char * name; - short value; + char *name; + short value; }; /* missing: eod/seod, stoptions, stwrthreshold, densities */ -static const struct mt_opcodes opcodes[] = { - { "bsf", MTBSF }, - { "bsfm", MTBSFM }, - { "bsr", MTBSR }, - { "bss", MTBSS }, - { "datacompression", MTCOMPRESSION }, - { "eom", MTEOM }, - { "erase", MTERASE }, - { "fsf", MTFSF }, - { "fsfm", MTFSFM }, - { "fsr", MTFSR }, - { "fss", MTFSS }, - { "load", MTLOAD }, - { "lock", MTLOCK }, - { "mkpart", MTMKPART }, - { "nop", MTNOP }, - { "offline",MTOFFL }, - { "rewoffline",MTOFFL }, - { "ras1", MTRAS1 }, - { "ras2", MTRAS2 }, - { "ras3", MTRAS3 }, - { "reset", MTRESET }, - { "retension", MTRETEN }, - { "rew", MTREW }, - { "seek", MTSEEK }, - { "setblk", MTSETBLK }, - { "setdensity", MTSETDENSITY }, - { "drvbuffer", MTSETDRVBUFFER }, - { "setpart", MTSETPART }, - { "tell", MTTELL }, - { "wset", MTWSM }, - { "unload", MTUNLOAD }, - { "unlock", MTUNLOCK }, - { "eof", MTWEOF }, - { "weof", MTWEOF }, - { 0, 0 } +static const struct mt_opcodes opcodes[] = { + {"bsf", MTBSF}, + {"bsfm", MTBSFM}, + {"bsr", MTBSR}, + {"bss", MTBSS}, + {"datacompression", MTCOMPRESSION}, + {"eom", MTEOM}, + {"erase", MTERASE}, + {"fsf", MTFSF}, + {"fsfm", MTFSFM}, + {"fsr", MTFSR}, + {"fss", MTFSS}, + {"load", MTLOAD}, + {"lock", MTLOCK}, + {"mkpart", MTMKPART}, + {"nop", MTNOP}, + {"offline", MTOFFL}, + {"rewoffline", MTOFFL}, + {"ras1", MTRAS1}, + {"ras2", MTRAS2}, + {"ras3", MTRAS3}, + {"reset", MTRESET}, + {"retension", MTRETEN}, + {"rew", MTREW}, + {"seek", MTSEEK}, + {"setblk", MTSETBLK}, + {"setdensity", MTSETDENSITY}, + {"drvbuffer", MTSETDRVBUFFER}, + {"setpart", MTSETPART}, + {"tell", MTTELL}, + {"wset", MTWSM}, + {"unload", MTUNLOAD}, + {"unlock", MTUNLOCK}, + {"eof", MTWEOF}, + {"weof", MTWEOF}, + {0, 0} }; -extern int -mt_main(int argc, char** argv) +extern int mt_main(int argc, char **argv) { - const char * file = "/dev/tape"; - const struct mt_opcodes * code = opcodes; - struct mtop op; - int fd; - - if ( strcmp(argv[1], "-f") == 0 ) { - if ( argc < 4 ) { - usage (mt_usage); + const char *file = "/dev/tape"; + const struct mt_opcodes *code = opcodes; + struct mtop op; + int fd; + + if (strcmp(argv[1], "-f") == 0) { + if (argc < 4) { + usage(mt_usage); } file = argv[2]; argv += 2; argc -= 2; } - while ( code->name != 0 ) { - if ( strcmp(code->name, argv[1]) == 0 ) + while (code->name != 0) { + if (strcmp(code->name, argv[1]) == 0) break; code++; } - if ( code->name == 0 ) { + if (code->name == 0) { fprintf(stderr, "mt: unrecognized opcode %s.\n", argv[1]); - return( FALSE); + return (FALSE); } op.mt_op = code->value; - if ( argc >= 3 ) - op.mt_count = atoi(argv[2]); + if (argc >= 3) + op.mt_count = atoi(argv[2]); else - op.mt_count = 1; /* One, not zero, right? */ + op.mt_count = 1; /* One, not zero, right? */ - if ( (fd = open(file, O_RDONLY, 0)) < 0 ) { + if ((fd = open(file, O_RDONLY, 0)) < 0) { perror(file); - return( FALSE); + return (FALSE); } - if ( ioctl(fd, MTIOCTOP, &op) != 0 ) { + if (ioctl(fd, MTIOCTOP, &op) != 0) { perror(file); - return( FALSE); + return (FALSE); } - return( TRUE); + return (TRUE); } diff --git a/miscutils/update.c b/miscutils/update.c index 5a7c755ff..fef188bba 100644 --- a/miscutils/update.c +++ b/miscutils/update.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini update implementation for busybox * @@ -27,20 +28,19 @@ #include <sys/kdaemon.h> #else _syscall2(int, bdflush, int, func, int, data); -#endif /* __GLIBC__ */ +#endif /* __GLIBC__ */ -extern int -update_main(int argc, char** argv) +extern int update_main(int argc, char **argv) { /* * Update is actually two daemons, bdflush and update. */ - int pid; + int pid; pid = fork(); - if ( pid < 0 ) + if (pid < 0) return pid; - else if ( pid == 0 ) { + else if (pid == 0) { /* * This is no longer necessary since 1.3.5x, but it will harmlessly * exit if that is the case. @@ -52,11 +52,11 @@ update_main(int argc, char** argv) _exit(0); } pid = fork(); - if ( pid < 0 ) + if (pid < 0) return pid; - else if ( pid == 0 ) { + else if (pid == 0) { argv[0] = "update"; - for ( ; ; ) { + for (;;) { sync(); sleep(30); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini mkdir implementation for busybox * @@ -28,14 +29,15 @@ #include <stdio.h> #include <errno.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ static const char mkdir_usage[] = -"mkdir [OPTION] DIRECTORY...\n\n" -"Create the DIRECTORY(ies), if they do not already exist\n\n" -"Options:\n" -"\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n" -"\t-p\tno error if existing, make parent directories as needed\n"; + "mkdir [OPTION] DIRECTORY...\n\n" + "Create the DIRECTORY(ies), if they do not already exist\n\n" + "Options:\n" + + "\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n" + "\t-p\tno error if existing, make parent directories as needed\n"; static int parentFlag = FALSE; @@ -44,71 +46,70 @@ static mode_t mode = 0777; extern int mkdir_main(int argc, char **argv) { - int i = FALSE; - argc--; - argv++; + int i = FALSE; - /* Parse any options */ - while (argc > 0 && **argv == '-') { - while (i == FALSE && *++(*argv)) { - switch (**argv) { - case 'm': - if (--argc == 0) - usage( mkdir_usage); - /* Find the specified modes */ - mode = 0; - if (parse_mode(*(++argv), &mode) == FALSE ) { - fprintf(stderr, "Unknown mode: %s\n", *argv); - exit FALSE; - } - /* Set the umask for this process so it doesn't - * screw up whatever the user just entered. */ - umask(0); - i = TRUE; - break; - case 'p': - parentFlag = TRUE; - break; - default: - usage( mkdir_usage); - } - } argc--; argv++; - } - - if (argc < 1) { - usage( mkdir_usage); - } - while (argc > 0) { - int status; - struct stat statBuf; - char buf[PATH_MAX + 1]; - if (strlen(*argv) > PATH_MAX - 1) { - fprintf(stderr, name_too_long, "mkdir"); - exit FALSE; - } - strcpy (buf, *argv); - status = stat(buf, &statBuf); - if (parentFlag == FALSE && status != -1 && errno != ENOENT) { - fprintf(stderr, "%s: File exists\n", buf); - exit FALSE; - } - if (parentFlag == TRUE) { - strcat( buf, "/"); - createPath(buf, mode); + /* Parse any options */ + while (argc > 0 && **argv == '-') { + while (i == FALSE && *++(*argv)) { + switch (**argv) { + case 'm': + if (--argc == 0) + usage(mkdir_usage); + /* Find the specified modes */ + mode = 0; + if (parse_mode(*(++argv), &mode) == FALSE) { + fprintf(stderr, "Unknown mode: %s\n", *argv); + exit FALSE; + } + /* Set the umask for this process so it doesn't + * screw up whatever the user just entered. */ + umask(0); + i = TRUE; + break; + case 'p': + parentFlag = TRUE; + break; + default: + usage(mkdir_usage); + } + } + argc--; + argv++; } - else { - if (mkdir (buf, mode) != 0 && parentFlag == FALSE) { - perror(buf); - exit FALSE; - } + + if (argc < 1) { + usage(mkdir_usage); } - argc--; - argv++; - } - exit TRUE; -} + while (argc > 0) { + int status; + struct stat statBuf; + char buf[PATH_MAX + 1]; + if (strlen(*argv) > PATH_MAX - 1) { + fprintf(stderr, name_too_long, "mkdir"); + exit FALSE; + } + strcpy(buf, *argv); + status = stat(buf, &statBuf); + if (parentFlag == FALSE && status != -1 && errno != ENOENT) { + fprintf(stderr, "%s: File exists\n", buf); + exit FALSE; + } + if (parentFlag == TRUE) { + strcat(buf, "/"); + createPath(buf, mode); + } else { + if (mkdir(buf, mode) != 0 && parentFlag == FALSE) { + perror(buf); + exit FALSE; + } + } + argc--; + argv++; + } + exit TRUE; +} @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini mkfifo implementation for busybox * @@ -26,36 +27,43 @@ #include <errno.h> static const char mkfifo_usage[] = "mkfifo [OPTIONS] name\n\n" -"Create the named fifo\n\n" -"Options:\n" -"\t-m\tcreate the fifo with the specified mode; default = a=rw-umask\n"; + "Create the named fifo\n\n" + + "Options:\n" + "\t-m\tcreate the fifo with the specified mode; default = a=rw-umask\n"; extern int mkfifo_main(int argc, char **argv) { - char *thisarg; - mode_t mode = 0666; - argc--; - argv++; + char *thisarg; + mode_t mode = 0666; + + argc--; + argv++; - /* Parse any options */ - while (argc > 1) { - if (**argv != '-') usage(mkfifo_usage); - thisarg = *argv; thisarg++; - switch (*thisarg) { - case 'm': - argc--; argv++; - parse_mode(*argv, &mode); - break; - default: - usage (mkfifo_usage); - } - argc--; argv++; - } - if (argc < 1) usage (mkfifo_usage); - if (mkfifo(*argv, mode) < 0) { - perror("mkfifo"); - exit(255); - } else { - exit(TRUE); - } + /* Parse any options */ + while (argc > 1) { + if (**argv != '-') + usage(mkfifo_usage); + thisarg = *argv; + thisarg++; + switch (*thisarg) { + case 'm': + argc--; + argv++; + parse_mode(*argv, &mode); + break; + default: + usage(mkfifo_usage); + } + argc--; + argv++; + } + if (argc < 1) + usage(mkfifo_usage); + if (mkfifo(*argv, mode) < 0) { + perror("mkfifo"); + exit(255); + } else { + exit(TRUE); + } } diff --git a/mkfs_minix.c b/mkfs_minix.c index b90d3a700..4435cb64a 100644 --- a/mkfs_minix.c +++ b/mkfs_minix.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * mkfs.c - make a linux (minix) file-system. * @@ -107,27 +108,30 @@ #define BITS_PER_BLOCK (BLOCK_SIZE<<3) -static char * program_name = "mkfs"; -static char * device_name = NULL; +static char *program_name = "mkfs"; +static char *device_name = NULL; static int DEV = -1; static long BLOCKS = 0; static int check = 0; static int badblocks = 0; -static int namelen = 30; /* default (changed to 30, per Linus's - suggestion, Sun Nov 21 08:05:07 1993) */ +static int namelen = 30; /* default (changed to 30, per Linus's + + suggestion, Sun Nov 21 08:05:07 1993) */ static int dirsize = 32; static int magic = MINIX_SUPER_MAGIC2; static int version2 = 0; static char root_block[BLOCK_SIZE] = "\0"; -static char * inode_buffer = NULL; +static char *inode_buffer = NULL; + #define Inode (((struct minix_inode *) inode_buffer)-1) #ifdef HAVE_MINIX2 #define Inode2 (((struct minix2_inode *) inode_buffer)-1) #endif static char super_block_buffer[BLOCK_SIZE]; static char boot_block_buffer[512]; + #define Super (*(struct minix_super_block *)super_block_buffer) #define INODES ((unsigned long)Super.s_ninodes) #ifdef HAVE_MINIX2 @@ -164,21 +168,28 @@ static unsigned long req_nr_inodes = 0; * to compile this under minix, volatile gives a warning, as * exit() isn't defined as volatile under minix. */ -static volatile void die(char *str) { +static volatile void die(char *str) +{ fprintf(stderr, "%s: %s\n", program_name, str); exit(8); } static volatile void show_usage() { - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", BB_VER, BB_BT); - fprintf(stderr, "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n\n", program_name); + fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", + BB_VER, BB_BT); + fprintf(stderr, + "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n\n", + program_name); fprintf(stderr, "Make a MINIX filesystem.\n\n"); fprintf(stderr, "OPTIONS:\n"); fprintf(stderr, "\t-c\t\tCheck the device for bad blocks\n"); - fprintf(stderr, "\t-n [14|30]\tSpecify the maximum length of filenames\n"); - fprintf(stderr, "\t-i\t\tSpecify the number of inodes for the filesystem\n"); - fprintf(stderr, "\t-l FILENAME\tRead the bad blocks list from FILENAME\n"); + fprintf(stderr, + "\t-n [14|30]\tSpecify the maximum length of filenames\n"); + fprintf(stderr, + "\t-i\t\tSpecify the number of inodes for the filesystem\n"); + fprintf(stderr, + "\t-l FILENAME\tRead the bad blocks list from FILENAME\n"); fprintf(stderr, "\t-v\t\tMake a Minix version 2 filesystem\n\n"); exit(16); } @@ -190,56 +201,55 @@ static volatile void show_usage() */ static void check_mount(void) { - FILE * f; - struct mntent * mnt; + FILE *f; + struct mntent *mnt; - if ((f = setmntent (MOUNTED, "r")) == NULL) + if ((f = setmntent(MOUNTED, "r")) == NULL) return; - while ((mnt = getmntent (f)) != NULL) - if (strcmp (device_name, mnt->mnt_fsname) == 0) + while ((mnt = getmntent(f)) != NULL) + if (strcmp(device_name, mnt->mnt_fsname) == 0) break; - endmntent (f); + endmntent(f); if (!mnt) return; die("%s is mounted; will not make a filesystem here!"); } -static long valid_offset (int fd, int offset) +static long valid_offset(int fd, int offset) { char ch; - if (lseek (fd, offset, 0) < 0) + if (lseek(fd, offset, 0) < 0) return 0; - if (read (fd, &ch, 1) < 1) + if (read(fd, &ch, 1) < 1) return 0; return 1; } -static int count_blocks (int fd) +static int count_blocks(int fd) { int high, low; low = 0; - for (high = 1; valid_offset (fd, high); high *= 2) + for (high = 1; valid_offset(fd, high); high *= 2) low = high; - while (low < high - 1) - { + while (low < high - 1) { const int mid = (low + high) / 2; - if (valid_offset (fd, mid)) + if (valid_offset(fd, mid)) low = mid; else high = mid; } - valid_offset (fd, 0); + valid_offset(fd, 0); return (low + 1); } -static int get_size(const char *file) +static int get_size(const char *file) { - int fd; - long size; + int fd; + long size; fd = open(file, O_RDWR); if (fd < 0) { @@ -250,7 +260,7 @@ static int get_size(const char *file) close(fd); return (size * 512); } - + size = count_blocks(fd); close(fd); return size; @@ -270,18 +280,18 @@ static void write_tables(void) die("seek failed in write_tables"); if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE)) die("unable to write super-block"); - if (IMAPS*BLOCK_SIZE != write(DEV,inode_map,IMAPS*BLOCK_SIZE)) + if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE)) die("unable to write inode map"); - if (ZMAPS*BLOCK_SIZE != write(DEV,zone_map,ZMAPS*BLOCK_SIZE)) + if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE)) die("unable to write zone map"); - if (INODE_BUFFER_SIZE != write(DEV,inode_buffer,INODE_BUFFER_SIZE)) + if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE)) die("unable to write inodes"); - + } -static void write_block(int blk, char * buffer) +static void write_block(int blk, char *buffer) { - if (blk*BLOCK_SIZE != lseek(DEV, blk*BLOCK_SIZE, SEEK_SET)) + if (blk * BLOCK_SIZE != lseek(DEV, blk * BLOCK_SIZE, SEEK_SET)) die("seek failed in write_block"); if (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE)) die("write failed in write_block"); @@ -291,10 +301,10 @@ static int get_free_block(void) { int blk; - if (used_good_blocks+1 >= MAX_GOOD_BLOCKS) + if (used_good_blocks + 1 >= MAX_GOOD_BLOCKS) die("too many bad blocks"); if (used_good_blocks) - blk = good_blocks_table[used_good_blocks-1]+1; + blk = good_blocks_table[used_good_blocks - 1] + 1; else blk = FIRSTZONE; while (blk < ZONES && zone_in_use(blk)) @@ -310,14 +320,14 @@ static void mark_good_blocks(void) { int blk; - for (blk=0 ; blk < used_good_blocks ; blk++) + for (blk = 0; blk < used_good_blocks; blk++) mark_zone(good_blocks_table[blk]); } inline int next(int zone) { if (!zone) - zone = FIRSTZONE-1; + zone = FIRSTZONE - 1; while (++zone < ZONES) if (zone_in_use(zone)) return zone; @@ -326,11 +336,11 @@ inline int next(int zone) static void make_bad_inode(void) { - struct minix_inode * inode = &Inode[MINIX_BAD_INO]; - int i,j,zone; - int ind=0,dind=0; - unsigned short ind_block[BLOCK_SIZE>>1]; - unsigned short dind_block[BLOCK_SIZE>>1]; + struct minix_inode *inode = &Inode[MINIX_BAD_INO]; + int i, j, zone; + int ind = 0, dind = 0; + unsigned short ind_block[BLOCK_SIZE >> 1]; + unsigned short dind_block[BLOCK_SIZE >> 1]; #define NEXT_BAD (zone = next(zone)) @@ -340,34 +350,34 @@ static void make_bad_inode(void) inode->i_nlinks = 1; inode->i_time = time(NULL); inode->i_mode = S_IFREG + 0000; - inode->i_size = badblocks*BLOCK_SIZE; + inode->i_size = badblocks * BLOCK_SIZE; zone = next(0); - for (i=0 ; i<7 ; i++) { + for (i = 0; i < 7; i++) { inode->i_zone[i] = zone; if (!NEXT_BAD) goto end_bad; } inode->i_zone[7] = ind = get_free_block(); - memset(ind_block,0,BLOCK_SIZE); - for (i=0 ; i<512 ; i++) { + memset(ind_block, 0, BLOCK_SIZE); + for (i = 0; i < 512; i++) { ind_block[i] = zone; if (!NEXT_BAD) goto end_bad; } inode->i_zone[8] = dind = get_free_block(); - memset(dind_block,0,BLOCK_SIZE); - for (i=0 ; i<512 ; i++) { - write_block(ind,(char *) ind_block); + memset(dind_block, 0, BLOCK_SIZE); + for (i = 0; i < 512; i++) { + write_block(ind, (char *) ind_block); dind_block[i] = ind = get_free_block(); - memset(ind_block,0,BLOCK_SIZE); - for (j=0 ; j<512 ; j++) { + memset(ind_block, 0, BLOCK_SIZE); + for (j = 0; j < 512; j++) { ind_block[j] = zone; if (!NEXT_BAD) goto end_bad; } } die("too many bad blocks"); -end_bad: + end_bad: if (ind) write_block(ind, (char *) ind_block); if (dind) @@ -375,8 +385,7 @@ end_bad: } #ifdef HAVE_MINIX2 -static void -make_bad_inode2 (void) +static void make_bad_inode2(void) { struct minix2_inode *inode = &Inode2[MINIX_BAD_INO]; int i, j, zone; @@ -386,30 +395,30 @@ make_bad_inode2 (void) if (!badblocks) return; - mark_inode (MINIX_BAD_INO); + mark_inode(MINIX_BAD_INO); inode->i_nlinks = 1; - inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL); + inode->i_atime = inode->i_mtime = inode->i_ctime = time(NULL); inode->i_mode = S_IFREG + 0000; inode->i_size = badblocks * BLOCK_SIZE; - zone = next (0); + zone = next(0); for (i = 0; i < 7; i++) { inode->i_zone[i] = zone; if (!NEXT_BAD) goto end_bad; } - inode->i_zone[7] = ind = get_free_block (); - memset (ind_block, 0, BLOCK_SIZE); + inode->i_zone[7] = ind = get_free_block(); + memset(ind_block, 0, BLOCK_SIZE); for (i = 0; i < 256; i++) { ind_block[i] = zone; if (!NEXT_BAD) goto end_bad; } - inode->i_zone[8] = dind = get_free_block (); - memset (dind_block, 0, BLOCK_SIZE); + inode->i_zone[8] = dind = get_free_block(); + memset(dind_block, 0, BLOCK_SIZE); for (i = 0; i < 256; i++) { - write_block (ind, (char *) ind_block); - dind_block[i] = ind = get_free_block (); - memset (ind_block, 0, BLOCK_SIZE); + write_block(ind, (char *) ind_block); + dind_block[i] = ind = get_free_block(); + memset(ind_block, 0, BLOCK_SIZE); for (j = 0; j < 256; j++) { ind_block[j] = zone; if (!NEXT_BAD) @@ -417,47 +426,46 @@ make_bad_inode2 (void) } } /* Could make triple indirect block here */ - die ("too many bad blocks"); - end_bad: + die("too many bad blocks"); + end_bad: if (ind) - write_block (ind, (char *) ind_block); + write_block(ind, (char *) ind_block); if (dind) - write_block (dind, (char *) dind_block); + write_block(dind, (char *) dind_block); } #endif static void make_root_inode(void) { - struct minix_inode * inode = &Inode[MINIX_ROOT_INO]; + struct minix_inode *inode = &Inode[MINIX_ROOT_INO]; mark_inode(MINIX_ROOT_INO); inode->i_zone[0] = get_free_block(); inode->i_nlinks = 2; inode->i_time = time(NULL); if (badblocks) - inode->i_size = 3*dirsize; + inode->i_size = 3 * dirsize; else { - root_block[2*dirsize] = '\0'; - root_block[2*dirsize+1] = '\0'; - inode->i_size = 2*dirsize; + root_block[2 * dirsize] = '\0'; + root_block[2 * dirsize + 1] = '\0'; + inode->i_size = 2 * dirsize; } inode->i_mode = S_IFDIR + 0755; inode->i_uid = getuid(); if (inode->i_uid) inode->i_gid = getgid(); - write_block(inode->i_zone[0],root_block); + write_block(inode->i_zone[0], root_block); } #ifdef HAVE_MINIX2 -static void -make_root_inode2 (void) +static void make_root_inode2(void) { struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO]; - mark_inode (MINIX_ROOT_INO); - inode->i_zone[0] = get_free_block (); + mark_inode(MINIX_ROOT_INO); + inode->i_zone[0] = get_free_block(); inode->i_nlinks = 2; - inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL); + inode->i_atime = inode->i_mtime = inode->i_ctime = time(NULL); if (badblocks) inode->i_size = 3 * dirsize; else { @@ -469,7 +477,7 @@ make_root_inode2 (void) inode->i_uid = getuid(); if (inode->i_uid) inode->i_gid = getgid(); - write_block (inode->i_zone[0], root_block); + write_block(inode->i_zone[0], root_block); } #endif @@ -478,34 +486,38 @@ static void setup_tables(void) int i; unsigned long inodes; - memset(super_block_buffer,0,BLOCK_SIZE); - memset(boot_block_buffer,0,512); + memset(super_block_buffer, 0, BLOCK_SIZE); + memset(boot_block_buffer, 0, 512); MAGIC = magic; ZONESIZE = 0; - MAXSIZE = version2 ? 0x7fffffff : (7+512+512*512)*1024; + MAXSIZE = version2 ? 0x7fffffff : (7 + 512 + 512 * 512) * 1024; ZONES = BLOCKS; /* some magic nrs: 1 inode / 3 blocks */ - if ( req_nr_inodes == 0 ) - inodes = BLOCKS/3; + if (req_nr_inodes == 0) + inodes = BLOCKS / 3; else inodes = req_nr_inodes; /* Round up inode count to fill block size */ #ifdef HAVE_MINIX2 if (version2) inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) & - ~(MINIX2_INODES_PER_BLOCK - 1)); + ~(MINIX2_INODES_PER_BLOCK - 1)); else #endif inodes = ((inodes + MINIX_INODES_PER_BLOCK - 1) & - ~(MINIX_INODES_PER_BLOCK - 1)); + ~(MINIX_INODES_PER_BLOCK - 1)); if (inodes > 65535) inodes = 65535; INODES = inodes; - IMAPS = UPPER(INODES + 1,BITS_PER_BLOCK); + IMAPS = UPPER(INODES + 1, BITS_PER_BLOCK); ZMAPS = 0; - i=0; - while (ZMAPS != UPPER(BLOCKS - (2+IMAPS+ZMAPS+INODE_BLOCKS) + 1,BITS_PER_BLOCK) && i<1000) { - ZMAPS = UPPER(BLOCKS - (2+IMAPS+ZMAPS+INODE_BLOCKS) + 1,BITS_PER_BLOCK); + i = 0; + while (ZMAPS != + UPPER(BLOCKS - (2 + IMAPS + ZMAPS + INODE_BLOCKS) + 1, + BITS_PER_BLOCK) && i < 1000) { + ZMAPS = + UPPER(BLOCKS - (2 + IMAPS + ZMAPS + INODE_BLOCKS) + 1, + BITS_PER_BLOCK); i++; } /* Real bad hack but overwise mkfs.minix can be thrown @@ -514,50 +526,51 @@ static void setup_tables(void) * dd if=/dev/zero of=test.fs count=10 bs=1024 * /sbin/mkfs.minix -i 200 test.fs * */ - if (i>=999) { - die ("unable to allocate buffers for maps"); + if (i >= 999) { + die("unable to allocate buffers for maps"); } FIRSTZONE = NORM_FIRSTZONE; inode_map = malloc(IMAPS * BLOCK_SIZE); zone_map = malloc(ZMAPS * BLOCK_SIZE); if (!inode_map || !zone_map) die("unable to allocate buffers for maps"); - memset(inode_map,0xff,IMAPS * BLOCK_SIZE); - memset(zone_map,0xff,ZMAPS * BLOCK_SIZE); - for (i = FIRSTZONE ; i<ZONES ; i++) + memset(inode_map, 0xff, IMAPS * BLOCK_SIZE); + memset(zone_map, 0xff, ZMAPS * BLOCK_SIZE); + for (i = FIRSTZONE; i < ZONES; i++) unmark_zone(i); - for (i = MINIX_ROOT_INO ; i<=INODES ; i++) + for (i = MINIX_ROOT_INO; i <= INODES; i++) unmark_inode(i); inode_buffer = malloc(INODE_BUFFER_SIZE); if (!inode_buffer) die("unable to allocate buffer for inodes"); - memset(inode_buffer,0,INODE_BUFFER_SIZE); - printf("%ld inodes\n",INODES); - printf("%ld blocks\n",ZONES); - printf("Firstdatazone=%ld (%ld)\n",FIRSTZONE,NORM_FIRSTZONE); - printf("Zonesize=%d\n",BLOCK_SIZE<<ZONESIZE); - printf("Maxsize=%ld\n\n",MAXSIZE); + memset(inode_buffer, 0, INODE_BUFFER_SIZE); + printf("%ld inodes\n", INODES); + printf("%ld blocks\n", ZONES); + printf("Firstdatazone=%ld (%ld)\n", FIRSTZONE, NORM_FIRSTZONE); + printf("Zonesize=%d\n", BLOCK_SIZE << ZONESIZE); + printf("Maxsize=%ld\n\n", MAXSIZE); } /* * Perform a test of a block; return the number of * blocks readable/writeable. */ -long do_check(char * buffer, int try, unsigned int current_block) +long do_check(char *buffer, int try, unsigned int current_block) { long got; - + /* Seek to the correct loc. */ if (lseek(DEV, current_block * BLOCK_SIZE, SEEK_SET) != - current_block * BLOCK_SIZE ) { - die("seek failed during testing of blocks"); + current_block * BLOCK_SIZE) { + die("seek failed during testing of blocks"); } /* Try the read */ got = read(DEV, buffer, try * BLOCK_SIZE); - if (got < 0) got = 0; - if (got & (BLOCK_SIZE - 1 )) { + if (got < 0) + got = 0; + if (got & (BLOCK_SIZE - 1)) { printf("Weird values in do_check: probably bugs\n"); } got /= BLOCK_SIZE; @@ -570,7 +583,7 @@ static void alarm_intr(int alnum) { if (currently_testing >= ZONES) return; - signal(SIGALRM,alarm_intr); + signal(SIGALRM, alarm_intr); alarm(5); if (!currently_testing) return; @@ -580,19 +593,19 @@ static void alarm_intr(int alnum) static void check_blocks(void) { - int try,got; + int try, got; static char buffer[BLOCK_SIZE * TEST_BUFFER_BLOCKS]; - currently_testing=0; - signal(SIGALRM,alarm_intr); + currently_testing = 0; + signal(SIGALRM, alarm_intr); alarm(5); while (currently_testing < ZONES) { - if (lseek(DEV,currently_testing*BLOCK_SIZE,SEEK_SET) != - currently_testing*BLOCK_SIZE) + if (lseek(DEV, currently_testing * BLOCK_SIZE, SEEK_SET) != + currently_testing * BLOCK_SIZE) die("seek failed in check_blocks"); try = TEST_BUFFER_BLOCKS; if (currently_testing + try > ZONES) - try = ZONES-currently_testing; + try = ZONES - currently_testing; got = do_check(buffer, try, currently_testing); currently_testing += got; if (got == try) @@ -613,139 +626,141 @@ static void get_list_blocks(filename) char *filename; { - FILE *listfile; - unsigned long blockno; - - listfile=fopen(filename,"r"); - if(listfile == (FILE *)NULL) { - die("can't open file of bad blocks"); - } - while(!feof(listfile)) { - fscanf(listfile,"%ld\n", &blockno); - mark_zone(blockno); - badblocks++; - } - if(badblocks > 1) - printf("%d bad blocks\n", badblocks); - else if (badblocks == 1) - printf("one bad block\n"); + FILE *listfile; + unsigned long blockno; + + listfile = fopen(filename, "r"); + if (listfile == (FILE *) NULL) { + die("can't open file of bad blocks"); + } + while (!feof(listfile)) { + fscanf(listfile, "%ld\n", &blockno); + mark_zone(blockno); + badblocks++; + } + if (badblocks > 1) + printf("%d bad blocks\n", badblocks); + else if (badblocks == 1) + printf("one bad block\n"); } -extern int -mkfs_minix_main(int argc, char ** argv) +extern int mkfs_minix_main(int argc, char **argv) { - int i; - char * tmp; - struct stat statbuf; - char * listfile = NULL; - - if (argc && *argv) - program_name = *argv; - if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad inode size"); + int i; + char *tmp; + struct stat statbuf; + char *listfile = NULL; + + if (argc && *argv) + program_name = *argv; + if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) + die("bad inode size"); #ifdef HAVE_MINIX2 - if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad inode size"); + if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) + die("bad inode size"); #endif - opterr = 0; - while ((i = getopt(argc, argv, "ci:l:n:v")) != EOF) - switch (i) { - case 'c': - check=1; break; - case 'i': - req_nr_inodes = (unsigned long) atol(optarg); - break; - case 'l': - listfile = optarg; break; - case 'n': - i = strtoul(optarg,&tmp,0); - if (*tmp) - show_usage(); - if (i == 14) - magic = MINIX_SUPER_MAGIC; - else if (i == 30) - magic = MINIX_SUPER_MAGIC2; - else - show_usage(); - namelen = i; - dirsize = i+2; - break; - case 'v': + opterr = 0; + while ((i = getopt(argc, argv, "ci:l:n:v")) != EOF) + switch (i) { + case 'c': + check = 1; + break; + case 'i': + req_nr_inodes = (unsigned long) atol(optarg); + break; + case 'l': + listfile = optarg; + break; + case 'n': + i = strtoul(optarg, &tmp, 0); + if (*tmp) + show_usage(); + if (i == 14) + magic = MINIX_SUPER_MAGIC; + else if (i == 30) + magic = MINIX_SUPER_MAGIC2; + else + show_usage(); + namelen = i; + dirsize = i + 2; + break; + case 'v': #ifdef HAVE_MINIX2 - version2 = 1; + version2 = 1; #else - fprintf(stderr,"%s: not compiled with minix v2 support\n",program_name,device_name); - exit(-1); + fprintf(stderr, "%s: not compiled with minix v2 support\n", + program_name, device_name); + exit(-1); #endif - break; - default: - show_usage(); - } - argc -= optind; - argv += optind; - if (argc > 0 && !device_name) { - device_name = argv[0]; - argc--; - argv++; - } - if (argc > 0) { - BLOCKS = strtol(argv[0],&tmp,0); - if (*tmp) { - printf("strtol error: number of blocks not specified"); - show_usage(); - } - } - - if (device_name && !BLOCKS) - BLOCKS = get_size (device_name) / 1024; - if (!device_name || BLOCKS<10) { - show_usage(); - } + break; + default: + show_usage(); + } + argc -= optind; + argv += optind; + if (argc > 0 && !device_name) { + device_name = argv[0]; + argc--; + argv++; + } + if (argc > 0) { + BLOCKS = strtol(argv[0], &tmp, 0); + if (*tmp) { + printf("strtol error: number of blocks not specified"); + show_usage(); + } + } + + if (device_name && !BLOCKS) + BLOCKS = get_size(device_name) / 1024; + if (!device_name || BLOCKS < 10) { + show_usage(); + } #ifdef HAVE_MINIX2 - if (version2) { - if (namelen == 14) - magic = MINIX2_SUPER_MAGIC; - else - magic = MINIX2_SUPER_MAGIC2; - } else + if (version2) { + if (namelen == 14) + magic = MINIX2_SUPER_MAGIC; + else + magic = MINIX2_SUPER_MAGIC2; + } else #endif - if (BLOCKS > 65535) - BLOCKS = 65535; - check_mount(); /* is it already mounted? */ - tmp = root_block; - *(short *)tmp = 1; - strcpy(tmp+2,"."); - tmp += dirsize; - *(short *)tmp = 1; - strcpy(tmp+2,".."); - tmp += dirsize; - *(short *)tmp = 2; - strcpy(tmp+2,".badblocks"); - DEV = open(device_name,O_RDWR ); - if (DEV<0) - die("unable to open %s"); - if (fstat(DEV,&statbuf)<0) - die("unable to stat %s"); - if (!S_ISBLK(statbuf.st_mode)) - check=0; - else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) - die("will not try to make filesystem on '%s'"); - setup_tables(); - if (check) - check_blocks(); - else if (listfile) - get_list_blocks(listfile); + if (BLOCKS > 65535) + BLOCKS = 65535; + check_mount(); /* is it already mounted? */ + tmp = root_block; + *(short *) tmp = 1; + strcpy(tmp + 2, "."); + tmp += dirsize; + *(short *) tmp = 1; + strcpy(tmp + 2, ".."); + tmp += dirsize; + *(short *) tmp = 2; + strcpy(tmp + 2, ".badblocks"); + DEV = open(device_name, O_RDWR); + if (DEV < 0) + die("unable to open %s"); + if (fstat(DEV, &statbuf) < 0) + die("unable to stat %s"); + if (!S_ISBLK(statbuf.st_mode)) + check = 0; + else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) + die("will not try to make filesystem on '%s'"); + setup_tables(); + if (check) + check_blocks(); + else if (listfile) + get_list_blocks(listfile); #ifdef HAVE_MINIX2 - if (version2) { - make_root_inode2 (); - make_bad_inode2 (); - } else + if (version2) { + make_root_inode2(); + make_bad_inode2(); + } else #endif - { - make_root_inode(); - make_bad_inode(); - } - mark_good_blocks(); - write_tables(); - return 0; + { + make_root_inode(); + make_bad_inode(); + } + mark_good_blocks(); + write_tables(); + return 0; } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini mknod implementation for busybox * @@ -28,22 +29,22 @@ #include <unistd.h> static const char mknod_usage[] = "mknod NAME TYPE MAJOR MINOR\n\n" -"Make block or character special files.\n\n" -"TYPEs include:\n" -"\tb:\tMake a block (buffered) device.\n" -"\tc or u:\tMake a character (un-buffered) device.\n" -"\tp:\tMake a named pipe. Major and minor are ignored for named pipes.\n"; + "Make block or character special files.\n\n" + "TYPEs include:\n" + "\tb:\tMake a block (buffered) device.\n" -int -mknod_main(int argc, char** argv) + "\tc or u:\tMake a character (un-buffered) device.\n" + "\tp:\tMake a named pipe. Major and minor are ignored for named pipes.\n"; + +int mknod_main(int argc, char **argv) { - mode_t mode = 0; - dev_t dev = 0; + mode_t mode = 0; + dev_t dev = 0; - if ( argc != 5 || **(argv+1) == '-' ) { - usage (mknod_usage); + if (argc != 5 || **(argv + 1) == '-') { + usage(mknod_usage); } - switch(argv[2][0]) { + switch (argv[2][0]) { case 'c': case 'u': mode = S_IFCHR; @@ -55,21 +56,21 @@ mknod_main(int argc, char** argv) mode = S_IFIFO; break; default: - usage (mknod_usage); + usage(mknod_usage); } - if ( mode == S_IFCHR || mode == S_IFBLK ) { + if (mode == S_IFCHR || mode == S_IFBLK) { dev = (atoi(argv[3]) << 8) | atoi(argv[4]); - if ( argc != 5 ) { - usage (mknod_usage); + if (argc != 5) { + usage(mknod_usage); } } mode |= 0666; - if ( mknod(argv[1], mode, dev) != 0 ) { + if (mknod(argv[1], mode, dev) != 0) { perror(argv[1]); - return( FALSE); + return (FALSE); } - return( TRUE); + return (TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * mkswap.c - set up a linux swap device * @@ -40,20 +41,21 @@ #include <string.h> #include <fcntl.h> #include <stdlib.h> -#include <sys/ioctl.h> /* for _IO */ +#include <sys/ioctl.h> /* for _IO */ #include <sys/utsname.h> #include <sys/stat.h> -#include <asm/page.h> /* for PAGE_SIZE and PAGE_SHIFT */ +#include <asm/page.h> /* for PAGE_SIZE and PAGE_SHIFT */ /* we also get PAGE_SIZE via getpagesize() */ -static const char mkswap_usage[] = "mkswap [-c] [-v0|-v1] device [block-count]\n\n" -"Prepare a disk partition to be used as a swap partition.\n\n" -"Options:\n" -"\t-c\t\tCheck for read-ability.\n" -"\t-v0\t\tMake version 0 swap [max 128 Megs].\n" -"\t-v1\t\tMake version 1 swap [big!] (default for kernels > 2.1.117).\n" -"\tblock-count\tNumber of block to use (default is entire partition).\n"; +static const char mkswap_usage[] = + "mkswap [-c] [-v0|-v1] device [block-count]\n\n" + "Prepare a disk partition to be used as a swap partition.\n\n" + "Options:\n" "\t-c\t\tCheck for read-ability.\n" + "\t-v0\t\tMake version 0 swap [max 128 Megs].\n" + "\t-v1\t\tMake version 1 swap [big!] (default for kernels > 2.1.117).\n" + + "\tblock-count\tNumber of block to use (default is entire partition).\n"; #ifndef _IO @@ -64,8 +66,8 @@ static const char mkswap_usage[] = "mkswap [-c] [-v0|-v1] device [block-count]\n #define BLKGETSIZE _IO(0x12,96) #endif -static char * program_name = "mkswap"; -static char * device_name = NULL; +static char *program_name = "mkswap"; +static char *device_name = NULL; static int DEV = -1; static long PAGES = 0; static int check = 0; @@ -74,8 +76,8 @@ static int version = -1; #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) -static int -linux_version_code(void) { +static int linux_version_code(void) +{ struct utsname my_utsname; int p, q, r; @@ -83,7 +85,7 @@ linux_version_code(void) { p = atoi(strtok(my_utsname.release, ".")); q = atoi(strtok(NULL, ".")); r = atoi(strtok(NULL, ".")); - return MAKE_VERSION(p,q,r); + return MAKE_VERSION(p, q, r); } return 0; } @@ -98,7 +100,7 @@ static int pagesize; static int *signature_page; struct swap_header_v1 { - char bootbits[1024]; /* Space for disklabel etc. */ + char bootbits[1024]; /* Space for disklabel etc. */ unsigned int version; unsigned int last_page; unsigned int nr_badpages; @@ -106,8 +108,8 @@ struct swap_header_v1 { unsigned int badpages[1]; } *p; -static void -init_signature_page() { +static void init_signature_page() +{ pagesize = getpagesize(); #ifdef PAGE_SIZE @@ -115,15 +117,15 @@ init_signature_page() { fprintf(stderr, "Assuming pages of size %d\n", pagesize); #endif signature_page = (int *) malloc(pagesize); - memset(signature_page,0,pagesize); + memset(signature_page, 0, pagesize); p = (struct swap_header_v1 *) signature_page; } -static void -write_signature(char *sig) { +static void write_signature(char *sig) +{ char *sp = (char *) signature_page; - strncpy(sp+pagesize-10, sig, 10); + strncpy(sp + pagesize - 10, sig, 10); } #define V0_MAX_PAGES (8 * (pagesize - 10)) @@ -172,42 +174,46 @@ It is roughly 2GB on i386, PPC, m68k, ARM, 1GB on sparc, 512MB on mips, #define MAX_BADPAGES ((pagesize-1024-128*sizeof(int)-10)/sizeof(int)) -static void bit_set (unsigned int *addr, unsigned int nr) +static void bit_set(unsigned int *addr, unsigned int nr) { unsigned int r, m; addr += nr / (8 * sizeof(int)); + r = *addr; m = 1 << (nr & (8 * sizeof(int) - 1)); + *addr = r | m; } -static int bit_test_and_clear (unsigned int *addr, unsigned int nr) +static int bit_test_and_clear(unsigned int *addr, unsigned int nr) { unsigned int r, m; addr += nr / (8 * sizeof(int)); + r = *addr; m = 1 << (nr & (8 * sizeof(int) - 1)); + *addr = r & ~m; return (r & m) != 0; } -void -die(const char *str) { +void die(const char *str) +{ fprintf(stderr, "%s: %s\n", program_name, str); - exit( FALSE); + exit(FALSE); } -void -page_ok(int page) { - if (version==0) +void page_ok(int page) +{ + if (version == 0) bit_set(signature_page, page); } -void -page_bad(int page) { +void page_bad(int page) +{ if (version == 0) bit_test_and_clear(signature_page, page); else { @@ -218,8 +224,8 @@ page_bad(int page) { badpages++; } -void -check_blocks(void) { +void check_blocks(void) +{ unsigned int current_page; int do_seek = 1; char *buffer; @@ -233,8 +239,8 @@ check_blocks(void) { page_ok(current_page++); continue; } - if (do_seek && lseek(DEV,current_page*pagesize,SEEK_SET) != - current_page*pagesize) + if (do_seek && lseek(DEV, current_page * pagesize, SEEK_SET) != + current_page * pagesize) die("seek failed in check_blocks"); if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) { page_bad(current_page++); @@ -248,30 +254,28 @@ check_blocks(void) { printf("%d bad pages\n", badpages); } -static long valid_offset (int fd, int offset) +static long valid_offset(int fd, int offset) { char ch; - if (lseek (fd, offset, 0) < 0) + if (lseek(fd, offset, 0) < 0) return 0; - if (read (fd, &ch, 1) < 1) + if (read(fd, &ch, 1) < 1) return 0; return 1; } -static int -find_size (int fd) +static int find_size(int fd) { unsigned int high, low; low = 0; - for (high = 1; high > 0 && valid_offset (fd, high); high *= 2) + for (high = 1; high > 0 && valid_offset(fd, high); high *= 2) low = high; - while (low < high - 1) - { + while (low < high - 1) { const int mid = (low + high) / 2; - if (valid_offset (fd, mid)) + if (valid_offset(fd, mid)) low = mid; else high = mid; @@ -280,11 +284,10 @@ find_size (int fd) } /* return size in pages, to avoid integer overflow */ -static long -get_size(const char *file) +static long get_size(const char *file) { - int fd; - long size; + int fd; + long size; fd = open(file, O_RDONLY); if (fd < 0) { @@ -292,7 +295,8 @@ get_size(const char *file) exit(1); } if (ioctl(fd, BLKGETSIZE, &size) >= 0) { - int sectors_per_page = pagesize/512; + int sectors_per_page = pagesize / 512; + size /= sectors_per_page; } else { size = find_size(fd) / pagesize; @@ -301,9 +305,9 @@ get_size(const char *file) return size; } -int mkswap_main(int argc, char ** argv) +int mkswap_main(int argc, char **argv) { - char * tmp; + char *tmp; struct stat statbuf; int sz; int maxpages; @@ -314,56 +318,56 @@ int mkswap_main(int argc, char ** argv) if (argc && *argv) program_name = *argv; - init_signature_page(); /* get pagesize */ + init_signature_page(); /* get pagesize */ while (argc-- > 1) { argv++; if (argv[0][0] != '-') { if (device_name) { - int blocks_per_page = pagesize/1024; - PAGES = strtol(argv[0],&tmp,0)/blocks_per_page; + int blocks_per_page = pagesize / 1024; + + PAGES = strtol(argv[0], &tmp, 0) / blocks_per_page; if (*tmp) - usage( mkswap_usage); + usage(mkswap_usage); } else device_name = argv[0]; } else { switch (argv[0][1]) { - case 'c': - check=1; - break; - case 'f': - force=1; - break; - case 'v': - version=atoi(argv[0]+2); - break; - default: - usage( mkswap_usage); + case 'c': + check = 1; + break; + case 'f': + force = 1; + break; + case 'v': + version = atoi(argv[0] + 2); + break; + default: + usage(mkswap_usage); } } } if (!device_name) { fprintf(stderr, - "%s: error: Nowhere to set up swap on?\n", - program_name); - usage( mkswap_usage); + "%s: error: Nowhere to set up swap on?\n", program_name); + usage(mkswap_usage); } sz = get_size(device_name); if (!PAGES) { PAGES = sz; } else if (PAGES > sz && !force) { fprintf(stderr, - "%s: error: " - "size %ld is larger than device size %d\n", - program_name, - PAGES*(pagesize/1024), sz*(pagesize/1024)); - exit( FALSE); + "%s: error: " + "size %ld is larger than device size %d\n", + program_name, + PAGES * (pagesize / 1024), sz * (pagesize / 1024)); + exit(FALSE); } if (version == -1) { if (PAGES <= V0_MAX_PAGES) version = 0; - else if (linux_version_code() < MAKE_VERSION(2,1,117)) + else if (linux_version_code() < MAKE_VERSION(2, 1, 117)) version = 0; else if (pagesize < 2048) version = 0; @@ -372,21 +376,21 @@ int mkswap_main(int argc, char ** argv) } if (version != 0 && version != 1) { fprintf(stderr, "%s: error: unknown version %d\n", - program_name, version); - usage( mkswap_usage); + program_name, version); + usage(mkswap_usage); } if (PAGES < 10) { fprintf(stderr, - "%s: error: swap area needs to be at least %ldkB\n", - program_name, (long)(10 * pagesize / 1024)); - usage( mkswap_usage); + "%s: error: swap area needs to be at least %ldkB\n", + program_name, (long) (10 * pagesize / 1024)); + usage(mkswap_usage); } #if 0 maxpages = ((version == 0) ? V0_MAX_PAGES : V1_MAX_PAGES); #else if (!version) maxpages = V0_MAX_PAGES; - else if (linux_version_code() >= MAKE_VERSION(2,2,1)) + else if (linux_version_code() >= MAKE_VERSION(2, 2, 1)) maxpages = V1_MAX_PAGES; else { maxpages = V1_OLD_MAX_PAGES; @@ -397,29 +401,29 @@ int mkswap_main(int argc, char ** argv) if (PAGES > maxpages) { PAGES = maxpages; fprintf(stderr, "%s: warning: truncating swap area to %ldkB\n", - program_name, PAGES * pagesize / 1024); + program_name, PAGES * pagesize / 1024); } - DEV = open(device_name,O_RDWR); + DEV = open(device_name, O_RDWR); if (DEV < 0 || fstat(DEV, &statbuf) < 0) { perror(device_name); - exit( FALSE); + exit(FALSE); } if (!S_ISBLK(statbuf.st_mode)) - check=0; + check = 0; else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) die("Will not try to make swapdevice on '%s'"); #ifdef __sparc__ if (!force && version == 0) { /* Don't overwrite partition table unless forced */ - unsigned char *buffer = (unsigned char *)signature_page; + unsigned char *buffer = (unsigned char *) signature_page; unsigned short *q, sum; if (read(DEV, buffer, 512) != 512) die("fatal: first page unreadable"); if (buffer[508] == 0xDA && buffer[509] == 0xBE) { - q = (unsigned short *)(buffer + 510); + q = (unsigned short *) (buffer + 510); for (sum = 0; q >= (unsigned short *) buffer;) sum ^= *q--; if (!sum) { @@ -427,9 +431,8 @@ int mkswap_main(int argc, char ** argv) %s: Device '%s' contains a valid Sun disklabel.\n\ This probably means creating v0 swap would destroy your partition table\n\ No swap created. If you really want to create swap v0 on that device, use\n\ -the -f option to force it.\n", - program_name, device_name); - exit( FALSE); +the -f option to force it.\n", program_name, device_name); + exit(FALSE); } } } @@ -437,11 +440,11 @@ the -f option to force it.\n", if (version == 0 || check) check_blocks(); - if (version == 0 && !bit_test_and_clear(signature_page,0)) + if (version == 0 && !bit_test_and_clear(signature_page, 0)) die("fatal: first page unreadable"); if (version == 1) { p->version = version; - p->last_page = PAGES-1; + p->last_page = PAGES - 1; p->nr_badpages = badpages; } @@ -449,14 +452,14 @@ the -f option to force it.\n", if (goodpages <= 0) die("Unable to set up swap-space: unreadable"); printf("Setting up swapspace version %d, size = %ld bytes\n", - version, (long)(goodpages*pagesize)); + version, (long) (goodpages * pagesize)); write_signature((version == 0) ? "SWAP-SPACE" : "SWAPSPACE2"); offset = ((version == 0) ? 0 : 1024); if (lseek(DEV, offset, SEEK_SET) != offset) die("unable to rewind swap-device"); - if (write(DEV,(char*)signature_page+offset, pagesize-offset) - != pagesize-offset) + if (write(DEV, (char *) signature_page + offset, pagesize - offset) + != pagesize - offset) die("unable to write signature page"); /* @@ -464,6 +467,6 @@ the -f option to force it.\n", * is not actually on disk. (This is a kernel bug.) */ if (fsync(DEV)) - die("fsync failed"); - exit ( TRUE); + die("fsync failed"); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* mnc: mini-netcat - built from the ground up for LRP Copyright (C) 1998 Charles P. Wright @@ -39,101 +40,92 @@ #define BUFSIZE 100 -static const char mnc_usage[] = -"mnc [IP] [port]\n\n" -"mini-netcat opens a pipe to IP:port\n"; +static const char mnc_usage[] = -int -mnc_main(int argc, char **argv) + "mnc [IP] [port]\n\n" "mini-netcat opens a pipe to IP:port\n"; + +int mnc_main(int argc, char **argv) { - int sfd; - int result; - int len; - char ch[BUFSIZE]; - - struct sockaddr_in address; - struct hostent *hostinfo; - - fd_set readfds, testfds; - - if (argc<=1 || **(argv+1) == '-' ) { - usage( mnc_usage); + int sfd; + int result; + int len; + char ch[BUFSIZE]; + + struct sockaddr_in address; + struct hostent *hostinfo; + + fd_set readfds, testfds; + + if (argc <= 1 || **(argv + 1) == '-') { + usage(mnc_usage); } argc--; argv++; - sfd = socket(AF_INET, SOCK_STREAM, 0); + sfd = socket(AF_INET, SOCK_STREAM, 0); - hostinfo = (struct hostent *) gethostbyname(*argv); + hostinfo = (struct hostent *) gethostbyname(*argv); - if (!hostinfo) - { - exit(1); - } + if (!hostinfo) { + exit(1); + } - address.sin_family = AF_INET; - address.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list; - address.sin_port = htons(atoi(*(++argv))); + address.sin_family = AF_INET; + address.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list; + address.sin_port = htons(atoi(*(++argv))); - len = sizeof(address); + len = sizeof(address); - result = connect(sfd, (struct sockaddr *)&address, len); + result = connect(sfd, (struct sockaddr *) &address, len); - if (result < 0) - { - exit(2); - } + if (result < 0) { + exit(2); + } - FD_ZERO(&readfds); - FD_SET(sfd, &readfds); - FD_SET(fileno(stdin), &readfds); + FD_ZERO(&readfds); + FD_SET(sfd, &readfds); + FD_SET(fileno(stdin), &readfds); - while(1) - { - int fd; + while (1) { + int fd; int ofd; - int nread; + int nread; - testfds = readfds; + testfds = readfds; - result = select(FD_SETSIZE, &testfds, (fd_set *) NULL, (fd_set *) NULL, (struct timeval *) 0); + result = + select(FD_SETSIZE, &testfds, (fd_set *) NULL, (fd_set *) NULL, + (struct timeval *) 0); - if(result < 1) - { - exit(3); - } + if (result < 1) { + exit(3); + } - for(fd = 0; fd < FD_SETSIZE; fd++) - { - if(FD_ISSET(fd,&testfds)) - { + for (fd = 0; fd < FD_SETSIZE; fd++) { + if (FD_ISSET(fd, &testfds)) { int trn = 0; int rn; - ioctl(fd, FIONREAD, &nread); + ioctl(fd, FIONREAD, &nread); - if(fd == sfd) - { - if (nread == 0) - exit(0); + if (fd == sfd) { + if (nread == 0) + exit(0); ofd = fileno(stdout); - } - else - { + } else { ofd = sfd; } - do - { + do { rn = (BUFSIZE < nread - trn) ? BUFSIZE : nread - trn; trn += rn; - read(fd, ch, rn); - write(ofd, ch, rn); + read(fd, ch, rn); + write(ofd, ch, rn); } while (trn < nread); } - } - } + } + } } diff --git a/modutils/insmod.c b/modutils/insmod.c index 31cb11261..7cbbed441 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini insmod implementation for busybox * @@ -41,8 +42,7 @@ /* Some firendly syscalls to cheer everyone's day... */ _syscall2(int, init_module, const char *, name, - const struct module *, info) - + const struct module *, info) #ifndef BB_RMMOD _syscall1(int, delete_module, const char *, name) #else @@ -52,155 +52,159 @@ extern int delete_module(const char *); #if defined(__i386__) || defined(__m68k__) || defined(__arm__) /* Jump through hoops to fixup error return codes */ #define __NR__create_module __NR_create_module -static inline _syscall2(long, _create_module, const char *, name, size_t, size) +static inline _syscall2(long, _create_module, const char *, name, size_t, + size) unsigned long create_module(const char *name, size_t size) { - long ret = _create_module(name, size); - if (ret == -1 && errno > 125) { - ret = -errno; - errno = 0; - } - return ret; + long ret = _create_module(name, size); + + if (ret == -1 && errno > 125) { + ret = -errno; + errno = 0; + } + return ret; } #else _syscall2(unsigned long, create_module, const char *, name, size_t, size) #endif - - static char m_filename[PATH_MAX + 1] = "\0"; static char m_fullName[PATH_MAX + 1] = "\0"; static const char insmod_usage[] = - "insmod [OPTION]... MODULE [symbol=value]...\n\n" - "Loads the specified kernel modules into the kernel.\n\n" - "Options:\n" - "\t-f\tForce module to load into the wrong kernel version.\n" - "\t-k\tMake module autoclean-able.\n"; + "insmod [OPTION]... MODULE [symbol=value]...\n\n" + "Loads the specified kernel modules into the kernel.\n\n" + "Options:\n" + + "\t-f\tForce module to load into the wrong kernel version.\n" + "\t-k\tMake module autoclean-able.\n"; -static int findNamedModule(const char *fileName, struct stat* statbuf) +static int findNamedModule(const char *fileName, struct stat *statbuf) { - if (m_fullName[0]=='\0') - return( FALSE); - else { - char* tmp = strrchr( fileName, '/'); - if (tmp == NULL) - tmp = (char*)fileName; - else - tmp++; - if (check_wildcard_match(tmp, m_fullName) == TRUE) { - /* Stop searching if we find a match */ - memcpy(m_filename, fileName, strlen(fileName)); - return( FALSE); + if (m_fullName[0] == '\0') + return (FALSE); + else { + char *tmp = strrchr(fileName, '/'); + + if (tmp == NULL) + tmp = (char *) fileName; + else + tmp++; + if (check_wildcard_match(tmp, m_fullName) == TRUE) { + /* Stop searching if we find a match */ + memcpy(m_filename, fileName, strlen(fileName)); + return (FALSE); + } } - } - return( TRUE); + return (TRUE); } extern int insmod_main(int argc, char **argv) { - int len; - char *tmp; - char m_name[PATH_MAX + 1] ="\0"; - FILE *fp; - - if (argc<=1) { - usage( insmod_usage); - } - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 'f': - break; - case 'k': - break; - default: + int len; + char *tmp; + char m_name[PATH_MAX + 1] = "\0"; + FILE *fp; + + if (argc <= 1) { usage(insmod_usage); - } } - } - - if (argc <= 0 ) - usage(insmod_usage); - - /* Grab the module name */ - if ((tmp = strrchr(*argv, '/')) != NULL) - tmp++; - else - tmp = *argv; - len = strlen(tmp); - - if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o') - len -= 2; - memcpy(m_name, tmp, len); - strcpy(m_fullName, m_name); - strcat(m_fullName, ".o"); - - /* Get a filedesc for the module */ - if ((fp = fopen(*argv, "r")) == NULL) { - /* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */ - if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE, - findNamedModule, findNamedModule) == FALSE) { - if ( m_filename[0] == '\0' || ((fp = fopen(m_filename, "r")) == NULL)) { - perror("No module by that name found in " _PATH_MODULES "\n"); - exit( FALSE); - } + + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 'f': + break; + case 'k': + break; + default: + usage(insmod_usage); + } + } } - } else - memcpy(m_filename, *argv, strlen(*argv)); + if (argc <= 0) + usage(insmod_usage); - fprintf(stderr, "m_filename='%s'\n", m_filename); - fprintf(stderr, "m_name='%s'\n", m_name); + /* Grab the module name */ + if ((tmp = strrchr(*argv, '/')) != NULL) + tmp++; + else + tmp = *argv; + len = strlen(tmp); + + if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o') + len -= 2; + memcpy(m_name, tmp, len); + strcpy(m_fullName, m_name); + strcat(m_fullName, ".o"); + + /* Get a filedesc for the module */ + if ((fp = fopen(*argv, "r")) == NULL) { + /* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */ + if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE, + findNamedModule, findNamedModule) == FALSE) { + if (m_filename[0] == '\0' + || ((fp = fopen(m_filename, "r")) == NULL)) { + perror("No module by that name found in " _PATH_MODULES + "\n"); + exit(FALSE); + } + } + } else + memcpy(m_filename, *argv, strlen(*argv)); + + + fprintf(stderr, "m_filename='%s'\n", m_filename); + fprintf(stderr, "m_name='%s'\n", m_name); + + + /* TODO: do something roughtly like this... */ +#if 0 + if ((f = obj_load(fp)) == NULL) { + perror("Could not load the module\n"); + exit(FALSE); + } - /* TODO: do something roughtly like this... */ -#if 0 + /* Let the module know about the kernel symbols. */ + add_kernel_symbols(f); - if ((f = obj_load(fp)) == NULL) { - perror("Could not load the module\n"); - exit( FALSE); - } - - /* Let the module know about the kernel symbols. */ - add_kernel_symbols(f); - - if (!create_this_module(f, m_name)) { - perror("Could not create the module\n"); - exit( FALSE); - } - - if (!obj_check_undefineds(f, quiet)) { - perror("Undefined symbols in the module\n"); - exit( FALSE); - } - obj_allocate_commons(f); - - /* Perse the module's arguments */ - while (argc-- >0 && *(argv++) != '\0') { - if (!process_module_arguments(f, argc - optind, argv + optind)) { - perror("Undefined symbols in the module\n"); - exit( FALSE); + if (!create_this_module(f, m_name)) { + perror("Could not create the module\n"); + exit(FALSE); } - } - /* Find current size of the module */ - m_size = obj_load_size(f); + if (!obj_check_undefineds(f, quiet)) { + perror("Undefined symbols in the module\n"); + exit(FALSE); + } + obj_allocate_commons(f); + + /* Perse the module's arguments */ + while (argc-- > 0 && *(argv++) != '\0') { + if (!process_module_arguments(f, argc - optind, argv + optind)) { + perror("Undefined symbols in the module\n"); + exit(FALSE); + } + } + + /* Find current size of the module */ + m_size = obj_load_size(f); - errno = 0; - m_addr = create_module(m_name, m_size); - switch (errno) { - /* yada yada */ + errno = 0; + m_addr = create_module(m_name, m_size); + switch (errno) { + /* yada yada */ default: - perror("create_module: %m"); + perror("create_module: %m"); - } + } #endif - fclose( fp); - exit( TRUE); + fclose(fp); + exit(TRUE); } diff --git a/modutils/lsmod.c b/modutils/lsmod.c index 1696f756e..d9c40eaaf 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini lsmod implementation for busybox * @@ -30,6 +31,7 @@ extern int lsmod_main(int argc, char **argv) { - char* cmd[] = { "cat", "/proc/modules", "\0" }; - exit(cat_main( 3, cmd)); + char *cmd[] = { "cat", "/proc/modules", "\0" }; + + exit(cat_main(3, cmd)); } diff --git a/modutils/rmmod.c b/modutils/rmmod.c index 6b15b48bb..a0db4ae5c 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini rmmod implementation for busybox * @@ -33,41 +34,41 @@ _syscall1(int, delete_module, const char *, name) static const char rmmod_usage[] = - "rmmod [OPTION]... [MODULE]...\n\n" - "Unloads the specified kernel modules from the kernel.\n\n" - "Options:\n" - "\t-a\tTry to remove all unused kernel modules.\n"; + "rmmod [OPTION]... [MODULE]...\n\n" + "Unloads the specified kernel modules from the kernel.\n\n" + + "Options:\n" "\t-a\tTry to remove all unused kernel modules.\n"; extern int rmmod_main(int argc, char **argv) { - if (argc<=1) { - usage(rmmod_usage); - } + if (argc <= 1) { + usage(rmmod_usage); + } - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 'a': - /* Unload _all_ unused modules via NULL delete_module() call */ - if (delete_module(NULL)) { - perror("rmmod"); - exit( FALSE); + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 'a': + /* Unload _all_ unused modules via NULL delete_module() call */ + if (delete_module(NULL)) { + perror("rmmod"); + exit(FALSE); + } + exit(TRUE); + default: + usage(rmmod_usage); + } } - exit( TRUE); - default: - usage(rmmod_usage); - } } - } - while (argc-- > 0 ) { - if (delete_module(*argv) < 0) { - perror(*argv); + while (argc-- > 0) { + if (delete_module(*argv) < 0) { + perror(*argv); + } + argv++; } - argv++; - } - exit( TRUE); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini more implementation for busybox * @@ -45,19 +46,20 @@ static const char more_usage[] = "more [file ...]\n"; # define stty(fd,argp) tcsetattr(fd,TCSANOW,argp) #endif - FILE *cin; - struct termios initial_settings, new_settings; +FILE *cin; +struct termios initial_settings, new_settings; - void gotsig(int sig) { - stty(fileno(cin), &initial_settings); - fprintf(stdout, "\n"); - exit( TRUE); - } +void gotsig(int sig) +{ + stty(fileno(cin), &initial_settings); + fprintf(stdout, "\n"); + exit(TRUE); +} #endif -#define TERMINAL_WIDTH 79 /* not 80 in case terminal has linefold bug */ +#define TERMINAL_WIDTH 79 /* not 80 in case terminal has linefold bug */ #define TERMINAL_HEIGHT 24 @@ -72,118 +74,121 @@ static int terminal_width = 0, terminal_height = 0; extern int more_main(int argc, char **argv) { - int c, lines=0, input=0; - int next_page=0; - struct stat st; - FILE *file; + int c, lines = 0, input = 0; + int next_page = 0; + struct stat st; + FILE *file; + #ifdef BB_FEATURE_AUTOWIDTH - struct winsize win = {0,0}; + struct winsize win = { 0, 0 }; #endif - argc--; - argv++; - - if ( argc > 0 && (strcmp(*argv,"--help")==0 || strcmp(*argv,"-h")==0) ) { - usage (more_usage); - } - do { - if (argc==0) { - file = stdin; - } - else - file = fopen(*argv, "r"); + argc--; + argv++; - if (file == NULL) { - perror(*argv); - exit(FALSE); + if (argc > 0 + && (strcmp(*argv, "--help") == 0 || strcmp(*argv, "-h") == 0)) { + usage(more_usage); } - fstat(fileno(file), &st); + do { + if (argc == 0) { + file = stdin; + } else + file = fopen(*argv, "r"); + + if (file == NULL) { + perror(*argv); + exit(FALSE); + } + fstat(fileno(file), &st); #ifdef BB_FEATURE_USE_TERMIOS - cin = fopen("/dev/tty", "r"); - if (!cin) - cin = fopen("/dev/console", "r"); + cin = fopen("/dev/tty", "r"); + if (!cin) + cin = fopen("/dev/console", "r"); #ifdef USE_OLD_TERMIO - ioctl(fileno(cin),TCGETA,&initial_settings); + ioctl(fileno(cin), TCGETA, &initial_settings); #else - tcgetattr(fileno(cin),&initial_settings); + tcgetattr(fileno(cin), &initial_settings); #endif - new_settings = initial_settings; - new_settings.c_lflag &= ~ICANON; - new_settings.c_lflag &= ~ECHO; - stty(fileno(cin), &new_settings); - -#ifdef BB_FEATURE_AUTOWIDTH - ioctl(fileno(stdout), TIOCGWINSZ, &win); - if (win.ws_row > 4) - terminal_height = win.ws_row - 2; - if (win.ws_col > 0) - terminal_width = win.ws_col - 1; + new_settings = initial_settings; + new_settings.c_lflag &= ~ICANON; + new_settings.c_lflag &= ~ECHO; + stty(fileno(cin), &new_settings); + +#ifdef BB_FEATURE_AUTOWIDTH + ioctl(fileno(stdout), TIOCGWINSZ, &win); + if (win.ws_row > 4) + terminal_height = win.ws_row - 2; + if (win.ws_col > 0) + terminal_width = win.ws_col - 1; #endif - (void) signal(SIGINT, gotsig); - (void) signal(SIGQUIT, gotsig); - (void) signal(SIGTERM, gotsig); + (void) signal(SIGINT, gotsig); + (void) signal(SIGQUIT, gotsig); + (void) signal(SIGTERM, gotsig); #endif - while ((c = getc(file)) != EOF) { - if ( next_page ) { - int len=0; - next_page = 0; - lines=0; - len = fprintf(stdout, "--More-- "); - if (file != stdin) { - len += fprintf(stdout, "(%d%% of %ld bytes)", - (int) (100*( (double) ftell(file) / (double) st.st_size )), - st.st_size); - } - len += fprintf(stdout, "%s", + while ((c = getc(file)) != EOF) { + if (next_page) { + int len = 0; + + next_page = 0; + lines = 0; + len = fprintf(stdout, "--More-- "); + if (file != stdin) { + len += fprintf(stdout, "(%d%% of %ld bytes)", + (int) (100 * + ((double) ftell(file) / + (double) st.st_size)), + st.st_size); + } + len += fprintf(stdout, "%s", #ifdef BB_FEATURE_USE_TERMIOS - "" + "" #else - "\n" + "\n" #endif - ); + ); - fflush(stdout); - input = getc( cin); + fflush(stdout); + input = getc(cin); #ifdef BB_FEATURE_USE_TERMIOS - /* Erase the "More" message */ - while(--len >= 0) - putc('\b', stdout); - while(++len <= terminal_width) - putc(' ', stdout); - while(--len >= 0) - putc('\b', stdout); - fflush(stdout); + /* Erase the "More" message */ + while (--len >= 0) + putc('\b', stdout); + while (++len <= terminal_width) + putc(' ', stdout); + while (--len >= 0) + putc('\b', stdout); + fflush(stdout); #endif - } - if (c == '\n' ) { - switch(input) { - case 'q': - goto end; - case '\n': - /* increment by just one line if we are at - * the end of this line*/ - next_page = 1; - break; + } + if (c == '\n') { + switch (input) { + case 'q': + goto end; + case '\n': + /* increment by just one line if we are at + * the end of this line*/ + next_page = 1; + break; + } + if (++lines == terminal_height) + next_page = 1; + } + putc(c, stdout); } - if ( ++lines == terminal_height ) - next_page = 1; - } - putc(c, stdout); - } - fclose(file); - fflush(stdout); + fclose(file); + fflush(stdout); - argv++; - } while (--argc > 0); -end: + argv++; + } while (--argc > 0); + end: #ifdef BB_FEATURE_USE_TERMIOS - gotsig(0); -#endif - exit(TRUE); + gotsig(0); +#endif + exit(TRUE); } - @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini mount implementation for busybox * @@ -55,357 +56,371 @@ static int use_loop = 0; #endif -extern const char mtab_file[]; /* Defined in utility.c */ +extern const char mtab_file[]; /* Defined in utility.c */ static const char mount_usage[] = "\tmount [flags]\n" - "\tmount [flags] device directory [-o options,more-options]\n" - "\n" - "Flags:\n" - "\t-a:\tMount all file systems in fstab.\n" + "\tmount [flags] device directory [-o options,more-options]\n" + "\n" "Flags:\n" "\t-a:\tMount all file systems in fstab.\n" #ifdef BB_MTAB - "\t-f:\t\"Fake\" mount. Add entry to mount table but don't mount it.\n" - "\t-n:\tDon't write a mount table entry.\n" + "\t-f:\t\"Fake\" mount. Add entry to mount table but don't mount it.\n" + "\t-n:\tDon't write a mount table entry.\n" #endif - "\t-o option:\tOne of many filesystem options, listed below.\n" - "\t-r:\tMount the filesystem read-only.\n" - "\t-t filesystem-type:\tSpecify the filesystem type.\n" - "\t-w:\tMount for reading and writing (default).\n" - "\n" - "Options for use with the \"-o\" flag:\n" - "\tasync / sync:\tWrites are asynchronous / synchronous.\n" - "\tdev / nodev:\tAllow use of special device files / disallow them.\n" - "\texec / noexec:\tAllow use of executable files / disallow them.\n" + "\t-o option:\tOne of many filesystem options, listed below.\n" + "\t-r:\tMount the filesystem read-only.\n" + "\t-t filesystem-type:\tSpecify the filesystem type.\n" + "\t-w:\tMount for reading and writing (default).\n" + "\n" + "Options for use with the \"-o\" flag:\n" + "\tasync / sync:\tWrites are asynchronous / synchronous.\n" + "\tdev / nodev:\tAllow use of special device files / disallow them.\n" + "\texec / noexec:\tAllow use of executable files / disallow them.\n" #if defined BB_FEATURE_MOUNT_LOOP - "\tloop: Mounts a file via loop device.\n" + "\tloop: Mounts a file via loop device.\n" #endif - "\tsuid / nosuid:\tAllow set-user-id-root programs / disallow them.\n" - "\tremount: Re-mount a currently-mounted filesystem, changing its flags.\n" - "\tro / rw: Mount for read-only / read-write.\n" - "\t" - "There are EVEN MORE flags that are specific to each filesystem.\n" - "You'll have to see the written documentation for those.\n"; + "\tsuid / nosuid:\tAllow set-user-id-root programs / disallow them.\n" + "\tremount: Re-mount a currently-mounted filesystem, changing its flags.\n" + "\tro / rw: Mount for read-only / read-write.\n" + "\t" + + "There are EVEN MORE flags that are specific to each filesystem.\n" + "You'll have to see the written documentation for those.\n"; struct mount_options { - const char *name; - unsigned long and; - unsigned long or; + const char *name; + unsigned long and; + unsigned long or; }; static const struct mount_options mount_options[] = { - {"async", ~MS_SYNCHRONOUS, 0}, - {"defaults", ~0, 0}, - {"dev", ~MS_NODEV, 0}, - {"exec", ~MS_NOEXEC, 0}, - {"nodev", ~0, MS_NODEV}, - {"noexec", ~0, MS_NOEXEC}, - {"nosuid", ~0, MS_NOSUID}, - {"remount", ~0, MS_REMOUNT}, - {"ro", ~0, MS_RDONLY}, - {"rw", ~MS_RDONLY, 0}, - {"suid", ~MS_NOSUID, 0}, - {"sync", ~0, MS_SYNCHRONOUS}, - {0, 0, 0} + {"async", ~MS_SYNCHRONOUS, 0}, + {"defaults", ~0, 0}, + {"dev", ~MS_NODEV, 0}, + {"exec", ~MS_NOEXEC, 0}, + {"nodev", ~0, MS_NODEV}, + {"noexec", ~0, MS_NOEXEC}, + {"nosuid", ~0, MS_NOSUID}, + {"remount", ~0, MS_REMOUNT}, + {"ro", ~0, MS_RDONLY}, + {"rw", ~MS_RDONLY, 0}, + {"suid", ~MS_NOSUID, 0}, + {"sync", ~0, MS_SYNCHRONOUS}, + {0, 0, 0} }; static int -do_mount(char* specialfile, char* dir, char* filesystemtype, - long flags, void* string_flags, int useMtab, int fakeIt, char* mtab_opts) +do_mount(char *specialfile, char *dir, char *filesystemtype, + long flags, void *string_flags, int useMtab, int fakeIt, + char *mtab_opts) { - int status=0; + int status = 0; #if defined BB_MTAB - if (fakeIt==FALSE) + if (fakeIt == FALSE) #endif - { + { #if defined BB_FEATURE_MOUNT_LOOP - if (use_loop) { - int loro = flags & MS_RDONLY; - char *lofile = specialfile; - specialfile = find_unused_loop_device(); - if (specialfile == NULL) { - fprintf(stderr, "Could not find a spare loop device\n"); - return( FALSE); - } - if (set_loop (specialfile, lofile, 0, &loro)) { - fprintf(stderr, "Could not setup loop device\n"); - return( FALSE); - } - if (!(flags & MS_RDONLY) && loro) { /* loop is ro, but wanted rw */ - fprintf(stderr, "WARNING: loop device is read-only\n"); - flags &= ~MS_RDONLY; - } - } + if (use_loop) { + int loro = flags & MS_RDONLY; + char *lofile = specialfile; + + specialfile = find_unused_loop_device(); + if (specialfile == NULL) { + fprintf(stderr, "Could not find a spare loop device\n"); + return (FALSE); + } + if (set_loop(specialfile, lofile, 0, &loro)) { + fprintf(stderr, "Could not setup loop device\n"); + return (FALSE); + } + if (!(flags & MS_RDONLY) && loro) { /* loop is ro, but wanted rw */ + fprintf(stderr, "WARNING: loop device is read-only\n"); + flags &= ~MS_RDONLY; + } + } #endif - status=mount(specialfile, dir, filesystemtype, flags, string_flags); - } + status = + mount(specialfile, dir, filesystemtype, flags, string_flags); + } - /* If the mount was sucessful, do anything needed, then return TRUE */ - if (status == 0) { + /* If the mount was sucessful, do anything needed, then return TRUE */ + if (status == 0) { #if defined BB_MTAB - if (useMtab==TRUE) { - write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts); - } + if (useMtab == TRUE) { + write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts); + } #endif - return( TRUE); - } + return (TRUE); + } - /* Bummer. mount failed. Clean up */ + /* Bummer. mount failed. Clean up */ #if defined BB_FEATURE_MOUNT_LOOP - if (specialfile != NULL) { - del_loop(specialfile); - } + if (specialfile != NULL) { + del_loop(specialfile); + } #endif - return( FALSE); + return (FALSE); } #if defined BB_MTAB -#define whine_if_fstab_is_missing() {} +#define whine_if_fstab_is_missing() {} #else extern void whine_if_fstab_is_missing() { - struct stat statBuf; - if (stat("/etc/fstab", &statBuf) < 0) - fprintf(stderr, "/etc/fstab file missing -- install one to name /dev/root.\n\n"); + struct stat statBuf; + + if (stat("/etc/fstab", &statBuf) < 0) + fprintf(stderr, + "/etc/fstab file missing -- install one to name /dev/root.\n\n"); } #endif /* Seperate standard mount options from the nonstandard string options */ static void -parse_mount_options ( char *options, unsigned long *flags, char *strflags) +parse_mount_options(char *options, unsigned long *flags, char *strflags) { - while (options) { - int gotone=FALSE; - char *comma = strchr (options, ','); - const struct mount_options* f = mount_options; - if (comma) - *comma = '\0'; - - while (f->name != 0) { - if (strcasecmp (f->name, options) == 0) { - - *flags &= f->and; - *flags |= f->or; - gotone=TRUE; - break; - } - f++; - } + while (options) { + int gotone = FALSE; + char *comma = strchr(options, ','); + const struct mount_options *f = mount_options; + + if (comma) + *comma = '\0'; + + while (f->name != 0) { + if (strcasecmp(f->name, options) == 0) { + + *flags &= f->and; + *flags |= f->or; + gotone = TRUE; + break; + } + f++; + } #if defined BB_FEATURE_MOUNT_LOOP - if (gotone==FALSE && !strcasecmp ("loop", options)) { /* loop device support */ - use_loop = 1; - gotone=TRUE; - } + if (gotone == FALSE && !strcasecmp("loop", options)) { /* loop device support */ + use_loop = 1; + gotone = TRUE; + } #endif - if (*strflags && strflags!= '\0' && gotone==FALSE) { - char *temp=strflags; - temp += strlen (strflags); - *temp++ = ','; - *temp++ = '\0'; - } - if (gotone==FALSE) - strcat (strflags, options); - if (comma) { - *comma = ','; - options = ++comma; - } else { - break; + if (*strflags && strflags != '\0' && gotone == FALSE) { + char *temp = strflags; + + temp += strlen(strflags); + *temp++ = ','; + *temp++ = '\0'; + } + if (gotone == FALSE) + strcat(strflags, options); + if (comma) { + *comma = ','; + options = ++comma; + } else { + break; + } } - } } int mount_one(char *blockDevice, char *directory, char *filesystemType, - unsigned long flags, char *string_flags, int useMtab, int fakeIt, char *mtab_opts) + unsigned long flags, char *string_flags, int useMtab, int fakeIt, + char *mtab_opts) { - int status = 0; + int status = 0; - char buf[255]; + char buf[255]; #if defined BB_FEATURE_USE_PROCFS - if (strcmp(filesystemType, "auto") == 0) { - FILE *f = fopen ("/proc/filesystems", "r"); - - if (f == NULL) - return( FALSE); - - while (fgets (buf, sizeof (buf), f) != NULL) { - filesystemType = buf; - if (*filesystemType == '\t') { // Not a nodev filesystem - - // Add NULL termination to each line - while (*filesystemType && *filesystemType != '\n') - filesystemType++; - *filesystemType = '\0'; - - filesystemType = buf; - filesystemType++; // hop past tab - - status = do_mount (blockDevice, directory, filesystemType, - flags | MS_MGC_VAL, string_flags, useMtab, - fakeIt, mtab_opts); - if (status == TRUE) - break; - } - } - fclose (f); - } else + if (strcmp(filesystemType, "auto") == 0) { + FILE *f = fopen("/proc/filesystems", "r"); + + if (f == NULL) + return (FALSE); + + while (fgets(buf, sizeof(buf), f) != NULL) { + filesystemType = buf; + if (*filesystemType == '\t') { // Not a nodev filesystem + + // Add NULL termination to each line + while (*filesystemType && *filesystemType != '\n') + filesystemType++; + *filesystemType = '\0'; + + filesystemType = buf; + filesystemType++; // hop past tab + + status = do_mount(blockDevice, directory, filesystemType, + flags | MS_MGC_VAL, string_flags, + useMtab, fakeIt, mtab_opts); + if (status == TRUE) + break; + } + } + fclose(f); + } else #endif - { - status = do_mount (blockDevice, directory, filesystemType, - flags | MS_MGC_VAL, string_flags, useMtab, - fakeIt, mtab_opts); - } - - if (status==FALSE) { - fprintf (stderr, "Mounting %s on %s failed: %s\n", - blockDevice, directory, strerror(errno)); - return (FALSE); - } - return (TRUE); + { + status = do_mount(blockDevice, directory, filesystemType, + flags | MS_MGC_VAL, string_flags, useMtab, + fakeIt, mtab_opts); + } + + if (status == FALSE) { + fprintf(stderr, "Mounting %s on %s failed: %s\n", + blockDevice, directory, strerror(errno)); + return (FALSE); + } + return (TRUE); } -extern int mount_main (int argc, char **argv) +extern int mount_main(int argc, char **argv) { - char string_flags_buf[1024]=""; - char *string_flags = string_flags_buf; - char *extra_opts = string_flags_buf; - unsigned long flags = 0; - char *filesystemType = "auto"; - char *device = NULL; - char *directory = NULL; - int all = FALSE; - int fakeIt = FALSE; - int useMtab = TRUE; - int i; - - /* Only compiled in if BB_MTAB is not defined */ - whine_if_fstab_is_missing(); - - if (argc == 1) { - FILE *mountTable = setmntent (mtab_file, "r"); - if (mountTable) { - struct mntent *m; - while ((m = getmntent (mountTable)) != 0) { - struct fstab* fstabItem; - char *blockDevice = m->mnt_fsname; - /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */ - if (strcmp (blockDevice, "/dev/root") == 0) { - fstabItem = getfsfile ("/"); - if (fstabItem != NULL) - blockDevice = fstabItem->fs_spec; + char string_flags_buf[1024] = ""; + char *string_flags = string_flags_buf; + char *extra_opts = string_flags_buf; + unsigned long flags = 0; + char *filesystemType = "auto"; + char *device = NULL; + char *directory = NULL; + int all = FALSE; + int fakeIt = FALSE; + int useMtab = TRUE; + int i; + + /* Only compiled in if BB_MTAB is not defined */ + whine_if_fstab_is_missing(); + + if (argc == 1) { + FILE *mountTable = setmntent(mtab_file, "r"); + + if (mountTable) { + struct mntent *m; + + while ((m = getmntent(mountTable)) != 0) { + struct fstab *fstabItem; + char *blockDevice = m->mnt_fsname; + + /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */ + if (strcmp(blockDevice, "/dev/root") == 0) { + fstabItem = getfsfile("/"); + if (fstabItem != NULL) + blockDevice = fstabItem->fs_spec; + } + printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir, + m->mnt_type, m->mnt_opts); + } + endmntent(mountTable); + } else { + perror(mtab_file); } - printf ("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir, - m->mnt_type, m->mnt_opts); - } - endmntent (mountTable); - } else { - perror(mtab_file); + exit(TRUE); } - exit( TRUE); - } - - - /* Parse options */ - i = --argc; - argv++; - while (i > 0 && **argv) { - if (**argv == '-') { - char *opt = *argv; - while (i>0 && *++opt) switch (*opt) { - case 'o': - if (--i == 0) { - goto goodbye; - } - parse_mount_options (*(++argv), &flags, string_flags); - break; - case 'r': - flags |= MS_RDONLY; - break; - case 't': - if (--i == 0) { - goto goodbye; - } - filesystemType = *(++argv); - break; - case 'w': - flags &= ~MS_RDONLY; - break; - case 'a': - all = TRUE; - break; + + + /* Parse options */ + i = --argc; + argv++; + while (i > 0 && **argv) { + if (**argv == '-') { + char *opt = *argv; + + while (i > 0 && *++opt) + switch (*opt) { + case 'o': + if (--i == 0) { + goto goodbye; + } + parse_mount_options(*(++argv), &flags, string_flags); + break; + case 'r': + flags |= MS_RDONLY; + break; + case 't': + if (--i == 0) { + goto goodbye; + } + filesystemType = *(++argv); + break; + case 'w': + flags &= ~MS_RDONLY; + break; + case 'a': + all = TRUE; + break; #ifdef BB_MTAB - case 'f': - fakeIt = TRUE; - break; - case 'n': - useMtab = FALSE; - break; + case 'f': + fakeIt = TRUE; + break; + case 'n': + useMtab = FALSE; + break; #endif - case 'v': - case 'h': - case '-': - goto goodbye; - } - } else { - if (device == NULL) - device = *argv; - else if (directory == NULL) - directory = *argv; - else { - goto goodbye; - } + case 'v': + case 'h': + case '-': + goto goodbye; + } + } else { + if (device == NULL) + device = *argv; + else if (directory == NULL) + directory = *argv; + else { + goto goodbye; + } + } + i--; + argv++; } - i--; - argv++; - } - if (all == TRUE) { - struct mntent *m; - FILE *f = setmntent ("/etc/fstab", "r"); + if (all == TRUE) { + struct mntent *m; + FILE *f = setmntent("/etc/fstab", "r"); - if (f == NULL) { - perror("/etc/fstab"); - exit( FALSE); - } - while ((m = getmntent (f)) != NULL) { - // If the file system isn't noauto, and isn't mounted on /, - // and isn't swap or nfs, then mount it - if ((!strstr (m->mnt_opts, "noauto")) && - (m->mnt_dir[1] != '\0') && - (!strstr (m->mnt_type, "swap")) && - (!strstr (m->mnt_type, "nfs"))) - { - flags = 0; - *string_flags = '\0'; - parse_mount_options(m->mnt_opts, &flags, string_flags); - mount_one (m->mnt_fsname, m->mnt_dir, m->mnt_type, - flags, string_flags, useMtab, fakeIt, extra_opts); - } - } - endmntent (f); - } else { - if (device && directory) { + if (f == NULL) { + perror("/etc/fstab"); + exit(FALSE); + } + while ((m = getmntent(f)) != NULL) { + // If the file system isn't noauto, and isn't mounted on /, + // and isn't swap or nfs, then mount it + if ((!strstr(m->mnt_opts, "noauto")) && + (m->mnt_dir[1] != '\0') && + (!strstr(m->mnt_type, "swap")) && + (!strstr(m->mnt_type, "nfs"))) { + flags = 0; + *string_flags = '\0'; + parse_mount_options(m->mnt_opts, &flags, string_flags); + mount_one(m->mnt_fsname, m->mnt_dir, m->mnt_type, + flags, string_flags, useMtab, fakeIt, + extra_opts); + } + } + endmntent(f); + } else { + if (device && directory) { #ifdef BB_NFSMOUNT - if (strcmp(filesystemType, "nfs") == 0) { - if (nfsmount(device, directory, &flags, &extra_opts, &string_flags, 1) != 0) - exit(FALSE); - } + if (strcmp(filesystemType, "nfs") == 0) { + if (nfsmount + (device, directory, &flags, &extra_opts, &string_flags, + 1) != 0) + exit(FALSE); + } #endif - exit (mount_one (device, directory, filesystemType, - flags, string_flags, useMtab, fakeIt, extra_opts)); - } else { - goto goodbye; + exit(mount_one(device, directory, filesystemType, + flags, string_flags, useMtab, fakeIt, + extra_opts)); + } else { + goto goodbye; + } } - } - exit( TRUE); + exit(TRUE); -goodbye: - usage( mount_usage); + goodbye: + usage(mount_usage); } - @@ -1,97 +1,97 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" #include <stdio.h> #include <sys/mtio.h> #include <sys/fcntl.h> -static const char mt_usage[] = "mt [-f device] opcode value\n"; +static const char mt_usage[] = "mt [-f device] opcode value\n"; struct mt_opcodes { - char * name; - short value; + char *name; + short value; }; /* missing: eod/seod, stoptions, stwrthreshold, densities */ -static const struct mt_opcodes opcodes[] = { - { "bsf", MTBSF }, - { "bsfm", MTBSFM }, - { "bsr", MTBSR }, - { "bss", MTBSS }, - { "datacompression", MTCOMPRESSION }, - { "eom", MTEOM }, - { "erase", MTERASE }, - { "fsf", MTFSF }, - { "fsfm", MTFSFM }, - { "fsr", MTFSR }, - { "fss", MTFSS }, - { "load", MTLOAD }, - { "lock", MTLOCK }, - { "mkpart", MTMKPART }, - { "nop", MTNOP }, - { "offline",MTOFFL }, - { "rewoffline",MTOFFL }, - { "ras1", MTRAS1 }, - { "ras2", MTRAS2 }, - { "ras3", MTRAS3 }, - { "reset", MTRESET }, - { "retension", MTRETEN }, - { "rew", MTREW }, - { "seek", MTSEEK }, - { "setblk", MTSETBLK }, - { "setdensity", MTSETDENSITY }, - { "drvbuffer", MTSETDRVBUFFER }, - { "setpart", MTSETPART }, - { "tell", MTTELL }, - { "wset", MTWSM }, - { "unload", MTUNLOAD }, - { "unlock", MTUNLOCK }, - { "eof", MTWEOF }, - { "weof", MTWEOF }, - { 0, 0 } +static const struct mt_opcodes opcodes[] = { + {"bsf", MTBSF}, + {"bsfm", MTBSFM}, + {"bsr", MTBSR}, + {"bss", MTBSS}, + {"datacompression", MTCOMPRESSION}, + {"eom", MTEOM}, + {"erase", MTERASE}, + {"fsf", MTFSF}, + {"fsfm", MTFSFM}, + {"fsr", MTFSR}, + {"fss", MTFSS}, + {"load", MTLOAD}, + {"lock", MTLOCK}, + {"mkpart", MTMKPART}, + {"nop", MTNOP}, + {"offline", MTOFFL}, + {"rewoffline", MTOFFL}, + {"ras1", MTRAS1}, + {"ras2", MTRAS2}, + {"ras3", MTRAS3}, + {"reset", MTRESET}, + {"retension", MTRETEN}, + {"rew", MTREW}, + {"seek", MTSEEK}, + {"setblk", MTSETBLK}, + {"setdensity", MTSETDENSITY}, + {"drvbuffer", MTSETDRVBUFFER}, + {"setpart", MTSETPART}, + {"tell", MTTELL}, + {"wset", MTWSM}, + {"unload", MTUNLOAD}, + {"unlock", MTUNLOCK}, + {"eof", MTWEOF}, + {"weof", MTWEOF}, + {0, 0} }; -extern int -mt_main(int argc, char** argv) +extern int mt_main(int argc, char **argv) { - const char * file = "/dev/tape"; - const struct mt_opcodes * code = opcodes; - struct mtop op; - int fd; - - if ( strcmp(argv[1], "-f") == 0 ) { - if ( argc < 4 ) { - usage (mt_usage); + const char *file = "/dev/tape"; + const struct mt_opcodes *code = opcodes; + struct mtop op; + int fd; + + if (strcmp(argv[1], "-f") == 0) { + if (argc < 4) { + usage(mt_usage); } file = argv[2]; argv += 2; argc -= 2; } - while ( code->name != 0 ) { - if ( strcmp(code->name, argv[1]) == 0 ) + while (code->name != 0) { + if (strcmp(code->name, argv[1]) == 0) break; code++; } - if ( code->name == 0 ) { + if (code->name == 0) { fprintf(stderr, "mt: unrecognized opcode %s.\n", argv[1]); - return( FALSE); + return (FALSE); } op.mt_op = code->value; - if ( argc >= 3 ) - op.mt_count = atoi(argv[2]); + if (argc >= 3) + op.mt_count = atoi(argv[2]); else - op.mt_count = 1; /* One, not zero, right? */ + op.mt_count = 1; /* One, not zero, right? */ - if ( (fd = open(file, O_RDONLY, 0)) < 0 ) { + if ((fd = open(file, O_RDONLY, 0)) < 0) { perror(file); - return( FALSE); + return (FALSE); } - if ( ioctl(fd, MTIOCTOP, &op) != 0 ) { + if (ioctl(fd, MTIOCTOP, &op) != 0) { perror(file); - return( FALSE); + return (FALSE); } - return( TRUE); + return (TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" #include <stdlib.h> #include <unistd.h> @@ -8,29 +9,29 @@ #include <fstab.h> #include <sys/mount.h> -extern const char mtab_file[]; /* Defined in utility.c */ +extern const char mtab_file[]; /* Defined in utility.c */ -void erase_mtab(const char * name) +void erase_mtab(const char *name) { - struct mntent entries[20]; - int count = 0; + struct mntent entries[20]; + int count = 0; FILE *mountTable = setmntent(mtab_file, "r"); - struct mntent * m; + struct mntent *m; /* Check if reading the mtab file failed */ - if ( mountTable == 0 + if (mountTable == 0 #if ! defined BB_FEATURE_USE_PROCFS - ) { -#else - /* Bummer. fall back on trying the /proc filesystem */ - && (mountTable = setmntent("/proc/mounts", "r")) == 0 ) { + ) { +#else + /* Bummer. fall back on trying the /proc filesystem */ + && (mountTable = setmntent("/proc/mounts", "r")) == 0) { #endif perror(mtab_file); return; } - while ( (m = getmntent(mountTable)) != 0 ) { + while ((m = getmntent(mountTable)) != 0) { entries[count].mnt_fsname = strdup(m->mnt_fsname); entries[count].mnt_dir = strdup(m->mnt_dir); entries[count].mnt_type = strdup(m->mnt_type); @@ -40,64 +41,63 @@ void erase_mtab(const char * name) count++; } endmntent(mountTable); - if ( (mountTable = setmntent(mtab_file, "w")) ) { - int i; - for ( i = 0; i < count; i++ ) { - int result = ( strcmp(entries[i].mnt_fsname, name) == 0 - || strcmp(entries[i].mnt_dir, name) == 0 ); + if ((mountTable = setmntent(mtab_file, "w"))) { + int i; - if ( result ) + for (i = 0; i < count; i++) { + int result = (strcmp(entries[i].mnt_fsname, name) == 0 + || strcmp(entries[i].mnt_dir, name) == 0); + + if (result) continue; else addmntent(mountTable, &entries[i]); } endmntent(mountTable); - } - else if ( errno != EROFS ) + } else if (errno != EROFS) perror(mtab_file); } -void write_mtab(char* blockDevice, char* directory, - char* filesystemType, long flags, char* string_flags) +void write_mtab(char *blockDevice, char *directory, + char *filesystemType, long flags, char *string_flags) { FILE *mountTable = setmntent(mtab_file, "a+"); struct mntent m; - if ( mountTable == 0 ) { + if (mountTable == 0) { perror(mtab_file); return; } if (mountTable) { - int length = strlen(directory); + int length = strlen(directory); - if ( length > 1 && directory[length - 1] == '/' ) - directory[length - 1] = '\0'; + if (length > 1 && directory[length - 1] == '/') + directory[length - 1] = '\0'; #ifdef BB_FEATURE_USE_PROCFS - if ( filesystemType == 0 ) { - struct mntent *p = findMountPoint(blockDevice, "/proc/mounts"); + if (filesystemType == 0) { + struct mntent *p = findMountPoint(blockDevice, "/proc/mounts"); - if ( p && p->mnt_type ) - filesystemType = p->mnt_type; - } + if (p && p->mnt_type) + filesystemType = p->mnt_type; + } #endif - m.mnt_fsname = blockDevice; - m.mnt_dir = directory; - m.mnt_type = filesystemType ? filesystemType : "default"; - - if (*string_flags) { - m.mnt_opts = string_flags; - } else { - if ( (flags | MS_RDONLY) == flags ) - m.mnt_opts = "ro"; - else - m.mnt_opts = "rw"; - } - - m.mnt_freq = 0; - m.mnt_passno = 0; - addmntent(mountTable, &m); - endmntent(mountTable); - } -} + m.mnt_fsname = blockDevice; + m.mnt_dir = directory; + m.mnt_type = filesystemType ? filesystemType : "default"; + + if (*string_flags) { + m.mnt_opts = string_flags; + } else { + if ((flags | MS_RDONLY) == flags) + m.mnt_opts = "ro"; + else + m.mnt_opts = "rw"; + } + m.mnt_freq = 0; + m.mnt_passno = 0; + addmntent(mountTable, &m); + endmntent(mountTable); + } +} diff --git a/networking/hostname.c b/networking/hostname.c index 68a560950..8cc334da0 100644 --- a/networking/hostname.c +++ b/networking/hostname.c @@ -1,5 +1,6 @@ +/* vi: set sw=4 ts=4: */ /* - * $Id: hostname.c,v 1.6 2000/02/07 05:29:42 erik Exp $ + * $Id: hostname.c,v 1.7 2000/02/08 19:58:47 erik Exp $ * Mini hostname implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> @@ -29,110 +30,116 @@ #include <unistd.h> #include <stdio.h> -static const char* hostname_usage = -"hostname [OPTION] {hostname | -F file}\n\n" -"Get or set the hostname or DNS domain name. If a hostname is given\n" -"(or a file with the -F parameter), the host name will be set.\n\n" -"Options:\n" -"\t-s\t\tShort\n" -"\t-i\t\tAddresses for the hostname\n" -"\t-d\t\tDNS domain name\n" -"\t-F FILE\t\tUse the contents of FILE to specify the hostname\n"; +static const char *hostname_usage = + "hostname [OPTION] {hostname | -F file}\n\n" + "Get or set the hostname or DNS domain name. If a hostname is given\n" + "(or a file with the -F parameter), the host name will be set.\n\n" + "Options:\n" + "\t-s\t\tShort\n" + + "\t-i\t\tAddresses for the hostname\n" + "\t-d\t\tDNS domain name\n" + "\t-F FILE\t\tUse the contents of FILE to specify the hostname\n"; void do_sethostname(char *s, int isfile) { - FILE *f; - char buf[255]; - - if (!s) return; - if (!isfile) { - if (sethostname(s, strlen(s)) < 0) { - if (errno == EPERM) - fprintf(stderr, "hostname: you must be root to change the hostname\n"); - else - perror("sethostname"); - exit(1); - } - } else { - if ((f = fopen(s, "r")) == NULL) { - perror(s); - exit(1); + FILE *f; + char buf[255]; + + if (!s) + return; + if (!isfile) { + if (sethostname(s, strlen(s)) < 0) { + if (errno == EPERM) + fprintf(stderr, + "hostname: you must be root to change the hostname\n"); + else + perror("sethostname"); + exit(1); + } } else { - fgets(buf, 255, f); - fclose(f); - if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0; - if (sethostname(buf, strlen(buf)) < 0) { - perror("sethostname"); - exit(1); - } + if ((f = fopen(s, "r")) == NULL) { + perror(s); + exit(1); + } else { + fgets(buf, 255, f); + fclose(f); + if (buf[strlen(buf) - 1] == '\n') + buf[strlen(buf) - 1] = 0; + if (sethostname(buf, strlen(buf)) < 0) { + perror("sethostname"); + exit(1); + } + } } - } } int hostname_main(int argc, char **argv) { - int opt_short = 0; - int opt_domain = 0; - int opt_ip = 0; - struct hostent *h; - char *filename = NULL; - char buf[255]; - char *s = NULL; - - if (argc < 1) usage(hostname_usage); + int opt_short = 0; + int opt_domain = 0; + int opt_ip = 0; + struct hostent *h; + char *filename = NULL; + char buf[255]; + char *s = NULL; - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 's': - opt_short = 1; - break; - case 'i': - opt_ip = 1; - break; - case 'd': - opt_domain = 1; - break; - case 'F': - filename = optarg; - if (--argc == 0) { - usage(hostname_usage); - } - filename = *(++argv); - break; - default: + if (argc < 1) usage(hostname_usage); - } - if (filename!=NULL) - break; + + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 's': + opt_short = 1; + break; + case 'i': + opt_ip = 1; + break; + case 'd': + opt_domain = 1; + break; + case 'F': + filename = optarg; + if (--argc == 0) { + usage(hostname_usage); + } + filename = *(++argv); + break; + default: + usage(hostname_usage); + } + if (filename != NULL) + break; + } } - } - if (argc >= 1) { - do_sethostname(*argv, 0); - } else if (filename!=NULL) { - do_sethostname(filename, 1); - } else { - gethostname(buf, 255); - if (opt_short) { - s = strchr(buf, '.'); - if (!s) s = buf; *s = 0; - printf("%s\n", buf); - } else if (opt_domain) { - s = strchr(buf, '.'); - printf("%s\n", (s ? s+1 : "")); - } else if (opt_ip) { - h = gethostbyname(buf); - if (!h) { - printf("Host not found\n"); - exit(1); - } - printf("%s\n", inet_ntoa(*(struct in_addr *)(h->h_addr))); - } else { - printf("%s\n", buf); - } - } - exit( 0); + if (argc >= 1) { + do_sethostname(*argv, 0); + } else if (filename != NULL) { + do_sethostname(filename, 1); + } else { + gethostname(buf, 255); + if (opt_short) { + s = strchr(buf, '.'); + if (!s) + s = buf; + *s = 0; + printf("%s\n", buf); + } else if (opt_domain) { + s = strchr(buf, '.'); + printf("%s\n", (s ? s + 1 : "")); + } else if (opt_ip) { + h = gethostbyname(buf); + if (!h) { + printf("Host not found\n"); + exit(1); + } + printf("%s\n", inet_ntoa(*(struct in_addr *) (h->h_addr))); + } else { + printf("%s\n", buf); + } + } + exit(0); } - diff --git a/networking/nslookup.c b/networking/nslookup.c index 969d0b19b..ffa720174 100644 --- a/networking/nslookup.c +++ b/networking/nslookup.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini nslookup implementation for busybox * @@ -41,148 +42,136 @@ | + find out how the real nslookup gets the default name server */ -static const char nslookup_usage[] = - "nslookup [HOST]\n\n" -; +static const char nslookup_usage[] = "nslookup [HOST]\n\n"; /* I have to see how the real nslookup does this. * I could dig through /etc/resolv.conf, but is there a * better (programatic) way? */ -static void -server_fprint(FILE *dst) +static void server_fprint(FILE * dst) { - fprintf(dst, "Server: %s\n", "something"); - fprintf(dst, "Address: %s\n\n", "something"); + fprintf(dst, "Server: %s\n", "something"); + fprintf(dst, "Address: %s\n\n", "something"); } /* only works for IPv4 */ -static int -addr_fprint(char *addr, FILE *dst) +static int addr_fprint(char *addr, FILE * dst) { - uint8_t split[4]; - uint32_t ip; - uint32_t *x = (uint32_t *) addr; - - ip = ntohl(*x); - split[0] = (ip & 0xff000000) >> 24; - split[1] = (ip & 0x00ff0000) >> 16; - split[2] = (ip & 0x0000ff00) >> 8; - split[3] = (ip & 0x000000ff); - fprintf ( - dst, "%d.%d.%d.%d", - split[0], split[1], split[2], split[3] - ); - return 0; + uint8_t split[4]; + uint32_t ip; + uint32_t *x = (uint32_t *) addr; + + ip = ntohl(*x); + split[0] = (ip & 0xff000000) >> 24; + split[1] = (ip & 0x00ff0000) >> 16; + split[2] = (ip & 0x0000ff00) >> 8; + split[3] = (ip & 0x000000ff); + fprintf(dst, "%d.%d.%d.%d", split[0], split[1], split[2], split[3] + ); + return 0; } /* changes a c-string matching the perl regex \d+\.\d+\.\d+\.\d+ * into a uint32_t */ -static uint32_t -str_to_addr(const char *addr) +static uint32_t str_to_addr(const char *addr) { - uint32_t split[4]; - uint32_t ip; + uint32_t split[4]; + uint32_t ip; - sscanf(addr, "%d.%d.%d.%d", - &split[0], &split[1], &split[2], &split[3]); + sscanf(addr, "%d.%d.%d.%d", + &split[0], &split[1], &split[2], &split[3]); - /* assuming sscanf worked */ - ip = (split[0] << 24) | - (split[1] << 16) | - (split[2] << 8) | - (split[3]); + /* assuming sscanf worked */ + ip = (split[0] << 24) | + (split[1] << 16) | (split[2] << 8) | (split[3]); - return htonl(ip); + return htonl(ip); } /* takes the NULL-terminated array h_addr_list, and * prints its contents appropriately */ -static int -addr_list_fprint(char **h_addr_list, FILE *dst) +static int addr_list_fprint(char **h_addr_list, FILE * dst) { - int i, j; - char *addr_string = (h_addr_list[1]) - ? "Addresses" - : "Address"; - - fprintf(dst, "%s: ", addr_string); - for (i = 0, j = 0; h_addr_list[i]; i++, j++) { - addr_fprint(h_addr_list[i], dst); - - /* real nslookup does this */ - if (j == 4) { - if (h_addr_list[i+1]) { - fprintf(dst, "\n "); - } - j = 0; - } else { - if (h_addr_list[i+1]) { - fprintf(dst, ", "); - } - } + int i, j; + char *addr_string = (h_addr_list[1]) + ? "Addresses" : "Address"; + + fprintf(dst, "%s: ", addr_string); + for (i = 0, j = 0; h_addr_list[i]; i++, j++) { + addr_fprint(h_addr_list[i], dst); + + /* real nslookup does this */ + if (j == 4) { + if (h_addr_list[i + 1]) { + fprintf(dst, "\n "); + } + j = 0; + } else { + if (h_addr_list[i + 1]) { + fprintf(dst, ", "); + } + } - } - fprintf(dst,"\n"); - return 0; + } + fprintf(dst, "\n"); + return 0; } /* gethostbyaddr wrapper */ -static struct hostent * -gethostbyaddr_wrapper(const char *address) +static struct hostent *gethostbyaddr_wrapper(const char *address) { - struct in_addr addr; + struct in_addr addr; - addr.s_addr = str_to_addr(address); - return gethostbyaddr((char *) &addr, 4, AF_INET); /* IPv4 only for now */ + addr.s_addr = str_to_addr(address); + return gethostbyaddr((char *) &addr, 4, AF_INET); /* IPv4 only for now */ } /* print the results as nslookup would */ -static struct hostent * -hostent_fprint(struct hostent *host, FILE *dst) +static struct hostent *hostent_fprint(struct hostent *host, FILE * dst) { - if (host) { - fprintf(dst, "Name: %s\n", host->h_name); - addr_list_fprint(host->h_addr_list, dst); - } else { - fprintf(dst, "*** %s\n", hstrerror(h_errno)); - } - return host; + if (host) { + fprintf(dst, "Name: %s\n", host->h_name); + addr_list_fprint(host->h_addr_list, dst); + } else { + fprintf(dst, "*** %s\n", hstrerror(h_errno)); + } + return host; } /* naive function to check whether char *s is an ip address */ -static int -is_ip_address(const char *s) +static int is_ip_address(const char *s) { - while (*s) { - if ((isdigit(*s)) || (*s == '.')) { s++; continue; } - return 0; - } - return 1; + while (*s) { + if ((isdigit(*s)) || (*s == '.')) { + s++; + continue; + } + return 0; + } + return 1; } /* ________________________________________________________________________ */ -int -nslookup_main(int argc, char **argv) +int nslookup_main(int argc, char **argv) { - struct hostent *host; - - if (argc < 2) { - usage(nslookup_usage); - } - - server_fprint(stdout); - if (is_ip_address(argv[1])) { - host = gethostbyaddr_wrapper(argv[1]); - } else { - host = gethostbyname(argv[1]); - } - hostent_fprint(host, stdout); - return 0; + struct hostent *host; + + if (argc < 2) { + usage(nslookup_usage); + } + + server_fprint(stdout); + if (is_ip_address(argv[1])) { + host = gethostbyaddr_wrapper(argv[1]); + } else { + host = gethostbyname(argv[1]); + } + hostent_fprint(host, stdout); + return 0; } -/* $Id: nslookup.c,v 1.3 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: nslookup.c,v 1.4 2000/02/08 19:58:47 erik Exp $ */ diff --git a/networking/ping.c b/networking/ping.c index 3ffbdc553..c9cf5ffb4 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -1,5 +1,6 @@ +/* vi: set sw=4 ts=4: */ /* - * $Id: ping.c,v 1.10 2000/02/07 05:29:42 erik Exp $ + * $Id: ping.c,v 1.11 2000/02/08 19:58:47 erik Exp $ * Mini ping implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> @@ -53,7 +54,7 @@ #define MAXPACKET 65468 #define MAX_DUP_CHK (8 * 128) #define MAXWAIT 10 -#define PINGINTERVAL 1 /* second */ +#define PINGINTERVAL 1 /* second */ #define O_QUIET (1 << 0) @@ -66,118 +67,124 @@ /* common routines */ static int in_cksum(unsigned short *buf, int sz) { - int nleft = sz; - int sum = 0; - unsigned short *w = buf; - unsigned short ans = 0; - - while (nleft > 1) { - sum += *w++; - nleft -= 2; - } - - if (nleft == 1) { - *(unsigned char *)(&ans) = *(unsigned char *)w; - sum += ans; - } - - sum = (sum >> 16) + (sum & 0xFFFF); - sum += (sum >> 16); - ans = ~sum; - return(ans); -} + int nleft = sz; + int sum = 0; + unsigned short *w = buf; + unsigned short ans = 0; + + while (nleft > 1) { + sum += *w++; + nleft -= 2; + } + + if (nleft == 1) { + *(unsigned char *) (&ans) = *(unsigned char *) w; + sum += ans; + } + + sum = (sum >> 16) + (sum & 0xFFFF); + sum += (sum >> 16); + ans = ~sum; + return (ans); +} /* simple version */ #ifdef BB_SIMPLE_PING -static const char* ping_usage = "ping host\n\n"; +static const char *ping_usage = "ping host\n\n"; -static char* hostname = NULL; +static char *hostname = NULL; static void noresp(int ign) { - printf("No response from %s\n", hostname); - exit(0); + printf("No response from %s\n", hostname); + exit(0); } static int ping(const char *host) { - struct hostent *h; - struct sockaddr_in pingaddr; - struct icmp *pkt; - int pingsock, c; - char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; - - if ((pingsock = socket(AF_INET, SOCK_RAW, 1)) < 0) { /* 1 == ICMP */ - perror("ping"); - exit(1); - } - - /* drop root privs if running setuid */ - setuid(getuid()); - - memset(&pingaddr, 0, sizeof(struct sockaddr_in)); - pingaddr.sin_family = AF_INET; - if (!(h = gethostbyname(host))) { - fprintf(stderr, "ping: unknown host %s\n", host); - exit(1); - } - memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); - hostname = h->h_name; - - pkt = (struct icmp *)packet; - memset(pkt, 0, sizeof(packet)); - pkt->icmp_type = ICMP_ECHO; - pkt->icmp_cksum = in_cksum((unsigned short *)pkt, sizeof(packet)); - - c = sendto(pingsock, packet, sizeof(packet), 0, - (struct sockaddr *)&pingaddr, sizeof(struct sockaddr_in)); - - if (c < 0 || c != sizeof(packet)) { - if (c < 0) perror("ping"); - fprintf(stderr, "ping: write incomplete\n"); - exit(1); - } - - signal(SIGALRM, noresp); - alarm(5); /* give the host 5000ms to respond */ - /* listen for replies */ - while (1) { - struct sockaddr_in from; - size_t fromlen = sizeof(from); - - if ((c = recvfrom(pingsock, packet, sizeof(packet), 0, - (struct sockaddr *)&from, &fromlen)) < 0) { - if (errno == EINTR) continue; - perror("ping"); - continue; + struct hostent *h; + struct sockaddr_in pingaddr; + struct icmp *pkt; + int pingsock, c; + char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; + + if ((pingsock = socket(AF_INET, SOCK_RAW, 1)) < 0) { /* 1 == ICMP */ + perror("ping"); + exit(1); + } + + /* drop root privs if running setuid */ + setuid(getuid()); + + memset(&pingaddr, 0, sizeof(struct sockaddr_in)); + + pingaddr.sin_family = AF_INET; + if (!(h = gethostbyname(host))) { + fprintf(stderr, "ping: unknown host %s\n", host); + exit(1); + } + memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); + hostname = h->h_name; + + pkt = (struct icmp *) packet; + memset(pkt, 0, sizeof(packet)); + pkt->icmp_type = ICMP_ECHO; + pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); + + c = sendto(pingsock, packet, sizeof(packet), 0, + (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in)); + + if (c < 0 || c != sizeof(packet)) { + if (c < 0) + perror("ping"); + fprintf(stderr, "ping: write incomplete\n"); + exit(1); + } + + signal(SIGALRM, noresp); + alarm(5); /* give the host 5000ms to respond */ + /* listen for replies */ + while (1) { + struct sockaddr_in from; + size_t fromlen = sizeof(from); + + if ((c = recvfrom(pingsock, packet, sizeof(packet), 0, + (struct sockaddr *) &from, &fromlen)) < 0) { + if (errno == EINTR) + continue; + perror("ping"); + continue; + } + if (c >= 76) { /* ip + icmp */ + struct iphdr *iphdr = (struct iphdr *) packet; + + pkt = (struct icmp *) (packet + (iphdr->ihl << 2)); /* skip ip hdr */ + if (pkt->icmp_type == ICMP_ECHOREPLY) + break; + } } - if (c >= 76) { /* ip + icmp */ - struct iphdr *iphdr = (struct iphdr *)packet; - pkt = (struct icmp *)(packet + (iphdr->ihl << 2)); /* skip ip hdr */ - if (pkt->icmp_type == ICMP_ECHOREPLY) break; - } - } - printf("%s is alive!\n", hostname); - return(TRUE); + printf("%s is alive!\n", hostname); + return (TRUE); } extern int ping_main(int argc, char **argv) { - argc--; - argv++; - if (argc < 1) usage(ping_usage); - ping(*argv); - exit(TRUE); + argc--; + argv++; + if (argc < 1) + usage(ping_usage); + ping(*argv); + exit(TRUE); } -#else +#else /* full(er) version */ -static const char* ping_usage = "ping [OPTION]... host\n\n" -"Send ICMP ECHO_REQUEST packets to network hosts.\n\n" -"Options:\n" -"\t-q\t\tQuiet mode, only displays output at start" -"\t\t\tand when finished.\n" -"\t-c COUNT\tSend only COUNT pings.\n"; +static const char *ping_usage = "ping [OPTION]... host\n\n" + "Send ICMP ECHO_REQUEST packets to network hosts.\n\n" + "Options:\n" + "\t-q\t\tQuiet mode, only displays output at start" + + "\t\t\tand when finished.\n" "\t-c COUNT\tSend only COUNT pings.\n"; static char *hostname = NULL; static struct sockaddr_in pingaddr; @@ -196,224 +203,247 @@ static void ping(char *); /**************************************************************************/ -static void pingstats(int ign) { - signal(SIGINT, SIG_IGN); - - printf("\n--- %s ping statistics ---\n", hostname); - printf("%ld packets transmitted, ", ntransmitted); - printf("%ld packets received, ", nreceived); - if (nrepeats) - printf("%ld duplicates, ", nrepeats); - if (ntransmitted) - printf("%ld%% packet loss\n", - (ntransmitted - nreceived)*100/ntransmitted); - if (nreceived) - printf("round-trip min/avg/max = %lu.%lu/%lu.%lu/%lu.%lu ms\n", - tmin/10, tmin%10, - (tsum/(nreceived+nrepeats))/10, - (tsum/(nreceived+nrepeats))%10, - tmax/10, tmax%10); - exit(0); +static void pingstats(int ign) +{ + signal(SIGINT, SIG_IGN); + + printf("\n--- %s ping statistics ---\n", hostname); + printf("%ld packets transmitted, ", ntransmitted); + printf("%ld packets received, ", nreceived); + if (nrepeats) + printf("%ld duplicates, ", nrepeats); + if (ntransmitted) + printf("%ld%% packet loss\n", + (ntransmitted - nreceived) * 100 / ntransmitted); + if (nreceived) + printf("round-trip min/avg/max = %lu.%lu/%lu.%lu/%lu.%lu ms\n", + tmin / 10, tmin % 10, + (tsum / (nreceived + nrepeats)) / 10, + (tsum / (nreceived + nrepeats)) % 10, tmax / 10, tmax % 10); + exit(0); } static void sendping(int ign) { - struct icmp *pkt; - int i; - char packet[DEFDATALEN + 8]; - - pkt = (struct icmp *)packet; - - pkt->icmp_type = ICMP_ECHO; - pkt->icmp_code = 0; - pkt->icmp_cksum = 0; - pkt->icmp_seq = ntransmitted++; - pkt->icmp_id = myid; - CLR(pkt->icmp_seq % MAX_DUP_CHK); - - gettimeofday((struct timeval *)&packet[8], NULL); - pkt->icmp_cksum = in_cksum((unsigned short *)pkt, sizeof(packet)); - - i = sendto(pingsock, packet, sizeof(packet), 0, - (struct sockaddr *)&pingaddr, sizeof(struct sockaddr_in)); - - if (i < 0 || i != sizeof(packet)) { - if (i < 0) perror("ping"); - fprintf(stderr, "ping wrote %d chars; %d expected\n", i, sizeof(packet)); - exit(1); - } - - signal(SIGALRM, sendping); - if (pingcount == 0 || ntransmitted < pingcount) { /* schedule next in 1s */ - alarm(PINGINTERVAL); - } else { /* done, wait for the last ping to come back */ - /* todo, don't necessarily need to wait so long... */ - signal(SIGALRM, pingstats); - alarm(MAXWAIT); - } + struct icmp *pkt; + int i; + char packet[DEFDATALEN + 8]; + + pkt = (struct icmp *) packet; + + pkt->icmp_type = ICMP_ECHO; + pkt->icmp_code = 0; + pkt->icmp_cksum = 0; + pkt->icmp_seq = ntransmitted++; + pkt->icmp_id = myid; + CLR(pkt->icmp_seq % MAX_DUP_CHK); + + gettimeofday((struct timeval *) &packet[8], NULL); + pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); + + i = sendto(pingsock, packet, sizeof(packet), 0, + (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in)); + + if (i < 0 || i != sizeof(packet)) { + if (i < 0) + perror("ping"); + fprintf(stderr, "ping wrote %d chars; %d expected\n", i, + sizeof(packet)); + exit(1); + } + + signal(SIGALRM, sendping); + if (pingcount == 0 || ntransmitted < pingcount) { /* schedule next in 1s */ + alarm(PINGINTERVAL); + } else { /* done, wait for the last ping to come back */ + /* todo, don't necessarily need to wait so long... */ + signal(SIGALRM, pingstats); + alarm(MAXWAIT); + } } - + static void unpack(char *buf, int sz, struct sockaddr_in *from) { - struct icmp *icmppkt; - struct iphdr *iphdr; - struct timeval tv, *tp; - int hlen, dupflag; - unsigned long triptime; - - gettimeofday(&tv, NULL); - - /* check IP header */ - iphdr = (struct iphdr *)buf; - hlen = iphdr->ihl << 2; - /* discard if too short */ - if (sz < (DEFDATALEN + ICMP_MINLEN)) return; - - sz -= hlen; - icmppkt = (struct icmp *)(buf + hlen); - - if (icmppkt->icmp_type == ICMP_ECHOREPLY) { - if (icmppkt->icmp_id != myid) return; /* not our ping */ - ++nreceived; - tp = (struct timeval *)icmppkt->icmp_data; - - if ((tv.tv_usec -= tp->tv_usec) < 0) { - --tv.tv_sec; - tv.tv_usec += 1000000; - } - tv.tv_sec -= tp->tv_sec; - - triptime = tv.tv_sec * 10000 + (tv.tv_usec / 100); - tsum += triptime; - if (triptime < tmin) tmin = triptime; - if (triptime > tmax) tmax = triptime; - - if (TST(icmppkt->icmp_seq % MAX_DUP_CHK)) { - ++nrepeats; - --nreceived; - dupflag = 1; + struct icmp *icmppkt; + struct iphdr *iphdr; + struct timeval tv, *tp; + int hlen, dupflag; + unsigned long triptime; + + gettimeofday(&tv, NULL); + + /* check IP header */ + iphdr = (struct iphdr *) buf; + hlen = iphdr->ihl << 2; + /* discard if too short */ + if (sz < (DEFDATALEN + ICMP_MINLEN)) + return; + + sz -= hlen; + icmppkt = (struct icmp *) (buf + hlen); + + if (icmppkt->icmp_type == ICMP_ECHOREPLY) { + if (icmppkt->icmp_id != myid) + return; /* not our ping */ + ++nreceived; + tp = (struct timeval *) icmppkt->icmp_data; + + if ((tv.tv_usec -= tp->tv_usec) < 0) { + --tv.tv_sec; + tv.tv_usec += 1000000; + } + tv.tv_sec -= tp->tv_sec; + + triptime = tv.tv_sec * 10000 + (tv.tv_usec / 100); + tsum += triptime; + if (triptime < tmin) + tmin = triptime; + if (triptime > tmax) + tmax = triptime; + + if (TST(icmppkt->icmp_seq % MAX_DUP_CHK)) { + ++nrepeats; + --nreceived; + dupflag = 1; + } else { + SET(icmppkt->icmp_seq % MAX_DUP_CHK); + dupflag = 0; + } + + if (options & O_QUIET) + return; + + printf("%d bytes from %s: icmp_seq=%u", sz, + inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr), + icmppkt->icmp_seq); + printf(" ttl=%d", iphdr->ttl); + printf(" time=%lu.%lu ms", triptime / 10, triptime % 10); + if (dupflag) + printf(" (DUP!)"); + printf("\n"); } else { - SET(icmppkt->icmp_seq % MAX_DUP_CHK); - dupflag = 0; + fprintf(stderr, + "Warning: unknown ICMP packet received (not echo-reply)\n"); } - - if (options & O_QUIET) return; - - printf("%d bytes from %s: icmp_seq=%u", sz, - inet_ntoa(*(struct in_addr *)&from->sin_addr.s_addr), - icmppkt->icmp_seq); - printf(" ttl=%d", iphdr->ttl); - printf(" time=%lu.%lu ms", triptime/10, triptime%10); - if (dupflag) printf(" (DUP!)"); - printf("\n"); - } else { - fprintf(stderr, "Warning: unknown ICMP packet received (not echo-reply)\n"); - } } static void ping(char *host) { - struct protoent *proto; - struct hostent *h; - char buf[MAXHOSTNAMELEN]; - char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; - int sockopt; - - proto = getprotobyname("icmp"); - /* if getprotobyname failed, just silently force - * proto->p_proto to have the correct value for "icmp" */ - if ((pingsock = socket(AF_INET, SOCK_RAW, - (proto ? proto->p_proto : 1))) < 0) { /* 1 == ICMP */ - if (errno == EPERM) { - fprintf(stderr, "ping: permission denied. (are you root?)\n"); - } else { - perror("ping"); + struct protoent *proto; + struct hostent *h; + char buf[MAXHOSTNAMELEN]; + char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; + int sockopt; + + proto = getprotobyname("icmp"); + /* if getprotobyname failed, just silently force + * proto->p_proto to have the correct value for "icmp" */ + if ((pingsock = socket(AF_INET, SOCK_RAW, + (proto ? proto->p_proto : 1))) < 0) { /* 1 == ICMP */ + if (errno == EPERM) { + fprintf(stderr, "ping: permission denied. (are you root?)\n"); + } else { + perror("ping"); + } + exit(1); } - exit(1); - } - - /* drop root privs if running setuid */ - setuid(getuid()); - - memset(&pingaddr, 0, sizeof(struct sockaddr_in)); - pingaddr.sin_family = AF_INET; - if (!(h = gethostbyname(host))) { - fprintf(stderr, "ping: unknown host %s\n", host); - exit(1); - } - - if (h->h_addrtype != AF_INET) { - fprintf(stderr, "ping: unknown address type; only AF_INET is currently supported.\n"); - exit(1); - } - - pingaddr.sin_family = AF_INET; /* h->h_addrtype */ - memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); - strncpy(buf, h->h_name, sizeof(buf)-1); - hostname = buf; - - /* enable broadcast pings */ - sockopt = 1; - setsockopt(pingsock, SOL_SOCKET, SO_BROADCAST, (char *)&sockopt, sizeof(sockopt)); - - /* set recv buf for broadcast pings */ - sockopt = 48 * 1024; - setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, (char *)&sockopt, sizeof(sockopt)); - - printf("PING %s (%s): %d data bytes\n", - hostname, inet_ntoa(*(struct in_addr *)&pingaddr.sin_addr.s_addr), - DEFDATALEN); - - signal(SIGINT, pingstats); - - /* start the ping's going ... */ - sendping(0); - - /* listen for replies */ - while (1) { - struct sockaddr_in from; - size_t fromlen = sizeof(from); - int c; - - if ((c = recvfrom(pingsock, packet, sizeof(packet), 0, - (struct sockaddr *)&from, &fromlen)) < 0) { - if (errno == EINTR) continue; - perror("ping"); - continue; + + /* drop root privs if running setuid */ + setuid(getuid()); + + memset(&pingaddr, 0, sizeof(struct sockaddr_in)); + + pingaddr.sin_family = AF_INET; + if (!(h = gethostbyname(host))) { + fprintf(stderr, "ping: unknown host %s\n", host); + exit(1); + } + + if (h->h_addrtype != AF_INET) { + fprintf(stderr, + "ping: unknown address type; only AF_INET is currently supported.\n"); + exit(1); } - unpack(packet, c, &from); - if (pingcount > 0 && nreceived >= pingcount) break; - } - pingstats(0); + + pingaddr.sin_family = AF_INET; /* h->h_addrtype */ + memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); + strncpy(buf, h->h_name, sizeof(buf) - 1); + hostname = buf; + + /* enable broadcast pings */ + sockopt = 1; + setsockopt(pingsock, SOL_SOCKET, SO_BROADCAST, (char *) &sockopt, + sizeof(sockopt)); + + /* set recv buf for broadcast pings */ + sockopt = 48 * 1024; + setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, (char *) &sockopt, + sizeof(sockopt)); + + printf("PING %s (%s): %d data bytes\n", + hostname, + inet_ntoa(*(struct in_addr *) &pingaddr.sin_addr.s_addr), + DEFDATALEN); + + signal(SIGINT, pingstats); + + /* start the ping's going ... */ + sendping(0); + + /* listen for replies */ + while (1) { + struct sockaddr_in from; + size_t fromlen = sizeof(from); + int c; + + if ((c = recvfrom(pingsock, packet, sizeof(packet), 0, + (struct sockaddr *) &from, &fromlen)) < 0) { + if (errno == EINTR) + continue; + perror("ping"); + continue; + } + unpack(packet, c, &from); + if (pingcount > 0 && nreceived >= pingcount) + break; + } + pingstats(0); } extern int ping_main(int argc, char **argv) { - char *thisarg; - - argc--; - argv++; - options = 0; - /* Parse any options */ - while (argc > 1) { - if (**argv != '-') usage(ping_usage); - thisarg = *argv; thisarg++; - switch (*thisarg) { - case 'q': options |= O_QUIET; break; - case 'c': - argc--; argv++; - pingcount = atoi(*argv); - break; - default: - usage(ping_usage); - } - argc--; argv++; - } - if (argc < 1) usage(ping_usage); - - myid = getpid() & 0xFFFF; - ping(*argv); - exit(TRUE); + char *thisarg; + + argc--; + argv++; + options = 0; + /* Parse any options */ + while (argc > 1) { + if (**argv != '-') + usage(ping_usage); + thisarg = *argv; + thisarg++; + switch (*thisarg) { + case 'q': + options |= O_QUIET; + break; + case 'c': + argc--; + argv++; + pingcount = atoi(*argv); + break; + default: + usage(ping_usage); + } + argc--; + argv++; + } + if (argc < 1) + usage(ping_usage); + + myid = getpid() & 0xFFFF; + ping(*argv); + exit(TRUE); } #endif diff --git a/nfsmount.c b/nfsmount.c index f2bd2f49c..03ce58447 100644 --- a/nfsmount.c +++ b/nfsmount.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * nfsmount.c -- Linux NFS mount * Copyright (C) 1993 Rick Sladkey <jrs@world.std.com> @@ -53,7 +54,7 @@ #define _ #define HAVE_inet_aton -#define MS_REMOUNT 32 /* Alter flags of a mounted FS */ +#define MS_REMOUNT 32 /* Alter flags of a mounted FS */ #define sloppy 0 #define EX_FAIL 1 #define EX_BG 1 @@ -65,8 +66,8 @@ static char *nfs_strerror(int stat); #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) -static int -linux_version_code(void) { +static int linux_version_code(void) +{ struct utsname my_utsname; int p, q, r; @@ -74,7 +75,7 @@ linux_version_code(void) { p = atoi(strtok(my_utsname.release, ".")); q = atoi(strtok(NULL, ".")); r = atoi(strtok(NULL, ".")); - return MAKE_VERSION(p,q,r); + return MAKE_VERSION(p, q, r); } return 0; } @@ -95,22 +96,22 @@ static int nfs_mount_version = NFS_MOUNT_VERSION; * NFS_MOUNT_VERSION: these nfsmount sources at compile time * nfs_mount_version: version this source and running kernel can handle */ -static void -find_kernel_nfs_mount_version(void) { +static void find_kernel_nfs_mount_version(void) +{ int kernel_version = linux_version_code(); if (kernel_version) { - if (kernel_version < MAKE_VERSION(2,1,32)) - nfs_mount_version = 1; - else - nfs_mount_version = 3; + if (kernel_version < MAKE_VERSION(2, 1, 32)) + nfs_mount_version = 1; + else + nfs_mount_version = 3; } if (nfs_mount_version > NFS_MOUNT_VERSION) - nfs_mount_version = NFS_MOUNT_VERSION; + nfs_mount_version = NFS_MOUNT_VERSION; } int nfsmount(const char *spec, const char *node, unsigned long *flags, - char **extra_opts, char **mount_opts, int running_bg) + char **extra_opts, char **mount_opts, int running_bg) { static char *prev_bg_host; char hostdir[1024]; @@ -118,7 +119,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, char *hostname; char *dirname; char *old_opts; - char *mounthost=NULL; + char *mounthost = NULL; char new_opts[1024]; fhandle root_fhandle; struct timeval total_timeout; @@ -161,7 +162,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, mclient = NULL; if (strlen(spec) >= sizeof(hostdir)) { fprintf(stderr, _("mount: " - "excessively long host:dir argument\n")); + "excessively long host:dir argument\n")); goto fail; } strcpy(hostdir, spec); @@ -174,11 +175,11 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if ((s = strchr(hostdir, ','))) { *s = '\0'; fprintf(stderr, _("mount: warning: " - "multiple hostnames not supported\n")); + "multiple hostnames not supported\n")); } } else { fprintf(stderr, _("mount: " - "directory to mount not in host:dir format\n")); + "directory to mount not in host:dir format\n")); goto fail; } @@ -189,20 +190,18 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, { if ((hp = gethostbyname(hostname)) == NULL) { fprintf(stderr, _("mount: can't get address for %s\n"), - hostname); + hostname); goto fail; } else { if (hp->h_length > sizeof(struct in_addr)) { - fprintf(stderr, - _("mount: got bad hp->h_length\n")); + fprintf(stderr, _("mount: got bad hp->h_length\n")); hp->h_length = sizeof(struct in_addr); } - memcpy(&server_addr.sin_addr, - hp->h_addr, hp->h_length); + memcpy(&server_addr.sin_addr, hp->h_addr, hp->h_length); } } - memcpy (&mount_server_addr, &server_addr, sizeof (mount_server_addr)); + memcpy(&mount_server_addr, &server_addr, sizeof(mount_server_addr)); /* add IP address to mtab options for use when unmounting */ @@ -211,12 +210,10 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if (!old_opts) old_opts = ""; if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) { - fprintf(stderr, _("mount: " - "excessively long option argument\n")); + fprintf(stderr, _("mount: " "excessively long option argument\n")); goto fail; } - sprintf(new_opts, "%s%saddr=%s", - old_opts, *old_opts ? "," : "", s); + sprintf(new_opts, "%s%saddr=%s", old_opts, *old_opts ? "," : "", s); *extra_opts = xstrdup(new_opts); /* Set default options. @@ -224,13 +221,13 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, * let the kernel decide. * timeo is filled in after we know whether it'll be TCP or UDP. */ memset(&data, 0, sizeof(data)); - data.retrans = 3; - data.acregmin = 3; - data.acregmax = 60; - data.acdirmin = 30; - data.acdirmax = 60; + data.retrans = 3; + data.acregmin = 3; + data.acregmax = 60; + data.acdirmin = 30; + data.acdirmax = 60; #if NFS_MOUNT_VERSION >= 2 - data.namlen = NAME_MAX; + data.namlen = NAME_MAX; #endif bg = 0; @@ -240,7 +237,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, nocto = 0; nolock = 0; noac = 0; - retry = 10000; /* 10000 minutes ~ 1 week */ + retry = 10000; /* 10000 minutes ~ 1 week */ tcp = 0; mountprog = MOUNTPROG; @@ -254,7 +251,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, for (opt = strtok(old_opts, ","); opt; opt = strtok(NULL, ",")) { if ((opteq = strchr(opt, '='))) { - val = atoi(opteq + 1); + val = atoi(opteq + 1); *opteq = '\0'; if (!strcmp(opt, "rsize")) data.rsize = val; @@ -277,29 +274,27 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, data.acregmax = val; data.acdirmin = val; data.acdirmax = val; - } - else if (!strcmp(opt, "retry")) + } else if (!strcmp(opt, "retry")) retry = val; else if (!strcmp(opt, "port")) port = val; else if (!strcmp(opt, "mountport")) - mountport = val; + mountport = val; else if (!strcmp(opt, "mounthost")) - mounthost=xstrndup(opteq+1, - strcspn(opteq+1," \t\n\r,")); + mounthost = xstrndup(opteq + 1, + strcspn(opteq + 1, " \t\n\r,")); else if (!strcmp(opt, "mountprog")) mountprog = val; else if (!strcmp(opt, "mountvers")) mountvers = val; else if (!strcmp(opt, "nfsprog")) nfsprog = val; - else if (!strcmp(opt, "nfsvers") || - !strcmp(opt, "vers")) + else if (!strcmp(opt, "nfsvers") || !strcmp(opt, "vers")) nfsvers = val; else if (!strcmp(opt, "proto")) { - if (!strncmp(opteq+1, "tcp", 3)) + if (!strncmp(opteq + 1, "tcp", 3)) tcp = 1; - else if (!strncmp(opteq+1, "udp", 3)) + else if (!strncmp(opteq + 1, "udp", 3)) tcp = 0; else printf(_("Warning: Unrecognized proto= option.\n")); @@ -309,24 +304,24 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, data.namlen = val; else #endif - printf(_("Warning: Option namlen is not supported.\n")); + printf(_ + ("Warning: Option namlen is not supported.\n")); } else if (!strcmp(opt, "addr")) - /* ignore */; + /* ignore */ ; else { printf(_("unknown nfs mount parameter: " - "%s=%d\n"), opt, val); + "%s=%d\n"), opt, val); goto fail; } - } - else { + } else { val = 1; if (!strncmp(opt, "no", 2)) { val = 0; opt += 2; } - if (!strcmp(opt, "bg")) + if (!strcmp(opt, "bg")) bg = val; - else if (!strcmp(opt, "fg")) + else if (!strcmp(opt, "fg")) bg = !val; else if (!strcmp(opt, "soft")) soft = val; @@ -348,11 +343,12 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if (nfs_mount_version >= 3) nolock = !val; else - printf(_("Warning: option nolock is not supported.\n")); + printf(_ + ("Warning: option nolock is not supported.\n")); } else { if (!sloppy) { printf(_("unknown nfs mount option: " - "%s%s\n"), val ? "" : "no", opt); + "%s%s\n"), val ? "" : "no", opt); goto fail; } } @@ -378,22 +374,21 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, #ifdef NFS_MOUNT_DEBUG printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n", - data.rsize, data.wsize, data.timeo, data.retrans); + data.rsize, data.wsize, data.timeo, data.retrans); printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n", - data.acregmin, data.acregmax, data.acdirmin, data.acdirmax); + data.acregmin, data.acregmax, data.acdirmin, data.acdirmax); printf("port = %d, bg = %d, retry = %d, flags = %.8x\n", - port, bg, retry, data.flags); + port, bg, retry, data.flags); printf("mountprog = %d, mountvers = %d, nfsprog = %d, nfsvers = %d\n", - mountprog, mountvers, nfsprog, nfsvers); + mountprog, mountvers, nfsprog, nfsvers); printf("soft = %d, intr = %d, posix = %d, nocto = %d, noac = %d\n", - (data.flags & NFS_MOUNT_SOFT) != 0, - (data.flags & NFS_MOUNT_INTR) != 0, - (data.flags & NFS_MOUNT_POSIX) != 0, - (data.flags & NFS_MOUNT_NOCTO) != 0, - (data.flags & NFS_MOUNT_NOAC) != 0); + (data.flags & NFS_MOUNT_SOFT) != 0, + (data.flags & NFS_MOUNT_INTR) != 0, + (data.flags & NFS_MOUNT_POSIX) != 0, + (data.flags & NFS_MOUNT_NOCTO) != 0, + (data.flags & NFS_MOUNT_NOAC) != 0); #if NFS_MOUNT_VERSION >= 2 - printf("tcp = %d\n", - (data.flags & NFS_MOUNT_TCP) != 0); + printf("tcp = %d\n", (data.flags & NFS_MOUNT_TCP) != 0); #endif #endif @@ -409,7 +404,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, * give up immediately, to avoid the initial timeout. */ if (bg && !running_bg && - prev_bg_host && strcmp(hostname, prev_bg_host) == 0) { + prev_bg_host && strcmp(hostname, prev_bg_host) == 0) { if (retry > 0) retval = EX_BG; return retval; @@ -418,25 +413,24 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, /* create mount deamon client */ /* See if the nfs host = mount host. */ if (mounthost) { - if (mounthost[0] >= '0' && mounthost[0] <= '9') { - mount_server_addr.sin_family = AF_INET; - mount_server_addr.sin_addr.s_addr = inet_addr(hostname); - } else { - if ((hp = gethostbyname(mounthost)) == NULL) { - fprintf(stderr, _("mount: can't get address for %s\n"), - hostname); - goto fail; - } else { - if (hp->h_length > sizeof(struct in_addr)) { - fprintf(stderr, - _("mount: got bad hp->h_length?\n")); - hp->h_length = sizeof(struct in_addr); - } - mount_server_addr.sin_family = AF_INET; - memcpy(&mount_server_addr.sin_addr, - hp->h_addr, hp->h_length); - } - } + if (mounthost[0] >= '0' && mounthost[0] <= '9') { + mount_server_addr.sin_family = AF_INET; + mount_server_addr.sin_addr.s_addr = inet_addr(hostname); + } else { + if ((hp = gethostbyname(mounthost)) == NULL) { + fprintf(stderr, _("mount: can't get address for %s\n"), + hostname); + goto fail; + } else { + if (hp->h_length > sizeof(struct in_addr)) { + fprintf(stderr, _("mount: got bad hp->h_length?\n")); + hp->h_length = sizeof(struct in_addr); + } + mount_server_addr.sin_family = AF_INET; + memcpy(&mount_server_addr.sin_addr, + hp->h_addr, hp->h_length); + } + } } /* @@ -466,7 +460,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, for (;;) { if (bg && stat(node, &statbuf) == -1) { if (running_bg) { - sleep(val); /* 1, 2, 4, 8, 16, 30, ... */ + sleep(val); /* 1, 2, 4, 8, 16, 30, ... */ val *= 2; if (val > 30) val = 30; @@ -480,24 +474,24 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, mount_server_addr.sin_port = htons(mountport); msock = RPC_ANYSOCK; mclient = clnttcp_create(&mount_server_addr, - mountprog, mountvers, - &msock, 0, 0); + mountprog, mountvers, &msock, 0, 0); /* if this fails, contact the mount daemon via UDP */ if (!mclient) { mount_server_addr.sin_port = htons(mountport); msock = RPC_ANYSOCK; mclient = clntudp_create(&mount_server_addr, - mountprog, mountvers, - retry_timeout, &msock); + mountprog, mountvers, + retry_timeout, &msock); } if (mclient) { /* try to mount hostname:dirname */ mclient->cl_auth = authunix_create_default(); clnt_stat = clnt_call(mclient, MOUNTPROC_MNT, - (xdrproc_t) xdr_dirpath, (caddr_t) &dirname, - (xdrproc_t) xdr_fhstatus, (caddr_t) &status, - total_timeout); + (xdrproc_t) xdr_dirpath, + (caddr_t) & dirname, + (xdrproc_t) xdr_fhstatus, + (caddr_t) & status, total_timeout); if (clnt_stat == RPC_SUCCESS) break; /* we're done */ if (errno != ECONNREFUSED) { @@ -517,7 +511,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, prevt = t; } if (!bg) - goto fail; + goto fail; if (!running_bg) { prev_bg_host = xstrdup(hostname); if (retry > 0) @@ -531,18 +525,18 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if (status.fhs_status != 0) { fprintf(stderr, - _("mount: %s:%s failed, reason given by server: %s\n"), - hostname, dirname, nfs_strerror(status.fhs_status)); + _("mount: %s:%s failed, reason given by server: %s\n"), + hostname, dirname, nfs_strerror(status.fhs_status)); goto fail; } memcpy((char *) &root_fhandle, (char *) status.fhstatus_u.fhs_fhandle, - sizeof (root_fhandle)); + sizeof(root_fhandle)); /* create nfs socket for kernel */ if (tcp) { if (nfs_mount_version < 3) { - printf(_("NFS over TCP is not supported.\n")); + printf(_("NFS over TCP is not supported.\n")); goto fail; } fsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -559,7 +553,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if (port == 0) { server_addr.sin_port = PMAPPORT; port = pmap_getport(&server_addr, nfsprog, nfsvers, - tcp ? IPPROTO_TCP : IPPROTO_UDP); + tcp ? IPPROTO_TCP : IPPROTO_UDP); if (port == 0) port = NFS_PORT; #ifdef NFS_MOUNT_DEBUG @@ -571,14 +565,14 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, printf(_("using port %d for nfs deamon\n"), port); #endif server_addr.sin_port = htons(port); - /* - * connect() the socket for kernels 1.3.10 and below only, - * to avoid problems with multihomed hosts. - * --Swen - */ + /* + * connect() the socket for kernels 1.3.10 and below only, + * to avoid problems with multihomed hosts. + * --Swen + */ if (linux_version_code() <= 66314 - && connect(fsock, (struct sockaddr *) &server_addr, - sizeof (server_addr)) < 0) { + && connect(fsock, (struct sockaddr *) &server_addr, + sizeof(server_addr)) < 0) { perror(_("nfs connect")); goto fail; } @@ -587,7 +581,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, data.fd = fsock; memcpy((char *) &data.root, (char *) &root_fhandle, - sizeof (root_fhandle)); + sizeof(root_fhandle)); memcpy((char *) &data.addr, (char *) &server_addr, sizeof(data.addr)); strncpy(data.hostname, hostname, sizeof(data.hostname)); @@ -600,7 +594,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, /* abort */ -fail: + fail: if (msock != -1) { if (mclient) { auth_destroy(mclient->cl_auth); @@ -611,7 +605,7 @@ fail: if (fsock != -1) close(fsock); return retval; -} +} /* * We need to translate between nfs status return values and @@ -630,33 +624,37 @@ static struct { enum nfs_stat stat; int errnum; } nfs_errtbl[] = { - { NFS_OK, 0 }, - { NFSERR_PERM, EPERM }, - { NFSERR_NOENT, ENOENT }, - { NFSERR_IO, EIO }, - { NFSERR_NXIO, ENXIO }, - { NFSERR_ACCES, EACCES }, - { NFSERR_EXIST, EEXIST }, - { NFSERR_NODEV, ENODEV }, - { NFSERR_NOTDIR, ENOTDIR }, - { NFSERR_ISDIR, EISDIR }, + { + NFS_OK, 0}, { + NFSERR_PERM, EPERM}, { + NFSERR_NOENT, ENOENT}, { + NFSERR_IO, EIO}, { + NFSERR_NXIO, ENXIO}, { + NFSERR_ACCES, EACCES}, { + NFSERR_EXIST, EEXIST}, { + NFSERR_NODEV, ENODEV}, { + NFSERR_NOTDIR, ENOTDIR}, { + NFSERR_ISDIR, EISDIR}, #ifdef NFSERR_INVAL - { NFSERR_INVAL, EINVAL }, /* that Sun forgot */ + { + NFSERR_INVAL, EINVAL}, /* that Sun forgot */ #endif - { NFSERR_FBIG, EFBIG }, - { NFSERR_NOSPC, ENOSPC }, - { NFSERR_ROFS, EROFS }, - { NFSERR_NAMETOOLONG, ENAMETOOLONG }, - { NFSERR_NOTEMPTY, ENOTEMPTY }, - { NFSERR_DQUOT, EDQUOT }, - { NFSERR_STALE, ESTALE }, + { + NFSERR_FBIG, EFBIG}, { + NFSERR_NOSPC, ENOSPC}, { + NFSERR_ROFS, EROFS}, { + NFSERR_NAMETOOLONG, ENAMETOOLONG}, { + NFSERR_NOTEMPTY, ENOTEMPTY}, { + NFSERR_DQUOT, EDQUOT}, { + NFSERR_STALE, ESTALE}, #ifdef EWFLUSH - { NFSERR_WFLUSH, EWFLUSH }, + { + NFSERR_WFLUSH, EWFLUSH}, #endif - /* Throw in some NFSv3 values for even more fun (HP returns these) */ - { 71, EREMOTE }, - - { -1, EIO } + /* Throw in some NFSv3 values for even more fun (HP returns these) */ + { + 71, EREMOTE}, { + -1, EIO} }; static char *nfs_strerror(int stat) @@ -673,33 +671,32 @@ static char *nfs_strerror(int stat) } #if 0 -int -my_getport(struct in_addr server, struct timeval *timeo, ...) +int my_getport(struct in_addr server, struct timeval *timeo, ...) { - struct sockaddr_in sin; - struct pmap pmap; - CLIENT *clnt; - int sock = RPC_ANYSOCK, port; - - pmap.pm_prog = prog; - pmap.pm_vers = vers; - pmap.pm_prot = prot; - pmap.pm_port = 0; - sin.sin_family = AF_INET; - sin.sin_addr = server; - sin.sin_port = htons(111); - clnt = clntudp_create(&sin, 100000, 2, *timeo, &sock); - status = clnt_call(clnt, PMAP_GETPORT, - &pmap, (xdrproc_t) xdr_pmap, - &port, (xdrproc_t) xdr_uint); - if (status != SUCCESS) { - /* natter */ - port = 0; - } - - clnt_destroy(clnt); - close(sock); - return port; + struct sockaddr_in sin; + struct pmap pmap; + CLIENT *clnt; + int sock = RPC_ANYSOCK, port; + + pmap.pm_prog = prog; + pmap.pm_vers = vers; + pmap.pm_prot = prot; + pmap.pm_port = 0; + sin.sin_family = AF_INET; + sin.sin_addr = server; + sin.sin_port = htons(111); + clnt = clntudp_create(&sin, 100000, 2, *timeo, &sock); + status = clnt_call(clnt, PMAP_GETPORT, + &pmap, (xdrproc_t) xdr_pmap, + &port, (xdrproc_t) xdr_uint); + if (status != SUCCESS) { + /* natter */ + port = 0; + } + + clnt_destroy(clnt); + close(sock); + return port; } #endif @@ -756,28 +753,26 @@ my_getport(struct in_addr server, struct timeval *timeo, ...) /* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */ -bool_t -xdr_fhandle(XDR *xdrs, fhandle objp) +bool_t xdr_fhandle(XDR * xdrs, fhandle objp) { - if (!xdr_opaque(xdrs, objp, FHSIZE)) { - return (FALSE); - } + if (!xdr_opaque(xdrs, objp, FHSIZE)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_fhstatus(XDR *xdrs, fhstatus *objp) +bool_t xdr_fhstatus(XDR * xdrs, fhstatus * objp) { - if (!xdr_u_int(xdrs, &objp->fhs_status)) { - return (FALSE); - } + if (!xdr_u_int(xdrs, &objp->fhs_status)) { + return (FALSE); + } switch (objp->fhs_status) { case 0: - if (!xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle)) { - return (FALSE); - } + if (!xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle)) { + return (FALSE); + } break; default: break; @@ -785,245 +780,246 @@ xdr_fhstatus(XDR *xdrs, fhstatus *objp) return (TRUE); } -bool_t -xdr_dirpath(XDR *xdrs, dirpath *objp) +bool_t xdr_dirpath(XDR * xdrs, dirpath * objp) { - if (!xdr_string(xdrs, objp, MNTPATHLEN)) { - return (FALSE); - } + if (!xdr_string(xdrs, objp, MNTPATHLEN)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_name(XDR *xdrs, name *objp) +bool_t xdr_name(XDR * xdrs, name * objp) { - if (!xdr_string(xdrs, objp, MNTNAMLEN)) { - return (FALSE); - } + if (!xdr_string(xdrs, objp, MNTNAMLEN)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_mountlist(XDR *xdrs, mountlist *objp) +bool_t xdr_mountlist(XDR * xdrs, mountlist * objp) { - if (!xdr_pointer(xdrs, (char **)objp, sizeof(struct mountbody), (xdrproc_t)xdr_mountbody)) { - return (FALSE); - } + if (!xdr_pointer + (xdrs, (char **) objp, sizeof(struct mountbody), + (xdrproc_t) xdr_mountbody)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_mountbody(XDR *xdrs, mountbody *objp) +bool_t xdr_mountbody(XDR * xdrs, mountbody * objp) { - if (!xdr_name(xdrs, &objp->ml_hostname)) { - return (FALSE); - } - if (!xdr_dirpath(xdrs, &objp->ml_directory)) { - return (FALSE); - } - if (!xdr_mountlist(xdrs, &objp->ml_next)) { - return (FALSE); - } + if (!xdr_name(xdrs, &objp->ml_hostname)) { + return (FALSE); + } + if (!xdr_dirpath(xdrs, &objp->ml_directory)) { + return (FALSE); + } + if (!xdr_mountlist(xdrs, &objp->ml_next)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_groups(XDR *xdrs, groups *objp) +bool_t xdr_groups(XDR * xdrs, groups * objp) { - if (!xdr_pointer(xdrs, (char **)objp, sizeof(struct groupnode), (xdrproc_t)xdr_groupnode)) { - return (FALSE); - } + if (!xdr_pointer + (xdrs, (char **) objp, sizeof(struct groupnode), + (xdrproc_t) xdr_groupnode)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_groupnode(XDR *xdrs, groupnode *objp) +bool_t xdr_groupnode(XDR * xdrs, groupnode * objp) { - if (!xdr_name(xdrs, &objp->gr_name)) { - return (FALSE); - } - if (!xdr_groups(xdrs, &objp->gr_next)) { - return (FALSE); - } + if (!xdr_name(xdrs, &objp->gr_name)) { + return (FALSE); + } + if (!xdr_groups(xdrs, &objp->gr_next)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_exports(XDR *xdrs, exports *objp) +bool_t xdr_exports(XDR * xdrs, exports * objp) { - if (!xdr_pointer(xdrs, (char **)objp, sizeof(struct exportnode), (xdrproc_t)xdr_exportnode)) { - return (FALSE); - } + if (!xdr_pointer + (xdrs, (char **) objp, sizeof(struct exportnode), + (xdrproc_t) xdr_exportnode)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_exportnode(XDR *xdrs, exportnode *objp) +bool_t xdr_exportnode(XDR * xdrs, exportnode * objp) { - if (!xdr_dirpath(xdrs, &objp->ex_dir)) { - return (FALSE); - } - if (!xdr_groups(xdrs, &objp->ex_groups)) { - return (FALSE); - } - if (!xdr_exports(xdrs, &objp->ex_next)) { - return (FALSE); - } + if (!xdr_dirpath(xdrs, &objp->ex_dir)) { + return (FALSE); + } + if (!xdr_groups(xdrs, &objp->ex_groups)) { + return (FALSE); + } + if (!xdr_exports(xdrs, &objp->ex_next)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_ppathcnf(XDR *xdrs, ppathcnf *objp) +bool_t xdr_ppathcnf(XDR * xdrs, ppathcnf * objp) { - register long *buf; - - int i; - - if (xdrs->x_op == XDR_ENCODE) { - buf = (long*)XDR_INLINE(xdrs,6 * BYTES_PER_XDR_UNIT); - if (buf == NULL) { - if (!xdr_int(xdrs, &objp->pc_link_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_canon)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_input)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_name_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_path_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { - return (FALSE); - } - - } - else { - IXDR_PUT_LONG(buf,objp->pc_link_max); - IXDR_PUT_SHORT(buf,objp->pc_max_canon); - IXDR_PUT_SHORT(buf,objp->pc_max_input); - IXDR_PUT_SHORT(buf,objp->pc_name_max); - IXDR_PUT_SHORT(buf,objp->pc_path_max); - IXDR_PUT_SHORT(buf,objp->pc_pipe_buf); - } - if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { - return (FALSE); - } - if (!xdr_char(xdrs, &objp->pc_xxx)) { - return (FALSE); - } - buf = (long*)XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); + register long *buf; + + int i; + + if (xdrs->x_op == XDR_ENCODE) { + buf = (long *) XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) { - return (FALSE); - } - - } - else { - { register short *genp; - for ( i = 0,genp=objp->pc_mask; - i < 2; i++){ - IXDR_PUT_SHORT(buf,*genp++); - } - }; - } - - return (TRUE); + if (!xdr_int(xdrs, &objp->pc_link_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_canon)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_input)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_name_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_path_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { + return (FALSE); + } + + } else { + IXDR_PUT_LONG(buf, objp->pc_link_max); + IXDR_PUT_SHORT(buf, objp->pc_max_canon); + IXDR_PUT_SHORT(buf, objp->pc_max_input); + IXDR_PUT_SHORT(buf, objp->pc_name_max); + IXDR_PUT_SHORT(buf, objp->pc_path_max); + IXDR_PUT_SHORT(buf, objp->pc_pipe_buf); + } + if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { + return (FALSE); + } + if (!xdr_char(xdrs, &objp->pc_xxx)) { + return (FALSE); + } + buf = (long *) XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); + if (buf == NULL) { + if (!xdr_vector + (xdrs, (char *) objp->pc_mask, 2, sizeof(short), + (xdrproc_t) xdr_short)) { + return (FALSE); + } + + } else { + { + register short *genp; + + for (i = 0, genp = objp->pc_mask; i < 2; i++) { + IXDR_PUT_SHORT(buf, *genp++); + } + }; + } + + return (TRUE); } else if (xdrs->x_op == XDR_DECODE) { - buf = (long*)XDR_INLINE(xdrs,6 * BYTES_PER_XDR_UNIT); - if (buf == NULL) { - if (!xdr_int(xdrs, &objp->pc_link_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_canon)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_input)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_name_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_path_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { - return (FALSE); - } - - } - else { - objp->pc_link_max = IXDR_GET_LONG(buf); - objp->pc_max_canon = IXDR_GET_SHORT(buf); - objp->pc_max_input = IXDR_GET_SHORT(buf); - objp->pc_name_max = IXDR_GET_SHORT(buf); - objp->pc_path_max = IXDR_GET_SHORT(buf); - objp->pc_pipe_buf = IXDR_GET_SHORT(buf); - } - if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { - return (FALSE); - } - if (!xdr_char(xdrs, &objp->pc_xxx)) { - return (FALSE); - } - buf = (long*)XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); + buf = (long *) XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT); + if (buf == NULL) { + if (!xdr_int(xdrs, &objp->pc_link_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_canon)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_input)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_name_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_path_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { + return (FALSE); + } + + } else { + objp->pc_link_max = IXDR_GET_LONG(buf); + objp->pc_max_canon = IXDR_GET_SHORT(buf); + objp->pc_max_input = IXDR_GET_SHORT(buf); + objp->pc_name_max = IXDR_GET_SHORT(buf); + objp->pc_path_max = IXDR_GET_SHORT(buf); + objp->pc_pipe_buf = IXDR_GET_SHORT(buf); + } + if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { + return (FALSE); + } + if (!xdr_char(xdrs, &objp->pc_xxx)) { + return (FALSE); + } + buf = (long *) XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) { - return (FALSE); - } - - } - else { - { register short *genp; - for ( i = 0,genp=objp->pc_mask; - i < 2; i++){ - *genp++ = IXDR_GET_SHORT(buf); - } - }; - } - return(TRUE); + if (!xdr_vector + (xdrs, (char *) objp->pc_mask, 2, sizeof(short), + (xdrproc_t) xdr_short)) { + return (FALSE); + } + + } else { + { + register short *genp; + + for (i = 0, genp = objp->pc_mask; i < 2; i++) { + *genp++ = IXDR_GET_SHORT(buf); + } + }; + } + return (TRUE); } - if (!xdr_int(xdrs, &objp->pc_link_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_canon)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_input)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_name_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_path_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { - return (FALSE); - } - if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { - return (FALSE); - } - if (!xdr_char(xdrs, &objp->pc_xxx)) { - return (FALSE); - } - if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) { - return (FALSE); - } + if (!xdr_int(xdrs, &objp->pc_link_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_canon)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_input)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_name_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_path_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { + return (FALSE); + } + if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { + return (FALSE); + } + if (!xdr_char(xdrs, &objp->pc_xxx)) { + return (FALSE); + } + if (!xdr_vector + (xdrs, (char *) objp->pc_mask, 2, sizeof(short), + (xdrproc_t) xdr_short)) { + return (FALSE); + } return (TRUE); } @@ -1063,247 +1059,232 @@ xdr_ppathcnf(XDR *xdrs, ppathcnf *objp) /* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */ -#include <string.h> /* for memset() */ +#include <string.h> /* for memset() */ /* Default timeout can be changed using clnt_control() */ static struct timeval TIMEOUT = { 25, 0 }; -void * -mountproc_null_1(argp, clnt) - void *argp; - CLIENT *clnt; +void *mountproc_null_1(argp, clnt) +void *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); - if (clnt_call(clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, argp, (xdrproc_t) xdr_void, &clnt_res, TIMEOUT) != RPC_SUCCESS) { + memset((char *) &clnt_res, 0, sizeof(clnt_res)); + if (clnt_call + (clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, argp, + (xdrproc_t) xdr_void, &clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -fhstatus * -mountproc_mnt_1(argp, clnt) - dirpath *argp; - CLIENT *clnt; +fhstatus *mountproc_mnt_1(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static fhstatus clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_MNT, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_fhstatus, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_fhstatus, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -mountlist * -mountproc_dump_1(argp, clnt) - void *argp; - CLIENT *clnt; +mountlist *mountproc_dump_1(argp, clnt) +void *argp; +CLIENT *clnt; { static mountlist clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_DUMP, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_mountlist, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_mountlist, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -void * -mountproc_umnt_1(argp, clnt) - dirpath *argp; - CLIENT *clnt; +void *mountproc_umnt_1(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_UMNT, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_void, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_void, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -void * -mountproc_umntall_1(argp, clnt) - void *argp; - CLIENT *clnt; +void *mountproc_umntall_1(argp, clnt) +void *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_UMNTALL, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_void, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_void, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -exports * -mountproc_export_1(argp, clnt) - void *argp; - CLIENT *clnt; +exports *mountproc_export_1(argp, clnt) +void *argp; +CLIENT *clnt; { static exports clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_EXPORT, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_exports, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_exports, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -exports * -mountproc_exportall_1(argp, clnt) - void *argp; - CLIENT *clnt; +exports *mountproc_exportall_1(argp, clnt) +void *argp; +CLIENT *clnt; { static exports clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_EXPORTALL, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_exports, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { - return (NULL); + (caddr_t) argp, (xdrproc_t) xdr_exports, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { + return (NULL); } return (&clnt_res); } -void * -mountproc_null_2(argp, clnt) - void *argp; - CLIENT *clnt; +void *mountproc_null_2(argp, clnt) +void *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); - if (clnt_call(clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, argp, (xdrproc_t) xdr_void, &clnt_res, TIMEOUT) != RPC_SUCCESS) { + memset((char *) &clnt_res, 0, sizeof(clnt_res)); + if (clnt_call + (clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, argp, + (xdrproc_t) xdr_void, &clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -fhstatus * -mountproc_mnt_2(argp, clnt) - dirpath *argp; - CLIENT *clnt; +fhstatus *mountproc_mnt_2(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static fhstatus clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_MNT, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_fhstatus, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_fhstatus, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -mountlist * -mountproc_dump_2(argp, clnt) - void *argp; - CLIENT *clnt; +mountlist *mountproc_dump_2(argp, clnt) +void *argp; +CLIENT *clnt; { static mountlist clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_DUMP, (xdrproc_t) xdr_void, argp, - (xdrproc_t) xdr_mountlist, (caddr_t) &clnt_res, - TIMEOUT) != RPC_SUCCESS) { + (xdrproc_t) xdr_mountlist, (caddr_t) & clnt_res, + TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -void * -mountproc_umnt_2(argp, clnt) - dirpath *argp; - CLIENT *clnt; +void *mountproc_umnt_2(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_UMNT, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_void, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_void, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -void * -mountproc_umntall_2(argp, clnt) - void *argp; - CLIENT *clnt; +void *mountproc_umntall_2(argp, clnt) +void *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_UMNTALL, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_void, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_void, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -exports * -mountproc_export_2(argp, clnt) - void *argp; - CLIENT *clnt; +exports *mountproc_export_2(argp, clnt) +void *argp; +CLIENT *clnt; { static exports clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_EXPORT, (xdrproc_t) xdr_void, - argp, (xdrproc_t) xdr_exports, (caddr_t) &clnt_res, - TIMEOUT) != RPC_SUCCESS) { + argp, (xdrproc_t) xdr_exports, (caddr_t) & clnt_res, + TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -exports * -mountproc_exportall_2(argp, clnt) - void *argp; - CLIENT *clnt; +exports *mountproc_exportall_2(argp, clnt) +void *argp; +CLIENT *clnt; { static exports clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_EXPORTALL, (xdrproc_t) xdr_void, argp, - (xdrproc_t) xdr_exports, (caddr_t) &clnt_res, - TIMEOUT) != RPC_SUCCESS) { + (xdrproc_t) xdr_exports, (caddr_t) & clnt_res, + TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -ppathcnf * -mountproc_pathconf_2(argp, clnt) - dirpath *argp; - CLIENT *clnt; +ppathcnf *mountproc_pathconf_2(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static ppathcnf clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_PATHCONF, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_ppathcnf, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_ppathcnf, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } - - - - diff --git a/nfsmount.h b/nfsmount.h index 73c71fc68..64ac617c0 100644 --- a/nfsmount.h +++ b/nfsmount.h @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Please do not edit this file. * It was generated using rpcgen. diff --git a/nslookup.c b/nslookup.c index 969d0b19b..ffa720174 100644 --- a/nslookup.c +++ b/nslookup.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini nslookup implementation for busybox * @@ -41,148 +42,136 @@ | + find out how the real nslookup gets the default name server */ -static const char nslookup_usage[] = - "nslookup [HOST]\n\n" -; +static const char nslookup_usage[] = "nslookup [HOST]\n\n"; /* I have to see how the real nslookup does this. * I could dig through /etc/resolv.conf, but is there a * better (programatic) way? */ -static void -server_fprint(FILE *dst) +static void server_fprint(FILE * dst) { - fprintf(dst, "Server: %s\n", "something"); - fprintf(dst, "Address: %s\n\n", "something"); + fprintf(dst, "Server: %s\n", "something"); + fprintf(dst, "Address: %s\n\n", "something"); } /* only works for IPv4 */ -static int -addr_fprint(char *addr, FILE *dst) +static int addr_fprint(char *addr, FILE * dst) { - uint8_t split[4]; - uint32_t ip; - uint32_t *x = (uint32_t *) addr; - - ip = ntohl(*x); - split[0] = (ip & 0xff000000) >> 24; - split[1] = (ip & 0x00ff0000) >> 16; - split[2] = (ip & 0x0000ff00) >> 8; - split[3] = (ip & 0x000000ff); - fprintf ( - dst, "%d.%d.%d.%d", - split[0], split[1], split[2], split[3] - ); - return 0; + uint8_t split[4]; + uint32_t ip; + uint32_t *x = (uint32_t *) addr; + + ip = ntohl(*x); + split[0] = (ip & 0xff000000) >> 24; + split[1] = (ip & 0x00ff0000) >> 16; + split[2] = (ip & 0x0000ff00) >> 8; + split[3] = (ip & 0x000000ff); + fprintf(dst, "%d.%d.%d.%d", split[0], split[1], split[2], split[3] + ); + return 0; } /* changes a c-string matching the perl regex \d+\.\d+\.\d+\.\d+ * into a uint32_t */ -static uint32_t -str_to_addr(const char *addr) +static uint32_t str_to_addr(const char *addr) { - uint32_t split[4]; - uint32_t ip; + uint32_t split[4]; + uint32_t ip; - sscanf(addr, "%d.%d.%d.%d", - &split[0], &split[1], &split[2], &split[3]); + sscanf(addr, "%d.%d.%d.%d", + &split[0], &split[1], &split[2], &split[3]); - /* assuming sscanf worked */ - ip = (split[0] << 24) | - (split[1] << 16) | - (split[2] << 8) | - (split[3]); + /* assuming sscanf worked */ + ip = (split[0] << 24) | + (split[1] << 16) | (split[2] << 8) | (split[3]); - return htonl(ip); + return htonl(ip); } /* takes the NULL-terminated array h_addr_list, and * prints its contents appropriately */ -static int -addr_list_fprint(char **h_addr_list, FILE *dst) +static int addr_list_fprint(char **h_addr_list, FILE * dst) { - int i, j; - char *addr_string = (h_addr_list[1]) - ? "Addresses" - : "Address"; - - fprintf(dst, "%s: ", addr_string); - for (i = 0, j = 0; h_addr_list[i]; i++, j++) { - addr_fprint(h_addr_list[i], dst); - - /* real nslookup does this */ - if (j == 4) { - if (h_addr_list[i+1]) { - fprintf(dst, "\n "); - } - j = 0; - } else { - if (h_addr_list[i+1]) { - fprintf(dst, ", "); - } - } + int i, j; + char *addr_string = (h_addr_list[1]) + ? "Addresses" : "Address"; + + fprintf(dst, "%s: ", addr_string); + for (i = 0, j = 0; h_addr_list[i]; i++, j++) { + addr_fprint(h_addr_list[i], dst); + + /* real nslookup does this */ + if (j == 4) { + if (h_addr_list[i + 1]) { + fprintf(dst, "\n "); + } + j = 0; + } else { + if (h_addr_list[i + 1]) { + fprintf(dst, ", "); + } + } - } - fprintf(dst,"\n"); - return 0; + } + fprintf(dst, "\n"); + return 0; } /* gethostbyaddr wrapper */ -static struct hostent * -gethostbyaddr_wrapper(const char *address) +static struct hostent *gethostbyaddr_wrapper(const char *address) { - struct in_addr addr; + struct in_addr addr; - addr.s_addr = str_to_addr(address); - return gethostbyaddr((char *) &addr, 4, AF_INET); /* IPv4 only for now */ + addr.s_addr = str_to_addr(address); + return gethostbyaddr((char *) &addr, 4, AF_INET); /* IPv4 only for now */ } /* print the results as nslookup would */ -static struct hostent * -hostent_fprint(struct hostent *host, FILE *dst) +static struct hostent *hostent_fprint(struct hostent *host, FILE * dst) { - if (host) { - fprintf(dst, "Name: %s\n", host->h_name); - addr_list_fprint(host->h_addr_list, dst); - } else { - fprintf(dst, "*** %s\n", hstrerror(h_errno)); - } - return host; + if (host) { + fprintf(dst, "Name: %s\n", host->h_name); + addr_list_fprint(host->h_addr_list, dst); + } else { + fprintf(dst, "*** %s\n", hstrerror(h_errno)); + } + return host; } /* naive function to check whether char *s is an ip address */ -static int -is_ip_address(const char *s) +static int is_ip_address(const char *s) { - while (*s) { - if ((isdigit(*s)) || (*s == '.')) { s++; continue; } - return 0; - } - return 1; + while (*s) { + if ((isdigit(*s)) || (*s == '.')) { + s++; + continue; + } + return 0; + } + return 1; } /* ________________________________________________________________________ */ -int -nslookup_main(int argc, char **argv) +int nslookup_main(int argc, char **argv) { - struct hostent *host; - - if (argc < 2) { - usage(nslookup_usage); - } - - server_fprint(stdout); - if (is_ip_address(argv[1])) { - host = gethostbyaddr_wrapper(argv[1]); - } else { - host = gethostbyname(argv[1]); - } - hostent_fprint(host, stdout); - return 0; + struct hostent *host; + + if (argc < 2) { + usage(nslookup_usage); + } + + server_fprint(stdout); + if (is_ip_address(argv[1])) { + host = gethostbyaddr_wrapper(argv[1]); + } else { + host = gethostbyname(argv[1]); + } + hostent_fprint(host, stdout); + return 0; } -/* $Id: nslookup.c,v 1.3 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: nslookup.c,v 1.4 2000/02/08 19:58:47 erik Exp $ */ @@ -1,5 +1,6 @@ +/* vi: set sw=4 ts=4: */ /* - * $Id: ping.c,v 1.10 2000/02/07 05:29:42 erik Exp $ + * $Id: ping.c,v 1.11 2000/02/08 19:58:47 erik Exp $ * Mini ping implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> @@ -53,7 +54,7 @@ #define MAXPACKET 65468 #define MAX_DUP_CHK (8 * 128) #define MAXWAIT 10 -#define PINGINTERVAL 1 /* second */ +#define PINGINTERVAL 1 /* second */ #define O_QUIET (1 << 0) @@ -66,118 +67,124 @@ /* common routines */ static int in_cksum(unsigned short *buf, int sz) { - int nleft = sz; - int sum = 0; - unsigned short *w = buf; - unsigned short ans = 0; - - while (nleft > 1) { - sum += *w++; - nleft -= 2; - } - - if (nleft == 1) { - *(unsigned char *)(&ans) = *(unsigned char *)w; - sum += ans; - } - - sum = (sum >> 16) + (sum & 0xFFFF); - sum += (sum >> 16); - ans = ~sum; - return(ans); -} + int nleft = sz; + int sum = 0; + unsigned short *w = buf; + unsigned short ans = 0; + + while (nleft > 1) { + sum += *w++; + nleft -= 2; + } + + if (nleft == 1) { + *(unsigned char *) (&ans) = *(unsigned char *) w; + sum += ans; + } + + sum = (sum >> 16) + (sum & 0xFFFF); + sum += (sum >> 16); + ans = ~sum; + return (ans); +} /* simple version */ #ifdef BB_SIMPLE_PING -static const char* ping_usage = "ping host\n\n"; +static const char *ping_usage = "ping host\n\n"; -static char* hostname = NULL; +static char *hostname = NULL; static void noresp(int ign) { - printf("No response from %s\n", hostname); - exit(0); + printf("No response from %s\n", hostname); + exit(0); } static int ping(const char *host) { - struct hostent *h; - struct sockaddr_in pingaddr; - struct icmp *pkt; - int pingsock, c; - char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; - - if ((pingsock = socket(AF_INET, SOCK_RAW, 1)) < 0) { /* 1 == ICMP */ - perror("ping"); - exit(1); - } - - /* drop root privs if running setuid */ - setuid(getuid()); - - memset(&pingaddr, 0, sizeof(struct sockaddr_in)); - pingaddr.sin_family = AF_INET; - if (!(h = gethostbyname(host))) { - fprintf(stderr, "ping: unknown host %s\n", host); - exit(1); - } - memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); - hostname = h->h_name; - - pkt = (struct icmp *)packet; - memset(pkt, 0, sizeof(packet)); - pkt->icmp_type = ICMP_ECHO; - pkt->icmp_cksum = in_cksum((unsigned short *)pkt, sizeof(packet)); - - c = sendto(pingsock, packet, sizeof(packet), 0, - (struct sockaddr *)&pingaddr, sizeof(struct sockaddr_in)); - - if (c < 0 || c != sizeof(packet)) { - if (c < 0) perror("ping"); - fprintf(stderr, "ping: write incomplete\n"); - exit(1); - } - - signal(SIGALRM, noresp); - alarm(5); /* give the host 5000ms to respond */ - /* listen for replies */ - while (1) { - struct sockaddr_in from; - size_t fromlen = sizeof(from); - - if ((c = recvfrom(pingsock, packet, sizeof(packet), 0, - (struct sockaddr *)&from, &fromlen)) < 0) { - if (errno == EINTR) continue; - perror("ping"); - continue; + struct hostent *h; + struct sockaddr_in pingaddr; + struct icmp *pkt; + int pingsock, c; + char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; + + if ((pingsock = socket(AF_INET, SOCK_RAW, 1)) < 0) { /* 1 == ICMP */ + perror("ping"); + exit(1); + } + + /* drop root privs if running setuid */ + setuid(getuid()); + + memset(&pingaddr, 0, sizeof(struct sockaddr_in)); + + pingaddr.sin_family = AF_INET; + if (!(h = gethostbyname(host))) { + fprintf(stderr, "ping: unknown host %s\n", host); + exit(1); + } + memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); + hostname = h->h_name; + + pkt = (struct icmp *) packet; + memset(pkt, 0, sizeof(packet)); + pkt->icmp_type = ICMP_ECHO; + pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); + + c = sendto(pingsock, packet, sizeof(packet), 0, + (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in)); + + if (c < 0 || c != sizeof(packet)) { + if (c < 0) + perror("ping"); + fprintf(stderr, "ping: write incomplete\n"); + exit(1); + } + + signal(SIGALRM, noresp); + alarm(5); /* give the host 5000ms to respond */ + /* listen for replies */ + while (1) { + struct sockaddr_in from; + size_t fromlen = sizeof(from); + + if ((c = recvfrom(pingsock, packet, sizeof(packet), 0, + (struct sockaddr *) &from, &fromlen)) < 0) { + if (errno == EINTR) + continue; + perror("ping"); + continue; + } + if (c >= 76) { /* ip + icmp */ + struct iphdr *iphdr = (struct iphdr *) packet; + + pkt = (struct icmp *) (packet + (iphdr->ihl << 2)); /* skip ip hdr */ + if (pkt->icmp_type == ICMP_ECHOREPLY) + break; + } } - if (c >= 76) { /* ip + icmp */ - struct iphdr *iphdr = (struct iphdr *)packet; - pkt = (struct icmp *)(packet + (iphdr->ihl << 2)); /* skip ip hdr */ - if (pkt->icmp_type == ICMP_ECHOREPLY) break; - } - } - printf("%s is alive!\n", hostname); - return(TRUE); + printf("%s is alive!\n", hostname); + return (TRUE); } extern int ping_main(int argc, char **argv) { - argc--; - argv++; - if (argc < 1) usage(ping_usage); - ping(*argv); - exit(TRUE); + argc--; + argv++; + if (argc < 1) + usage(ping_usage); + ping(*argv); + exit(TRUE); } -#else +#else /* full(er) version */ -static const char* ping_usage = "ping [OPTION]... host\n\n" -"Send ICMP ECHO_REQUEST packets to network hosts.\n\n" -"Options:\n" -"\t-q\t\tQuiet mode, only displays output at start" -"\t\t\tand when finished.\n" -"\t-c COUNT\tSend only COUNT pings.\n"; +static const char *ping_usage = "ping [OPTION]... host\n\n" + "Send ICMP ECHO_REQUEST packets to network hosts.\n\n" + "Options:\n" + "\t-q\t\tQuiet mode, only displays output at start" + + "\t\t\tand when finished.\n" "\t-c COUNT\tSend only COUNT pings.\n"; static char *hostname = NULL; static struct sockaddr_in pingaddr; @@ -196,224 +203,247 @@ static void ping(char *); /**************************************************************************/ -static void pingstats(int ign) { - signal(SIGINT, SIG_IGN); - - printf("\n--- %s ping statistics ---\n", hostname); - printf("%ld packets transmitted, ", ntransmitted); - printf("%ld packets received, ", nreceived); - if (nrepeats) - printf("%ld duplicates, ", nrepeats); - if (ntransmitted) - printf("%ld%% packet loss\n", - (ntransmitted - nreceived)*100/ntransmitted); - if (nreceived) - printf("round-trip min/avg/max = %lu.%lu/%lu.%lu/%lu.%lu ms\n", - tmin/10, tmin%10, - (tsum/(nreceived+nrepeats))/10, - (tsum/(nreceived+nrepeats))%10, - tmax/10, tmax%10); - exit(0); +static void pingstats(int ign) +{ + signal(SIGINT, SIG_IGN); + + printf("\n--- %s ping statistics ---\n", hostname); + printf("%ld packets transmitted, ", ntransmitted); + printf("%ld packets received, ", nreceived); + if (nrepeats) + printf("%ld duplicates, ", nrepeats); + if (ntransmitted) + printf("%ld%% packet loss\n", + (ntransmitted - nreceived) * 100 / ntransmitted); + if (nreceived) + printf("round-trip min/avg/max = %lu.%lu/%lu.%lu/%lu.%lu ms\n", + tmin / 10, tmin % 10, + (tsum / (nreceived + nrepeats)) / 10, + (tsum / (nreceived + nrepeats)) % 10, tmax / 10, tmax % 10); + exit(0); } static void sendping(int ign) { - struct icmp *pkt; - int i; - char packet[DEFDATALEN + 8]; - - pkt = (struct icmp *)packet; - - pkt->icmp_type = ICMP_ECHO; - pkt->icmp_code = 0; - pkt->icmp_cksum = 0; - pkt->icmp_seq = ntransmitted++; - pkt->icmp_id = myid; - CLR(pkt->icmp_seq % MAX_DUP_CHK); - - gettimeofday((struct timeval *)&packet[8], NULL); - pkt->icmp_cksum = in_cksum((unsigned short *)pkt, sizeof(packet)); - - i = sendto(pingsock, packet, sizeof(packet), 0, - (struct sockaddr *)&pingaddr, sizeof(struct sockaddr_in)); - - if (i < 0 || i != sizeof(packet)) { - if (i < 0) perror("ping"); - fprintf(stderr, "ping wrote %d chars; %d expected\n", i, sizeof(packet)); - exit(1); - } - - signal(SIGALRM, sendping); - if (pingcount == 0 || ntransmitted < pingcount) { /* schedule next in 1s */ - alarm(PINGINTERVAL); - } else { /* done, wait for the last ping to come back */ - /* todo, don't necessarily need to wait so long... */ - signal(SIGALRM, pingstats); - alarm(MAXWAIT); - } + struct icmp *pkt; + int i; + char packet[DEFDATALEN + 8]; + + pkt = (struct icmp *) packet; + + pkt->icmp_type = ICMP_ECHO; + pkt->icmp_code = 0; + pkt->icmp_cksum = 0; + pkt->icmp_seq = ntransmitted++; + pkt->icmp_id = myid; + CLR(pkt->icmp_seq % MAX_DUP_CHK); + + gettimeofday((struct timeval *) &packet[8], NULL); + pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); + + i = sendto(pingsock, packet, sizeof(packet), 0, + (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in)); + + if (i < 0 || i != sizeof(packet)) { + if (i < 0) + perror("ping"); + fprintf(stderr, "ping wrote %d chars; %d expected\n", i, + sizeof(packet)); + exit(1); + } + + signal(SIGALRM, sendping); + if (pingcount == 0 || ntransmitted < pingcount) { /* schedule next in 1s */ + alarm(PINGINTERVAL); + } else { /* done, wait for the last ping to come back */ + /* todo, don't necessarily need to wait so long... */ + signal(SIGALRM, pingstats); + alarm(MAXWAIT); + } } - + static void unpack(char *buf, int sz, struct sockaddr_in *from) { - struct icmp *icmppkt; - struct iphdr *iphdr; - struct timeval tv, *tp; - int hlen, dupflag; - unsigned long triptime; - - gettimeofday(&tv, NULL); - - /* check IP header */ - iphdr = (struct iphdr *)buf; - hlen = iphdr->ihl << 2; - /* discard if too short */ - if (sz < (DEFDATALEN + ICMP_MINLEN)) return; - - sz -= hlen; - icmppkt = (struct icmp *)(buf + hlen); - - if (icmppkt->icmp_type == ICMP_ECHOREPLY) { - if (icmppkt->icmp_id != myid) return; /* not our ping */ - ++nreceived; - tp = (struct timeval *)icmppkt->icmp_data; - - if ((tv.tv_usec -= tp->tv_usec) < 0) { - --tv.tv_sec; - tv.tv_usec += 1000000; - } - tv.tv_sec -= tp->tv_sec; - - triptime = tv.tv_sec * 10000 + (tv.tv_usec / 100); - tsum += triptime; - if (triptime < tmin) tmin = triptime; - if (triptime > tmax) tmax = triptime; - - if (TST(icmppkt->icmp_seq % MAX_DUP_CHK)) { - ++nrepeats; - --nreceived; - dupflag = 1; + struct icmp *icmppkt; + struct iphdr *iphdr; + struct timeval tv, *tp; + int hlen, dupflag; + unsigned long triptime; + + gettimeofday(&tv, NULL); + + /* check IP header */ + iphdr = (struct iphdr *) buf; + hlen = iphdr->ihl << 2; + /* discard if too short */ + if (sz < (DEFDATALEN + ICMP_MINLEN)) + return; + + sz -= hlen; + icmppkt = (struct icmp *) (buf + hlen); + + if (icmppkt->icmp_type == ICMP_ECHOREPLY) { + if (icmppkt->icmp_id != myid) + return; /* not our ping */ + ++nreceived; + tp = (struct timeval *) icmppkt->icmp_data; + + if ((tv.tv_usec -= tp->tv_usec) < 0) { + --tv.tv_sec; + tv.tv_usec += 1000000; + } + tv.tv_sec -= tp->tv_sec; + + triptime = tv.tv_sec * 10000 + (tv.tv_usec / 100); + tsum += triptime; + if (triptime < tmin) + tmin = triptime; + if (triptime > tmax) + tmax = triptime; + + if (TST(icmppkt->icmp_seq % MAX_DUP_CHK)) { + ++nrepeats; + --nreceived; + dupflag = 1; + } else { + SET(icmppkt->icmp_seq % MAX_DUP_CHK); + dupflag = 0; + } + + if (options & O_QUIET) + return; + + printf("%d bytes from %s: icmp_seq=%u", sz, + inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr), + icmppkt->icmp_seq); + printf(" ttl=%d", iphdr->ttl); + printf(" time=%lu.%lu ms", triptime / 10, triptime % 10); + if (dupflag) + printf(" (DUP!)"); + printf("\n"); } else { - SET(icmppkt->icmp_seq % MAX_DUP_CHK); - dupflag = 0; + fprintf(stderr, + "Warning: unknown ICMP packet received (not echo-reply)\n"); } - - if (options & O_QUIET) return; - - printf("%d bytes from %s: icmp_seq=%u", sz, - inet_ntoa(*(struct in_addr *)&from->sin_addr.s_addr), - icmppkt->icmp_seq); - printf(" ttl=%d", iphdr->ttl); - printf(" time=%lu.%lu ms", triptime/10, triptime%10); - if (dupflag) printf(" (DUP!)"); - printf("\n"); - } else { - fprintf(stderr, "Warning: unknown ICMP packet received (not echo-reply)\n"); - } } static void ping(char *host) { - struct protoent *proto; - struct hostent *h; - char buf[MAXHOSTNAMELEN]; - char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; - int sockopt; - - proto = getprotobyname("icmp"); - /* if getprotobyname failed, just silently force - * proto->p_proto to have the correct value for "icmp" */ - if ((pingsock = socket(AF_INET, SOCK_RAW, - (proto ? proto->p_proto : 1))) < 0) { /* 1 == ICMP */ - if (errno == EPERM) { - fprintf(stderr, "ping: permission denied. (are you root?)\n"); - } else { - perror("ping"); + struct protoent *proto; + struct hostent *h; + char buf[MAXHOSTNAMELEN]; + char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; + int sockopt; + + proto = getprotobyname("icmp"); + /* if getprotobyname failed, just silently force + * proto->p_proto to have the correct value for "icmp" */ + if ((pingsock = socket(AF_INET, SOCK_RAW, + (proto ? proto->p_proto : 1))) < 0) { /* 1 == ICMP */ + if (errno == EPERM) { + fprintf(stderr, "ping: permission denied. (are you root?)\n"); + } else { + perror("ping"); + } + exit(1); } - exit(1); - } - - /* drop root privs if running setuid */ - setuid(getuid()); - - memset(&pingaddr, 0, sizeof(struct sockaddr_in)); - pingaddr.sin_family = AF_INET; - if (!(h = gethostbyname(host))) { - fprintf(stderr, "ping: unknown host %s\n", host); - exit(1); - } - - if (h->h_addrtype != AF_INET) { - fprintf(stderr, "ping: unknown address type; only AF_INET is currently supported.\n"); - exit(1); - } - - pingaddr.sin_family = AF_INET; /* h->h_addrtype */ - memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); - strncpy(buf, h->h_name, sizeof(buf)-1); - hostname = buf; - - /* enable broadcast pings */ - sockopt = 1; - setsockopt(pingsock, SOL_SOCKET, SO_BROADCAST, (char *)&sockopt, sizeof(sockopt)); - - /* set recv buf for broadcast pings */ - sockopt = 48 * 1024; - setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, (char *)&sockopt, sizeof(sockopt)); - - printf("PING %s (%s): %d data bytes\n", - hostname, inet_ntoa(*(struct in_addr *)&pingaddr.sin_addr.s_addr), - DEFDATALEN); - - signal(SIGINT, pingstats); - - /* start the ping's going ... */ - sendping(0); - - /* listen for replies */ - while (1) { - struct sockaddr_in from; - size_t fromlen = sizeof(from); - int c; - - if ((c = recvfrom(pingsock, packet, sizeof(packet), 0, - (struct sockaddr *)&from, &fromlen)) < 0) { - if (errno == EINTR) continue; - perror("ping"); - continue; + + /* drop root privs if running setuid */ + setuid(getuid()); + + memset(&pingaddr, 0, sizeof(struct sockaddr_in)); + + pingaddr.sin_family = AF_INET; + if (!(h = gethostbyname(host))) { + fprintf(stderr, "ping: unknown host %s\n", host); + exit(1); + } + + if (h->h_addrtype != AF_INET) { + fprintf(stderr, + "ping: unknown address type; only AF_INET is currently supported.\n"); + exit(1); } - unpack(packet, c, &from); - if (pingcount > 0 && nreceived >= pingcount) break; - } - pingstats(0); + + pingaddr.sin_family = AF_INET; /* h->h_addrtype */ + memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr)); + strncpy(buf, h->h_name, sizeof(buf) - 1); + hostname = buf; + + /* enable broadcast pings */ + sockopt = 1; + setsockopt(pingsock, SOL_SOCKET, SO_BROADCAST, (char *) &sockopt, + sizeof(sockopt)); + + /* set recv buf for broadcast pings */ + sockopt = 48 * 1024; + setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, (char *) &sockopt, + sizeof(sockopt)); + + printf("PING %s (%s): %d data bytes\n", + hostname, + inet_ntoa(*(struct in_addr *) &pingaddr.sin_addr.s_addr), + DEFDATALEN); + + signal(SIGINT, pingstats); + + /* start the ping's going ... */ + sendping(0); + + /* listen for replies */ + while (1) { + struct sockaddr_in from; + size_t fromlen = sizeof(from); + int c; + + if ((c = recvfrom(pingsock, packet, sizeof(packet), 0, + (struct sockaddr *) &from, &fromlen)) < 0) { + if (errno == EINTR) + continue; + perror("ping"); + continue; + } + unpack(packet, c, &from); + if (pingcount > 0 && nreceived >= pingcount) + break; + } + pingstats(0); } extern int ping_main(int argc, char **argv) { - char *thisarg; - - argc--; - argv++; - options = 0; - /* Parse any options */ - while (argc > 1) { - if (**argv != '-') usage(ping_usage); - thisarg = *argv; thisarg++; - switch (*thisarg) { - case 'q': options |= O_QUIET; break; - case 'c': - argc--; argv++; - pingcount = atoi(*argv); - break; - default: - usage(ping_usage); - } - argc--; argv++; - } - if (argc < 1) usage(ping_usage); - - myid = getpid() & 0xFFFF; - ping(*argv); - exit(TRUE); + char *thisarg; + + argc--; + argv++; + options = 0; + /* Parse any options */ + while (argc > 1) { + if (**argv != '-') + usage(ping_usage); + thisarg = *argv; + thisarg++; + switch (*thisarg) { + case 'q': + options |= O_QUIET; + break; + case 'c': + argc--; + argv++; + pingcount = atoi(*argv); + break; + default: + usage(ping_usage); + } + argc--; + argv++; + } + if (argc < 1) + usage(ping_usage); + + myid = getpid() & 0xFFFF; + ping(*argv); + exit(TRUE); } #endif diff --git a/poweroff.c b/poweroff.c index 405ca3fe2..7f9abf14a 100644 --- a/poweroff.c +++ b/poweroff.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini poweroff implementation for busybox * @@ -23,9 +24,8 @@ #include "internal.h" #include <signal.h> -extern int -poweroff_main(int argc, char ** argv) +extern int poweroff_main(int argc, char **argv) { - /* don't assume init's pid == 1 */ - exit( kill(findInitPid(), SIGUSR2)); + /* don't assume init's pid == 1 */ + exit(kill(findInitPid(), SIGUSR2)); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* printf - format and print data Copyright (C) 90, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. @@ -42,7 +43,7 @@ to convert all of the given arguments. David MacKenzie <djm@gnu.ai.mit.edu> */ - + // 19990508 Busy Boxed! Dave Cinege @@ -84,11 +85,11 @@ #if !defined(S_ISSOCK) && defined(S_IFSOCK) # define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) #endif -#if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */ +#if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */ # define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB) # define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC) #endif -#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */ +#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */ # define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) #endif @@ -121,407 +122,358 @@ #define hextobin(c) ((c)>='a'&&(c)<='f' ? (c)-'a'+10 : (c)>='A'&&(c)<='F' ? (c)-'A'+10 : (c)-'0') #define octtobin(c) ((c) - '0') -static double xstrtod __P ((char *s)); -static int print_esc __P ((char *escstart)); -static int print_formatted __P ((char *format, int argc, char **argv)); -static long xstrtol __P ((char *s)); -static unsigned long xstrtoul __P ((char *s)); -static void print_direc __P ((char *start, size_t length, int field_width, int precision, char *argument)); -static void print_esc_char __P ((int c)); -static void print_esc_string __P ((char *str)); -static void verify __P ((char *s, char *end)); +static double xstrtod __P((char *s)); +static int print_esc __P((char *escstart)); +static int print_formatted __P((char *format, int argc, char **argv)); +static long xstrtol __P((char *s)); +static unsigned long xstrtoul __P((char *s)); +static void print_direc +__P( + + (char *start, size_t length, int field_width, int precision, + char *argument)); +static void print_esc_char __P((int c)); +static void print_esc_string __P((char *str)); +static void verify __P((char *s, char *end)); /* The value to return to the calling program. */ static int exit_status; -static const char printf_usage[] = "printf format [argument...]\n"; +static const char printf_usage[] = "printf format [argument...]\n"; -int -printf_main(int argc, char** argv) +int printf_main(int argc, char **argv) { - char *format; - int args_used; - - exit_status = 0; - if ( argc <= 1 || **(argv+1) == '-' ) { - usage (printf_usage); - } - - format = argv[1]; - argc -= 2; - argv += 2; - - do - { - args_used = print_formatted (format, argc, argv); - argc -= args_used; - argv += args_used; - } - while (args_used > 0 && argc > 0); + char *format; + int args_used; + + exit_status = 0; + if (argc <= 1 || **(argv + 1) == '-') { + usage(printf_usage); + } + + format = argv[1]; + argc -= 2; + argv += 2; + + do { + args_used = print_formatted(format, argc, argv); + argc -= args_used; + argv += args_used; + } + while (args_used > 0 && argc > 0); /* if (argc > 0) fprintf(stderr, "excess args ignored"); */ - exit (exit_status); + exit(exit_status); } /* Print the text in FORMAT, using ARGV (with ARGC elements) for arguments to any `%' directives. Return the number of elements of ARGV used. */ -static int -print_formatted (char *format, int argc, char **argv) +static int print_formatted(char *format, int argc, char **argv) { - int save_argc = argc; /* Preserve original value. */ - char *f; /* Pointer into `format'. */ - char *direc_start; /* Start of % directive. */ - size_t direc_length; /* Length of % directive. */ - int field_width; /* Arg to first '*', or -1 if none. */ - int precision; /* Arg to second '*', or -1 if none. */ - - for (f = format; *f; ++f) - { - switch (*f) - { - case '%': - direc_start = f++; - direc_length = 1; - field_width = precision = -1; - if (*f == '%') - { - putchar ('%'); - break; - } - if (*f == 'b') - { - if (argc > 0) - { - print_esc_string (*argv); - ++argv; - --argc; - } - break; - } - if (strchr ("-+ #", *f)) - { - ++f; - ++direc_length; - } - if (*f == '*') - { - ++f; - ++direc_length; - if (argc > 0) - { - field_width = xstrtoul (*argv); - ++argv; - --argc; + int save_argc = argc; /* Preserve original value. */ + char *f; /* Pointer into `format'. */ + char *direc_start; /* Start of % directive. */ + size_t direc_length; /* Length of % directive. */ + int field_width; /* Arg to first '*', or -1 if none. */ + int precision; /* Arg to second '*', or -1 if none. */ + + for (f = format; *f; ++f) { + switch (*f) { + case '%': + direc_start = f++; + direc_length = 1; + field_width = precision = -1; + if (*f == '%') { + putchar('%'); + break; + } + if (*f == 'b') { + if (argc > 0) { + print_esc_string(*argv); + ++argv; + --argc; + } + break; + } + if (strchr("-+ #", *f)) { + ++f; + ++direc_length; + } + if (*f == '*') { + ++f; + ++direc_length; + if (argc > 0) { + field_width = xstrtoul(*argv); + ++argv; + --argc; + } else + field_width = 0; + } else + while (ISDIGIT(*f)) { + ++f; + ++direc_length; + } + if (*f == '.') { + ++f; + ++direc_length; + if (*f == '*') { + ++f; + ++direc_length; + if (argc > 0) { + precision = xstrtoul(*argv); + ++argv; + --argc; + } else + precision = 0; + } else + while (ISDIGIT(*f)) { + ++f; + ++direc_length; + } + } + if (*f == 'l' || *f == 'L' || *f == 'h') { + ++f; + ++direc_length; + } + /* + if (!strchr ("diouxXfeEgGcs", *f)) + fprintf(stderr, "%%%c: invalid directive", *f); + */ + ++direc_length; + if (argc > 0) { + print_direc(direc_start, direc_length, field_width, + precision, *argv); + ++argv; + --argc; + } else + print_direc(direc_start, direc_length, field_width, + precision, ""); + break; + + case '\\': + f += print_esc(f); + break; + + default: + putchar(*f); } - else - field_width = 0; - } - else - while (ISDIGIT (*f)) - { - ++f; - ++direc_length; - } - if (*f == '.') - { - ++f; - ++direc_length; - if (*f == '*') - { - ++f; - ++direc_length; - if (argc > 0) - { - precision = xstrtoul (*argv); - ++argv; - --argc; - } - else - precision = 0; - } - else - while (ISDIGIT (*f)) - { - ++f; - ++direc_length; - } - } - if (*f == 'l' || *f == 'L' || *f == 'h') - { - ++f; - ++direc_length; - } - /* - if (!strchr ("diouxXfeEgGcs", *f)) - fprintf(stderr, "%%%c: invalid directive", *f); - */ - ++direc_length; - if (argc > 0) - { - print_direc (direc_start, direc_length, field_width, - precision, *argv); - ++argv; - --argc; - } - else - print_direc (direc_start, direc_length, field_width, - precision, ""); - break; - - case '\\': - f += print_esc (f); - break; - - default: - putchar (*f); } - } - return save_argc - argc; + return save_argc - argc; } /* Print a \ escape sequence starting at ESCSTART. Return the number of characters in the escape sequence besides the backslash. */ -static int -print_esc (char *escstart) +static int print_esc(char *escstart) { - register char *p = escstart + 1; - int esc_value = 0; /* Value of \nnn escape. */ - int esc_length; /* Length of \nnn escape. */ - - /* \0ooo and \xhhh escapes have maximum length of 3 chars. */ - if (*p == 'x') - { - for (esc_length = 0, ++p; - esc_length < 3 && ISXDIGIT (*p); - ++esc_length, ++p) - esc_value = esc_value * 16 + hextobin (*p); + register char *p = escstart + 1; + int esc_value = 0; /* Value of \nnn escape. */ + int esc_length; /* Length of \nnn escape. */ + + /* \0ooo and \xhhh escapes have maximum length of 3 chars. */ + if (*p == 'x') { + for (esc_length = 0, ++p; + esc_length < 3 && ISXDIGIT(*p); ++esc_length, ++p) + esc_value = esc_value * 16 + hextobin(*p); /* if (esc_length == 0) fprintf(stderr, "missing hex in esc"); */ - putchar (esc_value); - } - else if (*p == '0') - { - for (esc_length = 0, ++p; - esc_length < 3 && isodigit (*p); - ++esc_length, ++p) - esc_value = esc_value * 8 + octtobin (*p); - putchar (esc_value); - } - else if (strchr ("\"\\abcfnrtv", *p)) - print_esc_char (*p++); + putchar(esc_value); + } else if (*p == '0') { + for (esc_length = 0, ++p; + esc_length < 3 && isodigit(*p); ++esc_length, ++p) + esc_value = esc_value * 8 + octtobin(*p); + putchar(esc_value); + } else if (strchr("\"\\abcfnrtv", *p)) + print_esc_char(*p++); /* else fprintf(stderr, "\\%c: invalid esc", *p); */ - return p - escstart - 1; + return p - escstart - 1; } /* Output a single-character \ escape. */ -static void -print_esc_char (int c) +static void print_esc_char(int c) { - switch (c) - { - case 'a': /* Alert. */ - putchar (7); - break; - case 'b': /* Backspace. */ - putchar (8); - break; - case 'c': /* Cancel the rest of the output. */ - exit (0); - break; - case 'f': /* Form feed. */ - putchar (12); - break; - case 'n': /* New line. */ - putchar (10); - break; - case 'r': /* Carriage return. */ - putchar (13); - break; - case 't': /* Horizontal tab. */ - putchar (9); - break; - case 'v': /* Vertical tab. */ - putchar (11); - break; - default: - putchar (c); - break; - } + switch (c) { + case 'a': /* Alert. */ + putchar(7); + break; + case 'b': /* Backspace. */ + putchar(8); + break; + case 'c': /* Cancel the rest of the output. */ + exit(0); + break; + case 'f': /* Form feed. */ + putchar(12); + break; + case 'n': /* New line. */ + putchar(10); + break; + case 'r': /* Carriage return. */ + putchar(13); + break; + case 't': /* Horizontal tab. */ + putchar(9); + break; + case 'v': /* Vertical tab. */ + putchar(11); + break; + default: + putchar(c); + break; + } } /* Print string STR, evaluating \ escapes. */ -static void -print_esc_string (char *str) +static void print_esc_string(char *str) { - for (; *str; str++) - if (*str == '\\') - str += print_esc (str); - else - putchar (*str); + for (; *str; str++) + if (*str == '\\') + str += print_esc(str); + else + putchar(*str); } static void -print_direc (char *start, size_t length, int field_width, int precision, char *argument) +print_direc(char *start, size_t length, int field_width, int precision, + char *argument) { - char *p; /* Null-terminated copy of % directive. */ - - p = xmalloc ((unsigned) (length + 1)); - strncpy (p, start, length); - p[length] = 0; - - switch (p[length - 1]) - { - case 'd': - case 'i': - if (field_width < 0) - { - if (precision < 0) - printf (p, xstrtol (argument)); - else - printf (p, precision, xstrtol (argument)); - } - else - { - if (precision < 0) - printf (p, field_width, xstrtol (argument)); - else - printf (p, field_width, precision, xstrtol (argument)); - } - break; - - case 'o': - case 'u': - case 'x': - case 'X': - if (field_width < 0) - { - if (precision < 0) - printf (p, xstrtoul (argument)); - else - printf (p, precision, xstrtoul (argument)); - } - else - { - if (precision < 0) - printf (p, field_width, xstrtoul (argument)); - else - printf (p, field_width, precision, xstrtoul (argument)); - } - break; - - case 'f': - case 'e': - case 'E': - case 'g': - case 'G': - if (field_width < 0) - { - if (precision < 0) - printf (p, xstrtod (argument)); - else - printf (p, precision, xstrtod (argument)); - } - else - { - if (precision < 0) - printf (p, field_width, xstrtod (argument)); - else - printf (p, field_width, precision, xstrtod (argument)); - } - break; - - case 'c': - printf (p, *argument); - break; - - case 's': - if (field_width < 0) - { - if (precision < 0) - printf (p, argument); - else - printf (p, precision, argument); - } - else - { - if (precision < 0) - printf (p, field_width, argument); - else - printf (p, field_width, precision, argument); + char *p; /* Null-terminated copy of % directive. */ + + p = xmalloc((unsigned) (length + 1)); + strncpy(p, start, length); + p[length] = 0; + + switch (p[length - 1]) { + case 'd': + case 'i': + if (field_width < 0) { + if (precision < 0) + printf(p, xstrtol(argument)); + else + printf(p, precision, xstrtol(argument)); + } else { + if (precision < 0) + printf(p, field_width, xstrtol(argument)); + else + printf(p, field_width, precision, xstrtol(argument)); + } + break; + + case 'o': + case 'u': + case 'x': + case 'X': + if (field_width < 0) { + if (precision < 0) + printf(p, xstrtoul(argument)); + else + printf(p, precision, xstrtoul(argument)); + } else { + if (precision < 0) + printf(p, field_width, xstrtoul(argument)); + else + printf(p, field_width, precision, xstrtoul(argument)); + } + break; + + case 'f': + case 'e': + case 'E': + case 'g': + case 'G': + if (field_width < 0) { + if (precision < 0) + printf(p, xstrtod(argument)); + else + printf(p, precision, xstrtod(argument)); + } else { + if (precision < 0) + printf(p, field_width, xstrtod(argument)); + else + printf(p, field_width, precision, xstrtod(argument)); + } + break; + + case 'c': + printf(p, *argument); + break; + + case 's': + if (field_width < 0) { + if (precision < 0) + printf(p, argument); + else + printf(p, precision, argument); + } else { + if (precision < 0) + printf(p, field_width, argument); + else + printf(p, field_width, precision, argument); + } + break; } - break; - } - free (p); + free(p); } -static unsigned long -xstrtoul (char *s) +static unsigned long xstrtoul(char *s) { - char *end; - unsigned long val; + char *end; + unsigned long val; - errno = 0; - val = strtoul (s, &end, 0); - verify (s, end); - return val; + errno = 0; + val = strtoul(s, &end, 0); + verify(s, end); + return val; } -static long -xstrtol (char *s) +static long xstrtol(char *s) { - char *end; - long val; + char *end; + long val; - errno = 0; - val = strtol (s, &end, 0); - verify (s, end); - return val; + errno = 0; + val = strtol(s, &end, 0); + verify(s, end); + return val; } -static double -xstrtod (char *s) +static double xstrtod(char *s) { - char *end; - double val; + char *end; + double val; - errno = 0; - val = strtod (s, &end); - verify (s, end); - return val; + errno = 0; + val = strtod(s, &end); + verify(s, end); + return val; } -static void -verify (char *s, char *end) +static void verify(char *s, char *end) { - if (errno) - { - fprintf(stderr, "%s", s); - exit_status = 1; - } - else if (*end) - { - /* - if (s == end) - fprintf(stderr, "%s: expected numeric", s); - else - fprintf(stderr, "%s: not completely converted", s); - */ - exit_status = 1; - } + if (errno) { + fprintf(stderr, "%s", s); + exit_status = 1; + } else if (*end) { + /* + if (s == end) + fprintf(stderr, "%s: expected numeric", s); + else + fprintf(stderr, "%s: not completely converted", s); + */ + exit_status = 1; + } } - diff --git a/procps/free.c b/procps/free.c index 36d357522..b07135430 100644 --- a/procps/free.c +++ b/procps/free.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini free implementation for busybox * @@ -30,6 +31,7 @@ extern int free_main(int argc, char **argv) { - char* cmd[] = { "cat", "/proc/meminfo", "\0" }; - exit(cat_main( 3, cmd)); + char *cmd[] = { "cat", "/proc/meminfo", "\0" }; + + exit(cat_main(3, cmd)); } diff --git a/procps/kill.c b/procps/kill.c index e72b73493..516621232 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini kill implementation for busybox * @@ -29,188 +30,188 @@ #include <sys/stat.h> #include <unistd.h> -static const char* kill_usage = "kill [-signal] process-id [process-id ...]\n\n" -"Send a signal (default is SIGTERM) to the specified process(es).\n\n" -"Options:\n" -"\t-l\tList all signal names and numbers.\n\n"; +static const char *kill_usage = + "kill [-signal] process-id [process-id ...]\n\n" + "Send a signal (default is SIGTERM) to the specified process(es).\n\n" + "Options:\n" "\t-l\tList all signal names and numbers.\n\n"; struct signal_name { - const char *name; - int number; + const char *name; + int number; }; const struct signal_name signames[] = { - {"HUP", SIGHUP}, - {"INT", SIGINT}, - {"QUIT", SIGQUIT}, - {"ILL", SIGILL}, - {"TRAP", SIGTRAP}, - {"ABRT", SIGABRT}, + {"HUP", SIGHUP}, + {"INT", SIGINT}, + {"QUIT", SIGQUIT}, + {"ILL", SIGILL}, + {"TRAP", SIGTRAP}, + {"ABRT", SIGABRT}, #ifndef __alpha__ - {"IOT", SIGIOT}, + {"IOT", SIGIOT}, #endif #if defined(__sparc__) || defined(__alpha__) - {"EMT", SIGEMT}, + {"EMT", SIGEMT}, #else - {"BUS", SIGBUS}, + {"BUS", SIGBUS}, #endif - {"FPE", SIGFPE}, - {"KILL", SIGKILL}, + {"FPE", SIGFPE}, + {"KILL", SIGKILL}, #if defined(__sparc__) || defined(__alpha__) - {"BUS", SIGBUS}, + {"BUS", SIGBUS}, #else - {"USR1", SIGUSR1}, + {"USR1", SIGUSR1}, #endif - {"SEGV", SIGSEGV}, + {"SEGV", SIGSEGV}, #if defined(__sparc__) || defined(__alpha__) - {"SYS", SIGSYS}, + {"SYS", SIGSYS}, #else - {"USR2", SIGUSR2}, + {"USR2", SIGUSR2}, #endif - {"PIPE", SIGPIPE}, - {"ALRM", SIGALRM}, - {"TERM", SIGTERM}, + {"PIPE", SIGPIPE}, + {"ALRM", SIGALRM}, + {"TERM", SIGTERM}, #if defined(__sparc__) || defined(__alpha__) - {"URG", SIGURG}, - {"STOP", SIGSTOP}, - {"TSTP", SIGTSTP}, - {"CONT", SIGCONT}, - {"CHLD", SIGCHLD}, - {"TTIN", SIGTTIN}, - {"TTOU", SIGTTOU}, - {"IO", SIGIO}, + {"URG", SIGURG}, + {"STOP", SIGSTOP}, + {"TSTP", SIGTSTP}, + {"CONT", SIGCONT}, + {"CHLD", SIGCHLD}, + {"TTIN", SIGTTIN}, + {"TTOU", SIGTTOU}, + {"IO", SIGIO}, # ifndef __alpha__ - {"POLL", SIGIO}, + {"POLL", SIGIO}, # endif - {"XCPU", SIGXCPU}, - {"XFSZ", SIGXFSZ}, - {"VTALRM", SIGVTALRM}, - {"PROF", SIGPROF}, - {"WINCH", SIGWINCH}, + {"XCPU", SIGXCPU}, + {"XFSZ", SIGXFSZ}, + {"VTALRM", SIGVTALRM}, + {"PROF", SIGPROF}, + {"WINCH", SIGWINCH}, # ifdef __alpha__ - {"INFO", SIGINFO}, + {"INFO", SIGINFO}, # else - {"LOST", SIGLOST}, + {"LOST", SIGLOST}, # endif - {"USR1", SIGUSR1}, - {"USR2", SIGUSR2}, + {"USR1", SIGUSR1}, + {"USR2", SIGUSR2}, #else - {"STKFLT", SIGSTKFLT}, - {"CHLD", SIGCHLD}, - {"CONT", SIGCONT}, - {"STOP", SIGSTOP}, - {"TSTP", SIGTSTP}, - {"TTIN", SIGTTIN}, - {"TTOU", SIGTTOU}, - {"URG", SIGURG}, - {"XCPU", SIGXCPU}, - {"XFSZ", SIGXFSZ}, - {"VTALRM", SIGVTALRM}, - {"PROF", SIGPROF}, - {"WINCH", SIGWINCH}, - {"IO", SIGIO}, - {"POLL", SIGPOLL}, - {"PWR", SIGPWR}, - {"UNUSED", SIGUNUSED}, + {"STKFLT", SIGSTKFLT}, + {"CHLD", SIGCHLD}, + {"CONT", SIGCONT}, + {"STOP", SIGSTOP}, + {"TSTP", SIGTSTP}, + {"TTIN", SIGTTIN}, + {"TTOU", SIGTTOU}, + {"URG", SIGURG}, + {"XCPU", SIGXCPU}, + {"XFSZ", SIGXFSZ}, + {"VTALRM", SIGVTALRM}, + {"PROF", SIGPROF}, + {"WINCH", SIGWINCH}, + {"IO", SIGIO}, + {"POLL", SIGPOLL}, + {"PWR", SIGPWR}, + {"UNUSED", SIGUNUSED}, #endif - {0, 0} + {0, 0} }; -extern int kill_main (int argc, char **argv) +extern int kill_main(int argc, char **argv) { - int sig = SIGTERM; - - argc--; - argv++; - /* Parse any options */ - if (argc < 1) - usage(kill_usage); - - while (argc > 0 && **argv == '-') { - while (*++(*argv)) { - switch (**argv) { - case 'l': - { - int col=0; - const struct signal_name *s = signames; - - while (s->name != 0) { - col+=fprintf(stderr, "%2d) %-8s", s->number, (s++)->name); - if (col>60) { - fprintf(stderr, "\n"); - col=0; - } - } - fprintf(stderr, "\n\n"); - exit( TRUE); - } - break; - case '-': + int sig = SIGTERM; + + argc--; + argv++; + /* Parse any options */ + if (argc < 1) usage(kill_usage); - default: - { - if (isdigit( **argv)) { - sig = atoi (*argv); - if (sig < 0 || sig >= NSIG) - goto end; - else { - argc--; - argv++; - goto do_it_now; - } - } - else { - const struct signal_name *s = signames; - while (s->name != 0) { - if (strcasecmp (s->name, *argv) == 0) { - sig = s->number; - argc--; - argv++; - goto do_it_now; - } - s++; + + while (argc > 0 && **argv == '-') { + while (*++(*argv)) { + switch (**argv) { + case 'l': + { + int col = 0; + const struct signal_name *s = signames; + + while (s->name != 0) { + col += + fprintf(stderr, "%2d) %-8s", s->number, + (s++)->name); + if (col > 60) { + fprintf(stderr, "\n"); + col = 0; + } + } + fprintf(stderr, "\n\n"); + exit(TRUE); + } + break; + case '-': + usage(kill_usage); + default: + { + if (isdigit(**argv)) { + sig = atoi(*argv); + if (sig < 0 || sig >= NSIG) + goto end; + else { + argc--; + argv++; + goto do_it_now; + } + } else { + const struct signal_name *s = signames; + + while (s->name != 0) { + if (strcasecmp(s->name, *argv) == 0) { + sig = s->number; + argc--; + argv++; + goto do_it_now; + } + s++; + } + if (s->name == 0) + goto end; + } + } } - if (s->name == 0) - goto end; - } + argc--; + argv++; } - } - argc--; - argv++; - } - } - -do_it_now: - - while (--argc >= 0) { - int pid; - struct stat statbuf; - char pidpath[20]="/proc/"; - - if (! isdigit( **argv)) { - fprintf(stderr, "bad PID: %s\n", *argv); - exit( FALSE); - } - pid = atoi (*argv); - snprintf(pidpath, 20, "/proc/%s/stat", *argv); - if (stat( pidpath, &statbuf)!=0) { - fprintf(stderr, "kill: (%d) - No such pid\n", pid); - exit( FALSE); } - fprintf(stderr, "sig = %d\n", sig); - if (kill (pid, sig) != 0) { - perror (*argv); - exit ( FALSE); - } - argv++; - } - exit ( TRUE); + do_it_now: -end: - fprintf(stderr, "bad signal name: %s\n", *argv); - exit (TRUE); -} + while (--argc >= 0) { + int pid; + struct stat statbuf; + char pidpath[20] = "/proc/"; + + if (!isdigit(**argv)) { + fprintf(stderr, "bad PID: %s\n", *argv); + exit(FALSE); + } + pid = atoi(*argv); + snprintf(pidpath, 20, "/proc/%s/stat", *argv); + if (stat(pidpath, &statbuf) != 0) { + fprintf(stderr, "kill: (%d) - No such pid\n", pid); + exit(FALSE); + } + fprintf(stderr, "sig = %d\n", sig); + if (kill(pid, sig) != 0) { + perror(*argv); + exit(FALSE); + } + argv++; + } + exit(TRUE); + end: + fprintf(stderr, "bad signal name: %s\n", *argv); + exit(TRUE); +} diff --git a/procps/ps.c b/procps/ps.c index 4496faa31..207cdaa02 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini ps implementation for busybox * @@ -33,123 +34,128 @@ #endif typedef struct proc_s { - char - cmd[16]; /* basename of executable file in call to exec(2) */ - int - ruid, rgid, /* real only (sorry) */ - pid, /* process id */ - ppid; /* pid of parent process */ - char - state; /* single-char code for process state (S=sleeping) */ + char + cmd[16]; /* basename of executable file in call to exec(2) */ + int + ruid, rgid, /* real only (sorry) */ + pid, /* process id */ + ppid; /* pid of parent process */ + char + state; /* single-char code for process state (S=sleeping) */ } proc_t; -static int file2str(char *filename, char *ret, int cap) +static int file2str(char *filename, char *ret, int cap) { - int fd, num_read; - - if ( (fd = open(filename, O_RDONLY, 0)) == -1 ) return -1; - if ( (num_read = read(fd, ret, cap - 1)) <= 0 ) return -1; - ret[num_read] = 0; - close(fd); - return num_read; + int fd, num_read; + + if ((fd = open(filename, O_RDONLY, 0)) == -1) + return -1; + if ((num_read = read(fd, ret, cap - 1)) <= 0) + return -1; + ret[num_read] = 0; + close(fd); + return num_read; } -static void parse_proc_status(char* S, proc_t* P) +static void parse_proc_status(char *S, proc_t * P) { - char* tmp; - memset(P->cmd, 0, sizeof P->cmd); - sscanf (S, "Name:\t%15c", P->cmd); - tmp = strchr(P->cmd,'\n'); - if (tmp) - *tmp='\0'; - tmp = strstr (S,"State"); - sscanf (tmp, "State:\t%c", &P->state); - - tmp = strstr (S,"Pid:"); - if(tmp) sscanf (tmp, - "Pid:\t%d\n" - "PPid:\t%d\n", - &P->pid, - &P->ppid - ); - else fprintf(stderr, "Internal error!\n"); - - /* For busybox, ignoring effective, saved, etc */ - tmp = strstr (S,"Uid:"); - if(tmp) sscanf (tmp, - "Uid:\t%d", &P->ruid); - else fprintf(stderr, "Internal error!\n"); - - tmp = strstr (S,"Gid:"); - if(tmp) sscanf (tmp, - "Gid:\t%d", &P->rgid); - else fprintf(stderr, "Internal error!\n"); + char *tmp; + + memset(P->cmd, 0, sizeof P->cmd); + sscanf(S, "Name:\t%15c", P->cmd); + tmp = strchr(P->cmd, '\n'); + if (tmp) + *tmp = '\0'; + tmp = strstr(S, "State"); + sscanf(tmp, "State:\t%c", &P->state); + + tmp = strstr(S, "Pid:"); + if (tmp) + sscanf(tmp, "Pid:\t%d\n" "PPid:\t%d\n", &P->pid, &P->ppid); + else + fprintf(stderr, "Internal error!\n"); + + /* For busybox, ignoring effective, saved, etc */ + tmp = strstr(S, "Uid:"); + if (tmp) + sscanf(tmp, "Uid:\t%d", &P->ruid); + else + fprintf(stderr, "Internal error!\n"); + + tmp = strstr(S, "Gid:"); + if (tmp) + sscanf(tmp, "Gid:\t%d", &P->rgid); + else + fprintf(stderr, "Internal error!\n"); } extern int ps_main(int argc, char **argv) { - proc_t p; - DIR *dir; - FILE *file; - struct dirent *entry; - char path[32], sbuf[512]; - char uidName[10]=""; - char groupName[10]=""; - int i, c; - - if ( argc>1 && **(argv+1) == '-' ) { - usage ("ps\n\nReport process status\n\nThis version of ps accepts no options.\n"); - } - - dir = opendir("/proc"); - if (!dir) { - perror("Can't open /proc"); - exit(FALSE); - } - - fprintf(stdout, "%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", "State", "Command"); - while ((entry = readdir(dir)) != NULL) { - uidName[0]='\0'; - groupName[0]='\0'; - - if (! isdigit(*entry->d_name)) - continue; - sprintf(path, "/proc/%s/status", entry->d_name); - if ((file2str(path, sbuf, sizeof sbuf)) != -1 ) { - parse_proc_status(sbuf, &p); + proc_t p; + DIR *dir; + FILE *file; + struct dirent *entry; + char path[32], sbuf[512]; + char uidName[10] = ""; + char groupName[10] = ""; + int i, c; + + if (argc > 1 && **(argv + 1) == '-') { + usage + ("ps\n\nReport process status\n\nThis version of ps accepts no options.\n"); } - /* Make some adjustments as needed */ - my_getpwuid( uidName, p.ruid); - my_getgrgid( groupName, p.rgid); - if (*uidName == '\0') - sprintf( uidName, "%d", p.ruid); - if (*groupName == '\0') - sprintf( groupName, "%d", p.rgid); - - fprintf(stdout, "%5d %-8s %-8s %c ", p.pid, uidName, groupName, p.state); - sprintf(path, "/proc/%s/cmdline", entry->d_name); - file = fopen(path, "r"); - if (file == NULL) { - perror(path); - exit(FALSE); + dir = opendir("/proc"); + if (!dir) { + perror("Can't open /proc"); + exit(FALSE); } - i=0; - while (((c = getc(file)) != EOF) && (i < 53)) { - i++; - if (c == '\0') - c = ' '; - putc(c, stdout); + + fprintf(stdout, "%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", + "State", "Command"); + while ((entry = readdir(dir)) != NULL) { + uidName[0] = '\0'; + groupName[0] = '\0'; + + if (!isdigit(*entry->d_name)) + continue; + sprintf(path, "/proc/%s/status", entry->d_name); + if ((file2str(path, sbuf, sizeof sbuf)) != -1) { + parse_proc_status(sbuf, &p); + } + + /* Make some adjustments as needed */ + my_getpwuid(uidName, p.ruid); + my_getgrgid(groupName, p.rgid); + if (*uidName == '\0') + sprintf(uidName, "%d", p.ruid); + if (*groupName == '\0') + sprintf(groupName, "%d", p.rgid); + + fprintf(stdout, "%5d %-8s %-8s %c ", p.pid, uidName, groupName, + p.state); + sprintf(path, "/proc/%s/cmdline", entry->d_name); + file = fopen(path, "r"); + if (file == NULL) { + perror(path); + exit(FALSE); + } + i = 0; + while (((c = getc(file)) != EOF) && (i < 53)) { + i++; + if (c == '\0') + c = ' '; + putc(c, stdout); + } + if (i == 0) + fprintf(stdout, "%s", p.cmd); + fprintf(stdout, "\n"); } - if (i==0) - fprintf(stdout, "%s", p.cmd); - fprintf(stdout, "\n"); - } - closedir(dir); - exit(TRUE); + closedir(dir); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini ps implementation for busybox * @@ -33,123 +34,128 @@ #endif typedef struct proc_s { - char - cmd[16]; /* basename of executable file in call to exec(2) */ - int - ruid, rgid, /* real only (sorry) */ - pid, /* process id */ - ppid; /* pid of parent process */ - char - state; /* single-char code for process state (S=sleeping) */ + char + cmd[16]; /* basename of executable file in call to exec(2) */ + int + ruid, rgid, /* real only (sorry) */ + pid, /* process id */ + ppid; /* pid of parent process */ + char + state; /* single-char code for process state (S=sleeping) */ } proc_t; -static int file2str(char *filename, char *ret, int cap) +static int file2str(char *filename, char *ret, int cap) { - int fd, num_read; - - if ( (fd = open(filename, O_RDONLY, 0)) == -1 ) return -1; - if ( (num_read = read(fd, ret, cap - 1)) <= 0 ) return -1; - ret[num_read] = 0; - close(fd); - return num_read; + int fd, num_read; + + if ((fd = open(filename, O_RDONLY, 0)) == -1) + return -1; + if ((num_read = read(fd, ret, cap - 1)) <= 0) + return -1; + ret[num_read] = 0; + close(fd); + return num_read; } -static void parse_proc_status(char* S, proc_t* P) +static void parse_proc_status(char *S, proc_t * P) { - char* tmp; - memset(P->cmd, 0, sizeof P->cmd); - sscanf (S, "Name:\t%15c", P->cmd); - tmp = strchr(P->cmd,'\n'); - if (tmp) - *tmp='\0'; - tmp = strstr (S,"State"); - sscanf (tmp, "State:\t%c", &P->state); - - tmp = strstr (S,"Pid:"); - if(tmp) sscanf (tmp, - "Pid:\t%d\n" - "PPid:\t%d\n", - &P->pid, - &P->ppid - ); - else fprintf(stderr, "Internal error!\n"); - - /* For busybox, ignoring effective, saved, etc */ - tmp = strstr (S,"Uid:"); - if(tmp) sscanf (tmp, - "Uid:\t%d", &P->ruid); - else fprintf(stderr, "Internal error!\n"); - - tmp = strstr (S,"Gid:"); - if(tmp) sscanf (tmp, - "Gid:\t%d", &P->rgid); - else fprintf(stderr, "Internal error!\n"); + char *tmp; + + memset(P->cmd, 0, sizeof P->cmd); + sscanf(S, "Name:\t%15c", P->cmd); + tmp = strchr(P->cmd, '\n'); + if (tmp) + *tmp = '\0'; + tmp = strstr(S, "State"); + sscanf(tmp, "State:\t%c", &P->state); + + tmp = strstr(S, "Pid:"); + if (tmp) + sscanf(tmp, "Pid:\t%d\n" "PPid:\t%d\n", &P->pid, &P->ppid); + else + fprintf(stderr, "Internal error!\n"); + + /* For busybox, ignoring effective, saved, etc */ + tmp = strstr(S, "Uid:"); + if (tmp) + sscanf(tmp, "Uid:\t%d", &P->ruid); + else + fprintf(stderr, "Internal error!\n"); + + tmp = strstr(S, "Gid:"); + if (tmp) + sscanf(tmp, "Gid:\t%d", &P->rgid); + else + fprintf(stderr, "Internal error!\n"); } extern int ps_main(int argc, char **argv) { - proc_t p; - DIR *dir; - FILE *file; - struct dirent *entry; - char path[32], sbuf[512]; - char uidName[10]=""; - char groupName[10]=""; - int i, c; - - if ( argc>1 && **(argv+1) == '-' ) { - usage ("ps\n\nReport process status\n\nThis version of ps accepts no options.\n"); - } - - dir = opendir("/proc"); - if (!dir) { - perror("Can't open /proc"); - exit(FALSE); - } - - fprintf(stdout, "%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", "State", "Command"); - while ((entry = readdir(dir)) != NULL) { - uidName[0]='\0'; - groupName[0]='\0'; - - if (! isdigit(*entry->d_name)) - continue; - sprintf(path, "/proc/%s/status", entry->d_name); - if ((file2str(path, sbuf, sizeof sbuf)) != -1 ) { - parse_proc_status(sbuf, &p); + proc_t p; + DIR *dir; + FILE *file; + struct dirent *entry; + char path[32], sbuf[512]; + char uidName[10] = ""; + char groupName[10] = ""; + int i, c; + + if (argc > 1 && **(argv + 1) == '-') { + usage + ("ps\n\nReport process status\n\nThis version of ps accepts no options.\n"); } - /* Make some adjustments as needed */ - my_getpwuid( uidName, p.ruid); - my_getgrgid( groupName, p.rgid); - if (*uidName == '\0') - sprintf( uidName, "%d", p.ruid); - if (*groupName == '\0') - sprintf( groupName, "%d", p.rgid); - - fprintf(stdout, "%5d %-8s %-8s %c ", p.pid, uidName, groupName, p.state); - sprintf(path, "/proc/%s/cmdline", entry->d_name); - file = fopen(path, "r"); - if (file == NULL) { - perror(path); - exit(FALSE); + dir = opendir("/proc"); + if (!dir) { + perror("Can't open /proc"); + exit(FALSE); } - i=0; - while (((c = getc(file)) != EOF) && (i < 53)) { - i++; - if (c == '\0') - c = ' '; - putc(c, stdout); + + fprintf(stdout, "%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", + "State", "Command"); + while ((entry = readdir(dir)) != NULL) { + uidName[0] = '\0'; + groupName[0] = '\0'; + + if (!isdigit(*entry->d_name)) + continue; + sprintf(path, "/proc/%s/status", entry->d_name); + if ((file2str(path, sbuf, sizeof sbuf)) != -1) { + parse_proc_status(sbuf, &p); + } + + /* Make some adjustments as needed */ + my_getpwuid(uidName, p.ruid); + my_getgrgid(groupName, p.rgid); + if (*uidName == '\0') + sprintf(uidName, "%d", p.ruid); + if (*groupName == '\0') + sprintf(groupName, "%d", p.rgid); + + fprintf(stdout, "%5d %-8s %-8s %c ", p.pid, uidName, groupName, + p.state); + sprintf(path, "/proc/%s/cmdline", entry->d_name); + file = fopen(path, "r"); + if (file == NULL) { + perror(path); + exit(FALSE); + } + i = 0; + while (((c = getc(file)) != EOF) && (i < 53)) { + i++; + if (c == '\0') + c = ' '; + putc(c, stdout); + } + if (i == 0) + fprintf(stdout, "%s", p.cmd); + fprintf(stdout, "\n"); } - if (i==0) - fprintf(stdout, "%s", p.cmd); - fprintf(stdout, "\n"); - } - closedir(dir); - exit(TRUE); + closedir(dir); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini pwd implementation for busybox * @@ -25,16 +26,15 @@ #include <dirent.h> #include <sys/param.h> -extern int -pwd_main(int argc, char * * argv) +extern int pwd_main(int argc, char **argv) { - char buf[PATH_MAX + 1]; + char buf[PATH_MAX + 1]; - if ( getcwd(buf, sizeof(buf)) == NULL ) { + if (getcwd(buf, sizeof(buf)) == NULL) { perror("get working directory"); - exit( FALSE); + exit(FALSE); } printf("%s\n", buf); - exit( TRUE); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini reboot implementation for busybox * @@ -23,9 +24,8 @@ #include "internal.h" #include <signal.h> -extern int -reboot_main(int argc, char ** argv) +extern int reboot_main(int argc, char **argv) { - /* don't assume init's pid == 1 */ - exit( kill(findInitPid(), SIGINT)); + /* don't assume init's pid == 1 */ + exit(kill(findInitPid(), SIGINT)); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* regexp.c */ #include "internal.h" @@ -17,44 +18,47 @@ */ extern int find_match(char *haystack, char *needle, int ignoreCase) { - int status; - struct regexp* re; - re = regcomp( needle); - status = regexec(re, haystack, FALSE, ignoreCase); - free( re); - return( status); + int status; + struct regexp *re; + + re = regcomp(needle); + status = regexec(re, haystack, FALSE, ignoreCase); + free(re); + return (status); } #if defined BB_SED /* This performs substitutions after a regexp match has been found. * The new string is returned. It is malloc'ed, and do must be freed. */ -extern int replace_match(char *haystack, char *needle, char *newNeedle, int ignoreCase) +extern int replace_match(char *haystack, char *needle, char *newNeedle, + int ignoreCase) { - int status; - struct regexp* re; - char *s, buf[BUF_SIZE], *d = buf; - - re = regcomp( needle); - status = regexec(re, haystack, FALSE, ignoreCase); - if (status==TRUE) { - s=haystack; - - do { - /* copy stuff from before the match */ - while (s < re->startp[0]) - *d++ = *s++; - /* substitute for the matched part */ - regsub(re, newNeedle, d); - s = re->endp[0]; - d += strlen(d); - } while (regexec(re, s, FALSE, ignoreCase) == TRUE); - /* copy stuff from after the match */ - while ( (*d++ = *s++) ) {} - d[0] = '\0'; - strcpy(haystack, buf); - } - free( re); - return( status); + int status; + struct regexp *re; + char *s, buf[BUF_SIZE], *d = buf; + + re = regcomp(needle); + status = regexec(re, haystack, FALSE, ignoreCase); + if (status == TRUE) { + s = haystack; + + do { + /* copy stuff from before the match */ + while (s < re->startp[0]) + *d++ = *s++; + /* substitute for the matched part */ + regsub(re, newNeedle, d); + s = re->endp[0]; + d += strlen(d); + } while (regexec(re, s, FALSE, ignoreCase) == TRUE); + /* copy stuff from after the match */ + while ((*d++ = *s++)) { + } + d[0] = '\0'; + strcpy(haystack, buf); + } + free(re); + return (status); } #endif @@ -97,9 +101,10 @@ extern int replace_match(char *haystack, char *needle, char *newNeedle, int igno -static char *previous; /* the previous regexp, used when null regexp is given */ +static char *previous; /* the previous regexp, used when null regexp is given */ + #if defined BB_SED -static char *previous1; /* a copy of the text from the previous substitution for regsub()*/ +static char *previous1; /* a copy of the text from the previous substitution for regsub() */ #endif @@ -116,27 +121,28 @@ static char *previous1; /* a copy of the text from the previous substitution for #define GET_META(s) (*(s) == META ? INT_META(*++(s)) : *s) /* These are the internal codes used for each type of meta-character */ -#define M_BEGLINE 256 /* internal code for ^ */ -#define M_ENDLINE 257 /* internal code for $ */ -#define M_BEGWORD 258 /* internal code for \< */ -#define M_ENDWORD 259 /* internal code for \> */ -#define M_ANY 260 /* internal code for . */ -#define M_SPLAT 261 /* internal code for * */ -#define M_PLUS 262 /* internal code for \+ */ -#define M_QMARK 263 /* internal code for \? */ +#define M_BEGLINE 256 /* internal code for ^ */ +#define M_ENDLINE 257 /* internal code for $ */ +#define M_BEGWORD 258 /* internal code for \< */ +#define M_ENDWORD 259 /* internal code for \> */ +#define M_ANY 260 /* internal code for . */ +#define M_SPLAT 261 /* internal code for * */ +#define M_PLUS 262 /* internal code for \+ */ +#define M_QMARK 263 /* internal code for \? */ #define M_CLASS(n) (264+(n)) /* internal code for [] */ #define M_START(n) (274+(n)) /* internal code for \( */ #define M_END(n) (284+(n)) /* internal code for \) */ /* These are used during compilation */ -static int class_cnt; /* used to assign class IDs */ -static int start_cnt; /* used to assign start IDs */ -static int end_stk[NSUBEXP];/* used to assign end IDs */ -static int end_sp; -static char *retext; /* points to the text being compiled */ +static int class_cnt; /* used to assign class IDs */ +static int start_cnt; /* used to assign start IDs */ +static int end_stk[NSUBEXP]; /* used to assign end IDs */ +static int end_sp; +static char *retext; /* points to the text being compiled */ /* error-handling stuff */ -jmp_buf errorhandler; +jmp_buf errorhandler; + #define FAIL(why) do {fprintf(stderr, why); longjmp(errorhandler, 1);} while (0) @@ -145,68 +151,56 @@ jmp_buf errorhandler; /* This function builds a bitmap for a particular class */ /* text -- start of the class */ /* bmap -- the bitmap */ -static char *makeclass(char* text, char* bmap) +static char *makeclass(char *text, char *bmap) { - int i; - int complement = 0; + int i; + int complement = 0; /* zero the bitmap */ - for (i = 0; bmap && i < 32; i++) - { + for (i = 0; bmap && i < 32; i++) { bmap[i] = 0; } /* see if we're going to complement this class */ - if (*text == '^') - { + if (*text == '^') { text++; complement = 1; } /* add in the characters */ - while (*text && *text != ']') - { + while (*text && *text != ']') { /* is this a span of characters? */ - if (text[1] == '-' && text[2]) - { + if (text[1] == '-' && text[2]) { /* spans can't be backwards */ - if (text[0] > text[2]) - { + if (text[0] > text[2]) { FAIL("Backwards span in []"); } /* add each character in the span to the bitmap */ - for (i = text[0]; bmap && i <= text[2]; i++) - { + for (i = text[0]; bmap && i <= text[2]; i++) { bmap[i >> 3] |= (1 << (i & 7)); } /* move past this span */ text += 3; - } - else - { + } else { /* add this single character to the span */ i = *text++; - if (bmap) - { + if (bmap) { bmap[i >> 3] |= (1 << (i & 7)); } } } /* make sure the closing ] is missing */ - if (*text++ != ']') - { + if (*text++ != ']') { FAIL("] missing"); } /* if we're supposed to complement this class, then do so */ - if (complement && bmap) - { - for (i = 0; i < 32; i++) - { + if (complement && bmap) { + for (i = 0; i < 32; i++) { bmap[i] = ~bmap[i]; } } @@ -223,105 +217,92 @@ static char *makeclass(char* text, char* bmap) * character-class text is skipped. */ static int gettoken(sptr, re) - char **sptr; - regexp *re; +char **sptr; +regexp *re; { - int c; + int c; c = **sptr; ++*sptr; - if (c == '\\') - { + if (c == '\\') { c = **sptr; ++*sptr; - switch (c) - { - case '<': + switch (c) { + case '<': return M_BEGWORD; - case '>': + case '>': return M_ENDWORD; - case '(': - if (start_cnt >= NSUBEXP) - { + case '(': + if (start_cnt >= NSUBEXP) { FAIL("Too many \\(s"); } end_stk[end_sp++] = start_cnt; return M_START(start_cnt++); - case ')': - if (end_sp <= 0) - { + case ')': + if (end_sp <= 0) { FAIL("Mismatched \\)"); } return M_END(end_stk[--end_sp]); - case '*': + case '*': return M_SPLAT; - case '.': + case '.': return M_ANY; - case '+': + case '+': return M_PLUS; - case '?': + case '?': return M_QMARK; - default: + default: return c; } - } - else { - switch (c) - { - case '^': - if (*sptr == retext + 1) - { + } else { + switch (c) { + case '^': + if (*sptr == retext + 1) { return M_BEGLINE; } return c; - case '$': - if (!**sptr) - { + case '$': + if (!**sptr) { return M_ENDLINE; } return c; - case '.': + case '.': return M_ANY; - case '*': + case '*': return M_SPLAT; - case '[': + case '[': /* make sure we don't have too many classes */ - if (class_cnt >= 10) - { + if (class_cnt >= 10) { FAIL("Too many []s"); } /* process the character list for this class */ - if (re) - { + if (re) { /* generate the bitmap for this class */ *sptr = makeclass(*sptr, re->program + 1 + 32 * class_cnt); - } - else - { + } else { /* skip to end of the class */ - *sptr = makeclass(*sptr, (char *)0); + *sptr = makeclass(*sptr, (char *) 0); } return M_CLASS(class_cnt++); - default: + default: return c; } } - /*NOTREACHED*/ -} + /*NOTREACHED*/} @@ -331,28 +312,22 @@ static int gettoken(sptr, re) * about catching syntax errors; that is done in a later pass. */ static unsigned calcsize(text) - char *text; +char *text; { - unsigned size; - int token; + unsigned size; + int token; retext = text; class_cnt = 0; start_cnt = 1; end_sp = 0; size = 5; - while ((token = gettoken(&text, (regexp *)0)) != 0) - { - if (IS_CLASS(token)) - { + while ((token = gettoken(&text, (regexp *) 0)) != 0) { + if (IS_CLASS(token)) { size += 34; - } - else if (IS_META(token)) - { + } else if (IS_META(token)) { size += 2; - } - else - { + } else { size++; } } @@ -369,26 +344,23 @@ static unsigned calcsize(text) * known to represent a single character. It returns 0 if they match, or * 1 if they don't. */ -static int match1(regexp* re, char ch, int token, int ignoreCase) +static int match1(regexp * re, char ch, int token, int ignoreCase) { - if (!ch) - { + if (!ch) { /* the end of a line can't match any RE of width 1 */ return 1; } - if (token == M_ANY) - { + if (token == M_ANY) { return 0; - } - else if (IS_CLASS(token)) - { - if (re->program[1 + 32 * (token - M_CLASS(0)) + (ch >> 3)] & (1 << (ch & 7))) + } else if (IS_CLASS(token)) { + if (re-> + program[1 + 32 * (token - M_CLASS(0)) + + (ch >> 3)] & (1 << (ch & 7))) return 0; } //fprintf(stderr, "match1: ch='%c' token='%c': ", ch, token); if (ch == token - || (ignoreCase==TRUE && tolower(ch) == tolower(token))) - { + || (ignoreCase == TRUE && tolower(ch) == tolower(token))) { //fprintf(stderr, "match\n"); return 0; } @@ -406,65 +378,63 @@ static int match1(regexp* re, char ch, int token, int ignoreCase) /* str -- the string */ /* prog -- a portion of re->program, an compiled RE */ /* here -- a portion of str, the string to compare it to */ -static int match(regexp* re, char* str, char* prog, char* here, int ignoreCase) +static int match(regexp * re, char *str, char *prog, char *here, + int ignoreCase) { - int token; - int nmatched; - int closure; - - for (token = GET_META(prog); !IS_CLOSURE(token); prog++, token = GET_META(prog)) - { - switch (token) - { - /*case M_BEGLINE: can't happen; re->bol is used instead */ - case M_ENDLINE: + int token; + int nmatched; + int closure; + + for (token = GET_META(prog); !IS_CLOSURE(token); + prog++, token = GET_META(prog)) { + switch (token) { + /*case M_BEGLINE: can't happen; re->bol is used instead */ + case M_ENDLINE: if (*here) return 1; break; - case M_BEGWORD: + case M_BEGWORD: if (here != str && - (here[-1] == '_' || - (isascii(here[-1]) && isalnum(here[-1])))) - return 1; + (here[-1] == '_' || + (isascii(here[-1]) && isalnum(here[-1])))) return 1; break; - case M_ENDWORD: + case M_ENDWORD: if ((here[0] == '_' || isascii(here[0])) && isalnum(here[0])) return 1; break; - case M_START(0): - case M_START(1): - case M_START(2): - case M_START(3): - case M_START(4): - case M_START(5): - case M_START(6): - case M_START(7): - case M_START(8): - case M_START(9): - re->startp[token - M_START(0)] = (char *)here; + case M_START(0): + case M_START(1): + case M_START(2): + case M_START(3): + case M_START(4): + case M_START(5): + case M_START(6): + case M_START(7): + case M_START(8): + case M_START(9): + re->startp[token - M_START(0)] = (char *) here; break; - case M_END(0): - case M_END(1): - case M_END(2): - case M_END(3): - case M_END(4): - case M_END(5): - case M_END(6): - case M_END(7): - case M_END(8): - case M_END(9): - re->endp[token - M_END(0)] = (char *)here; - if (token == M_END(0)) - { + case M_END(0): + case M_END(1): + case M_END(2): + case M_END(3): + case M_END(4): + case M_END(5): + case M_END(6): + case M_END(7): + case M_END(8): + case M_END(9): + re->endp[token - M_END(0)] = (char *) here; + if (token == M_END(0)) { return 0; } break; - default: /* literal, M_CLASS(n), or M_ANY */ + default: /* literal, M_CLASS(n), or M_ANY */ if (match1(re, *here, token, ignoreCase) != 0) return 1; here++; @@ -482,14 +452,12 @@ static int match(regexp* re, char* str, char* prog, char* here, int ignoreCase) /* step 2: see how many times we can match that token against the string */ for (nmatched = 0; - (closure != M_QMARK || nmatched < 1) && *here && match1(re, *here, token, ignoreCase) == 0; - nmatched++, here++) - { + (closure != M_QMARK || nmatched < 1) && *here + && match1(re, *here, token, ignoreCase) == 0; nmatched++, here++) { } /* step 3: try to match the remainder, and back off if it doesn't */ - while (nmatched >= 0 && match(re, str, prog, here, ignoreCase) != 0) - { + while (nmatched >= 0 && match(re, str, prog, here, ignoreCase) != 0) { nmatched--; here--; } @@ -502,41 +470,36 @@ static int match(regexp* re, char* str, char* prog, char* here, int ignoreCase) /* This function compiles a regexp. */ -extern regexp *regcomp(char* text) +extern regexp *regcomp(char *text) { - int needfirst; - unsigned size; - int token; - int peek; - char *build; - regexp *re; // Ignore compiler whining. If we longjmp, we don't use re anymore. + int needfirst; + unsigned size; + int token; + int peek; + char *build; + regexp *re; // Ignore compiler whining. If we longjmp, we don't use re anymore. /* prepare for error handling */ - re = (regexp *)0; - if (setjmp(errorhandler)) - { - if (re) - { + re = (regexp *) 0; + if (setjmp(errorhandler)) { + if (re) { free(re); } - return (regexp *)0; + return (regexp *) 0; } /* if an empty regexp string was given, use the previous one */ - if (*text == 0) - { - if (!previous) - { + if (*text == 0) { + if (!previous) { FAIL("No previous RE"); } text = previous; - } - else /* non-empty regexp given, so remember it */ - { + } else { /* non-empty regexp given, so remember it */ + if (previous) free(previous); - previous = (char *)malloc((unsigned)(strlen(text) + 1)); + previous = (char *) malloc((unsigned) (strlen(text) + 1)); if (previous) strcpy(previous, text); } @@ -547,19 +510,17 @@ extern regexp *regcomp(char* text) end_sp = 0; retext = text; size = calcsize(text) + sizeof(regexp); - re = (regexp *)malloc((unsigned)size); + re = (regexp *) malloc((unsigned) size); - if (!re) - { + if (!re) { FAIL("Not enough memory for this RE"); } /* compile it */ build = &re->program[1 + 32 * class_cnt]; re->program[0] = class_cnt; - for (token = 0; token < NSUBEXP; token++) - { - re->startp[token] = re->endp[token] = (char *)0; + for (token = 0; token < NSUBEXP; token++) { + re->startp[token] = re->endp[token] = (char *) 0; } re->first = 0; re->bol = 0; @@ -570,76 +531,60 @@ extern regexp *regcomp(char* text) end_sp = 0; retext = text; for (token = M_START(0), peek = gettoken(&text, re); - token; - token = peek, peek = gettoken(&text, re)) - { + token; token = peek, peek = gettoken(&text, re)) { /* special processing for the closure operator */ - if (IS_CLOSURE(peek)) - { + if (IS_CLOSURE(peek)) { /* detect misuse of closure operator */ - if (IS_START(token)) - { + if (IS_START(token)) { FAIL("* or \\+ or \\? follows nothing"); } - else if (IS_META(token) && token != M_ANY && !IS_CLASS(token)) - { - FAIL("* or \\+ or \\? can only follow a normal character or . or []"); + else if (IS_META(token) && token != M_ANY + && !IS_CLASS(token)) { + FAIL + ("* or \\+ or \\? can only follow a normal character or . or []"); } /* it is okay -- make it prefix instead of postfix */ ADD_META(build, peek); /* take care of "needfirst" - is this the first char? */ - if (needfirst && peek == M_PLUS && !IS_META(token)) - { + if (needfirst && peek == M_PLUS && !IS_META(token)) { re->first = token; } needfirst = 0; /* we used "peek" -- need to refill it */ peek = gettoken(&text, re); - if (IS_CLOSURE(peek)) - { + if (IS_CLOSURE(peek)) { FAIL("* or \\+ or \\? doubled up"); } - } - else if (!IS_META(token)) - { + } else if (!IS_META(token)) { /* normal char is NOT argument of closure */ - if (needfirst) - { + if (needfirst) { re->first = token; needfirst = 0; } re->minlen++; - } - else if (token == M_ANY || IS_CLASS(token)) - { + } else if (token == M_ANY || IS_CLASS(token)) { /* . or [] is NOT argument of closure */ needfirst = 0; re->minlen++; } /* the "token" character is not closure -- process it normally */ - if (token == M_BEGLINE) - { + if (token == M_BEGLINE) { /* set the BOL flag instead of storing M_BEGLINE */ re->bol = 1; - } - else if (IS_META(token)) - { + } else if (IS_META(token)) { ADD_META(build, token); - } - else - { + } else { *build++ = token; } } /* end it with a \) which MUST MATCH the opening \( */ ADD_META(build, M_END(0)); - if (end_sp > 0) - { + if (end_sp > 0) { FAIL("Not enough \\)s"); } @@ -654,15 +599,14 @@ extern regexp *regcomp(char* text) /* str -- the string to search through */ /* bol -- does str start at the beginning of a line? (boolean) */ /* ignoreCase -- ignoreCase or not */ -extern int regexec(struct regexp* re, char* str, int bol, int ignoreCase) +extern int regexec(struct regexp *re, char *str, int bol, int ignoreCase) { - char *prog; /* the entry point of re->program */ - int len; /* length of the string */ - char *here; + char *prog; /* the entry point of re->program */ + int len; /* length of the string */ + char *here; /* if must start at the beginning of a line, and this isn't, then fail */ - if (re->bol && bol==TRUE) - { + if (re->bol && bol == TRUE) { return FALSE; } @@ -670,35 +614,26 @@ extern int regexec(struct regexp* re, char* str, int bol, int ignoreCase) prog = re->program + 1 + 32 * re->program[0]; /* search for the RE in the string */ - if (re->bol) - { + if (re->bol) { /* must occur at BOL */ - if ((re->first - && match1(re, *(char *)str, re->first, ignoreCase))/* wrong first letter? */ - || len < re->minlen /* not long enough? */ - || match(re, (char *)str, prog, str, ignoreCase)) /* doesn't match? */ - return FALSE; /* THEN FAIL! */ - } - else if (ignoreCase == FALSE) - { + if ((re->first && match1(re, *(char *) str, re->first, ignoreCase)) /* wrong first letter? */ + ||len < re->minlen /* not long enough? */ + || match(re, (char *) str, prog, str, ignoreCase)) /* doesn't match? */ + return FALSE; /* THEN FAIL! */ + } else if (ignoreCase == FALSE) { /* can occur anywhere in the line, noignorecase */ - for (here = (char *)str; - (re->first && re->first != *here) - || match(re, (char *)str, prog, here, ignoreCase); - here++, len--) - { + for (here = (char *) str; (re->first && re->first != *here) + || match(re, (char *) str, prog, here, ignoreCase); + here++, len--) { if (len < re->minlen) return FALSE; } - } - else - { + } else { /* can occur anywhere in the line, ignorecase */ - for (here = (char *)str; - (re->first && match1(re, *here, (int)re->first, ignoreCase)) - || match(re, (char *)str, prog, here, ignoreCase); - here++, len--) - { + for (here = (char *) str; + (re->first && match1(re, *here, (int) re->first, ignoreCase)) + || match(re, (char *) str, prog, here, ignoreCase); + here++, len--) { if (len < re->minlen) return FALSE; } @@ -713,82 +648,72 @@ extern int regexec(struct regexp* re, char* str, int bol, int ignoreCase) #if defined BB_SED /* This performs substitutions after a regexp match has been found. */ -extern void regsub(regexp* re, char* src, char* dst) +extern void regsub(regexp * re, char *src, char *dst) { - char *cpy; - char *end; - char c; - char *start; - int mod; + char *cpy; + char *end; + char c; + char *start; + int mod; mod = 0; start = src; - while ((c = *src++) != '\0') - { + while ((c = *src++) != '\0') { /* recognize any meta characters */ - if (c == '&') - { + if (c == '&') { cpy = re->startp[0]; end = re->endp[0]; - } - else if (c == '~') - { + } else if (c == '~') { cpy = previous1; if (cpy) end = cpy + strlen(cpy); - } - else - if (c == '\\') - { + } else if (c == '\\') { c = *src++; - switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': + switch (c) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': /* \0 thru \9 mean "copy subexpression" */ c -= '0'; - cpy = re->startp[(int)c]; - end = re->endp[(int)c]; + cpy = re->startp[(int) c]; + end = re->endp[(int) c]; break; - case 'U': - case 'u': - case 'L': - case 'l': + case 'U': + case 'u': + case 'L': + case 'l': /* \U and \L mean "convert to upper/lowercase" */ mod = c; continue; - case 'E': - case 'e': + case 'E': + case 'e': /* \E ends the \U or \L */ mod = 0; continue; - case '&': + case '&': /* "\&" means "original text" */ *dst++ = c; continue; - case '~': + case '~': /* "\~" means "previous text, if any" */ *dst++ = c; continue; - default: + default: /* ordinary char preceded by backslash */ *dst++ = c; continue; } - } - else - { + } else { /* ordinary character, so just copy it */ *dst++ = c; continue; @@ -804,46 +729,37 @@ extern void regsub(regexp* re, char* src, char* dst) continue; /* copy over a portion of the original */ - while (cpy < end) - { - switch (mod) - { - case 'U': - case 'u': + while (cpy < end) { + switch (mod) { + case 'U': + case 'u': /* convert to uppercase */ - if (isascii(*cpy) && islower(*cpy)) - { + if (isascii(*cpy) && islower(*cpy)) { *dst++ = toupper(*cpy); cpy++; - } - else - { + } else { *dst++ = *cpy++; } break; - case 'L': - case 'l': + case 'L': + case 'l': /* convert to lowercase */ - if (isascii(*cpy) && isupper(*cpy)) - { + if (isascii(*cpy) && isupper(*cpy)) { *dst++ = tolower(*cpy); cpy++; - } - else - { + } else { *dst++ = *cpy++; } break; - default: + default: /* copy without any conversion */ *dst++ = *cpy++; } /* \u and \l end automatically after the first char */ - if (mod && (mod == 'u' || mod == 'l')) - { + if (mod && (mod == 'u' || mod == 'l')) { mod = 0; } } @@ -853,12 +769,10 @@ extern void regsub(regexp* re, char* src, char* dst) /* remember what text we inserted this time */ if (previous1) free(previous1); - previous1 = (char *)malloc((unsigned)(strlen(start) + 1)); + previous1 = (char *) malloc((unsigned) (strlen(start) + 1)); if (previous1) strcpy(previous1, start); } #endif -#endif /* BB_REGEXP */ - - +#endif /* BB_REGEXP */ @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Busybox regexp header file * @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini rm implementation for busybox * @@ -28,11 +29,12 @@ #include <dirent.h> #include <errno.h> -static const char* rm_usage = "rm [OPTION]... FILE...\n\n" -"Remove (unlink) the FILE(s).\n\n" -"Options:\n" -"\t-f\t\tremove existing destinations, never prompt\n" -"\t-r or -R\tremove the contents of directories recursively\n"; +static const char *rm_usage = "rm [OPTION]... FILE...\n\n" + "Remove (unlink) the FILE(s).\n\n" + "Options:\n" + + "\t-f\t\tremove existing destinations, never prompt\n" + "\t-r or -R\tremove the contents of directories recursively\n"; static int recursiveFlag = FALSE; @@ -40,63 +42,63 @@ static int forceFlag = FALSE; static const char *srcName; -static int fileAction(const char *fileName, struct stat* statbuf) +static int fileAction(const char *fileName, struct stat *statbuf) { - if (unlink( fileName) < 0 ) { - perror( fileName); - return ( FALSE); - } - return ( TRUE); + if (unlink(fileName) < 0) { + perror(fileName); + return (FALSE); + } + return (TRUE); } -static int dirAction(const char *fileName, struct stat* statbuf) +static int dirAction(const char *fileName, struct stat *statbuf) { - if (rmdir( fileName) < 0 ) { - perror( fileName); - return ( FALSE); - } - return ( TRUE); + if (rmdir(fileName) < 0) { + perror(fileName); + return (FALSE); + } + return (TRUE); } extern int rm_main(int argc, char **argv) { - struct stat statbuf; + struct stat statbuf; - if (argc < 2) { - usage( rm_usage); - } - argc--; - argv++; - - /* Parse any options */ - while (**argv == '-') { - while (*++(*argv)) - switch (**argv) { - case 'R': - case 'r': - recursiveFlag = TRUE; - break; - case 'f': - forceFlag = TRUE; - break; - default: - usage( rm_usage); - } + if (argc < 2) { + usage(rm_usage); + } argc--; argv++; - } - while (argc-- > 0) { - srcName = *(argv++); - if (forceFlag == TRUE && lstat(srcName, &statbuf) != 0 && errno == ENOENT) { - /* do not reports errors for non-existent files if -f, just skip them */ + /* Parse any options */ + while (**argv == '-') { + while (*++(*argv)) + switch (**argv) { + case 'R': + case 'r': + recursiveFlag = TRUE; + break; + case 'f': + forceFlag = TRUE; + break; + default: + usage(rm_usage); + } + argc--; + argv++; } - else { - if (recursiveAction( srcName, recursiveFlag, FALSE, - TRUE, fileAction, dirAction) == FALSE) { - exit( FALSE); - } + + while (argc-- > 0) { + srcName = *(argv++); + if (forceFlag == TRUE && lstat(srcName, &statbuf) != 0 + && errno == ENOENT) { + /* do not reports errors for non-existent files if -f, just skip them */ + } else { + if (recursiveAction(srcName, recursiveFlag, FALSE, + TRUE, fileAction, dirAction) == FALSE) { + exit(FALSE); + } + } } - } - exit( TRUE); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini rmdir implementation for busybox * @@ -28,15 +29,16 @@ extern int rmdir_main(int argc, char **argv) { - if ( argc==1 || **(argv+1) == '-' ) { - usage( "rmdir [OPTION]... DIRECTORY...\n\nRemove the DIRECTORY(ies), if they are empty.\n"); - } + if (argc == 1 || **(argv + 1) == '-') { + usage + ("rmdir [OPTION]... DIRECTORY...\n\nRemove the DIRECTORY(ies), if they are empty.\n"); + } - while (--argc > 0) { - if ( rmdir(*(++argv)) == -1 ) { - fprintf(stderr, "%s: %s\n", *argv, strerror(errno)); - exit(FALSE); + while (--argc > 0) { + if (rmdir(*(++argv)) == -1) { + fprintf(stderr, "%s: %s\n", *argv, strerror(errno)); + exit(FALSE); + } } - } - exit(TRUE); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini rmmod implementation for busybox * @@ -33,41 +34,41 @@ _syscall1(int, delete_module, const char *, name) static const char rmmod_usage[] = - "rmmod [OPTION]... [MODULE]...\n\n" - "Unloads the specified kernel modules from the kernel.\n\n" - "Options:\n" - "\t-a\tTry to remove all unused kernel modules.\n"; + "rmmod [OPTION]... [MODULE]...\n\n" + "Unloads the specified kernel modules from the kernel.\n\n" + + "Options:\n" "\t-a\tTry to remove all unused kernel modules.\n"; extern int rmmod_main(int argc, char **argv) { - if (argc<=1) { - usage(rmmod_usage); - } + if (argc <= 1) { + usage(rmmod_usage); + } - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 'a': - /* Unload _all_ unused modules via NULL delete_module() call */ - if (delete_module(NULL)) { - perror("rmmod"); - exit( FALSE); + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 'a': + /* Unload _all_ unused modules via NULL delete_module() call */ + if (delete_module(NULL)) { + perror("rmmod"); + exit(FALSE); + } + exit(TRUE); + default: + usage(rmmod_usage); + } } - exit( TRUE); - default: - usage(rmmod_usage); - } } - } - while (argc-- > 0 ) { - if (delete_module(*argv) < 0) { - perror(*argv); + while (argc-- > 0) { + if (delete_module(*argv) < 0) { + perror(*argv); + } + argv++; } - argv++; - } - exit( TRUE); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini sed implementation for busybox * @@ -37,27 +38,27 @@ #include <ctype.h> static const char sed_usage[] = - "sed [-n] -e script [file...]\n\n" - "Allowed sed scripts come in the following form:\n" - "\t'ADDR [!] COMMAND'\n\n" - "\twhere address ADDR can be:\n" - "\t NUMBER Match specified line number\n" - "\t $ Match last line\n" - "\t /REGEXP/ Match specified regexp\n" - "\t (! inverts the meaning of the match)\n\n" - "\tand COMMAND can be:\n" - "\t s/regexp/replacement/[igp]\n" - "\t which attempt to match regexp against the pattern space\n" - "\t and if successful replaces the matched portion with replacement.\n\n" - "\t aTEXT\n" - "\t which appends TEXT after the pattern space\n" - "Options:\n" - "-e\tadd the script to the commands to be executed\n" - "-n\tsuppress automatic printing of pattern space\n\n" + "sed [-n] -e script [file...]\n\n" + "Allowed sed scripts come in the following form:\n" + "\t'ADDR [!] COMMAND'\n\n" + "\twhere address ADDR can be:\n" + "\t NUMBER Match specified line number\n" + "\t $ Match last line\n" + "\t /REGEXP/ Match specified regexp\n" + "\t (! inverts the meaning of the match)\n\n" + "\tand COMMAND can be:\n" + "\t s/regexp/replacement/[igp]\n" + "\t which attempt to match regexp against the pattern space\n" + "\t and if successful replaces the matched portion with replacement.\n\n" + "\t aTEXT\n" + "\t which appends TEXT after the pattern space\n" + "Options:\n" + "-e\tadd the script to the commands to be executed\n" + "-n\tsuppress automatic printing of pattern space\n\n" #if defined BB_REGEXP - "This version of sed matches full regular expresions.\n"; + "This version of sed matches full regular expresions.\n"; #else - "This version of sed matches strings (not full regular expresions).\n"; + "This version of sed matches strings (not full regular expresions).\n"; #endif /* Flags & variables */ @@ -76,276 +77,277 @@ static int negated = 0; static inline int at_last(FILE * fp) { - int res = 0; - - if (feof(fp)) - return 1; - else { - char ch; - if ((ch = fgetc(fp)) == EOF) - res++; - ungetc(ch, fp); - } - return res; + int res = 0; + + if (feof(fp)) + return 1; + else { + char ch; + + if ((ch = fgetc(fp)) == EOF) + res++; + ungetc(ch, fp); + } + return res; } static void do_sed_repl(FILE * fp, char *needle, char *newNeedle, - int ignoreCase, int printFlag, int quietFlag) + int ignoreCase, int printFlag, int quietFlag) { - int foundOne = FALSE; - char haystack[BUFSIZE]; - int line = 1, doit; - - while (fgets(haystack, BUFSIZE - 1, fp)) { - doit = 0; - if (addr_pattern) { - doit = !find_match(haystack, addr_pattern, FALSE); - } else if (addr_line == NO_LINE) - doit = 1; - else if (addr_line == LAST_LINE) { - if (at_last(fp)) - doit = 1; - } else { - if (line == addr_line) - doit = 1; - } - if (negated) - doit = 1 - doit; - if (doit) { - foundOne = - replace_match(haystack, needle, newNeedle, ignoreCase); - - if (foundOne == TRUE && printFlag == TRUE) { - fprintf(stdout, haystack); - } - } + int foundOne = FALSE; + char haystack[BUFSIZE]; + int line = 1, doit; + + while (fgets(haystack, BUFSIZE - 1, fp)) { + doit = 0; + if (addr_pattern) { + doit = !find_match(haystack, addr_pattern, FALSE); + } else if (addr_line == NO_LINE) + doit = 1; + else if (addr_line == LAST_LINE) { + if (at_last(fp)) + doit = 1; + } else { + if (line == addr_line) + doit = 1; + } + if (negated) + doit = 1 - doit; + if (doit) { + foundOne = + replace_match(haystack, needle, newNeedle, ignoreCase); + + if (foundOne == TRUE && printFlag == TRUE) { + fprintf(stdout, haystack); + } + } - if (quietFlag == FALSE) { - fprintf(stdout, haystack); - } + if (quietFlag == FALSE) { + fprintf(stdout, haystack); + } - line++; - } + line++; + } } static void do_sed_append(FILE * fp, char *appendline, int quietFlag) { - char buffer[BUFSIZE]; - int line = 1, doit; - - while (fgets(buffer, BUFSIZE - 1, fp)) { - doit = 0; - if (addr_pattern) { - doit = !find_match(buffer, addr_pattern, FALSE); - } else if (addr_line == NO_LINE) - doit = 1; - else if (addr_line == LAST_LINE) { - if (at_last(fp)) - doit = 1; - } else { - if (line == addr_line) - doit = 1; - } - if (negated) - doit = 1 - doit; - if (quietFlag == FALSE) { - fprintf(stdout, buffer); - } - if (doit) { - fputs(appendline, stdout); - fputc('\n', stdout); - } + char buffer[BUFSIZE]; + int line = 1, doit; + + while (fgets(buffer, BUFSIZE - 1, fp)) { + doit = 0; + if (addr_pattern) { + doit = !find_match(buffer, addr_pattern, FALSE); + } else if (addr_line == NO_LINE) + doit = 1; + else if (addr_line == LAST_LINE) { + if (at_last(fp)) + doit = 1; + } else { + if (line == addr_line) + doit = 1; + } + if (negated) + doit = 1 - doit; + if (quietFlag == FALSE) { + fprintf(stdout, buffer); + } + if (doit) { + fputs(appendline, stdout); + fputc('\n', stdout); + } - line++; - } + line++; + } } extern int sed_main(int argc, char **argv) { - FILE *fp; - char *needle = NULL, *newNeedle = NULL; - char *name; - char *cp; - int ignoreCase = FALSE; - int printFlag = FALSE; - int quietFlag = FALSE; - int stopNow; - char *line_s = NULL, saved; - char *appendline = NULL; - char *pos; - sed_function sed_f = f_none; - - argc--; - argv++; - if (argc < 1) { - usage(sed_usage); - } - - if (**argv == '-') { - argc--; - cp = *argv++; - stopNow = FALSE; - - while (*++cp && stopNow == FALSE) { - switch (*cp) { - case 'n': - quietFlag = TRUE; - break; - case 'e': - if (*(cp + 1) == 0 && --argc < 0) { - usage(sed_usage); - } - if (*++cp != 's') - cp = *argv++; - - /* Read address if present */ - SKIPSPACES(cp); - if (*cp == '$') { - addr_line = LAST_LINE; - cp++; - } else { - if (isdigit(*cp)) { /* LINE ADDRESS */ - line_s = cp; - while (isdigit(*cp)) - cp++; - if (cp > line_s) { - /* numeric line */ - saved = *cp; - *cp = '\0'; - addr_line = atoi(line_s); - *cp = saved; - } - } else if (*cp == '/') { /* PATTERN ADDRESS */ - pos = addr_pattern = cp + 1; - pos = strchr(pos, '/'); - if (!pos) - usage(sed_usage); - *pos = '\0'; - cp = pos + 1; - } - } - - SKIPSPACES(cp); - if (*cp == '!') { - negated++; - cp++; - } + FILE *fp; + char *needle = NULL, *newNeedle = NULL; + char *name; + char *cp; + int ignoreCase = FALSE; + int printFlag = FALSE; + int quietFlag = FALSE; + int stopNow; + char *line_s = NULL, saved; + char *appendline = NULL; + char *pos; + sed_function sed_f = f_none; - /* Read command */ + argc--; + argv++; + if (argc < 1) { + usage(sed_usage); + } - SKIPSPACES(cp); - switch (*cp) { - case 's': /* REPLACE */ - if (strlen(cp) <= 3 || *(cp + 1) != '/') - break; - sed_f = f_replace; + if (**argv == '-') { + argc--; + cp = *argv++; + stopNow = FALSE; - pos = needle = cp + 2; + while (*++cp && stopNow == FALSE) { + switch (*cp) { + case 'n': + quietFlag = TRUE; + break; + case 'e': + if (*(cp + 1) == 0 && --argc < 0) { + usage(sed_usage); + } + if (*++cp != 's') + cp = *argv++; + + /* Read address if present */ + SKIPSPACES(cp); + if (*cp == '$') { + addr_line = LAST_LINE; + cp++; + } else { + if (isdigit(*cp)) { /* LINE ADDRESS */ + line_s = cp; + while (isdigit(*cp)) + cp++; + if (cp > line_s) { + /* numeric line */ + saved = *cp; + *cp = '\0'; + addr_line = atoi(line_s); + *cp = saved; + } + } else if (*cp == '/') { /* PATTERN ADDRESS */ + pos = addr_pattern = cp + 1; + pos = strchr(pos, '/'); + if (!pos) + usage(sed_usage); + *pos = '\0'; + cp = pos + 1; + } + } + + SKIPSPACES(cp); + if (*cp == '!') { + negated++; + cp++; + } + + /* Read command */ + + SKIPSPACES(cp); + switch (*cp) { + case 's': /* REPLACE */ + if (strlen(cp) <= 3 || *(cp + 1) != '/') + break; + sed_f = f_replace; + + pos = needle = cp + 2; + + for (;;) { + pos = strchr(pos, '/'); + if (pos == NULL) { + usage(sed_usage); + } + if (*(pos - 1) == '\\') { + pos++; + continue; + } + break; + } + *pos = 0; + newNeedle = ++pos; + for (;;) { + pos = strchr(pos, '/'); + if (pos == NULL) { + usage(sed_usage); + } + if (*(pos - 1) == '\\') { + pos++; + continue; + } + break; + } + *pos = 0; + if (pos + 2 != 0) { + while (*++pos) { + switch (*pos) { + case 'i': + ignoreCase = TRUE; + break; + case 'p': + printFlag = TRUE; + break; + case 'g': + break; + default: + usage(sed_usage); + } + } + } + cp = pos; + /* fprintf(stderr, "replace '%s' with '%s'\n", needle, newNeedle); */ + break; + + case 'a': /* APPEND */ + if (strlen(cp) < 2) + break; + sed_f = f_append; + appendline = ++cp; + /* fprintf(stderr, "append '%s'\n", appendline); */ + break; + } + + stopNow = TRUE; + break; - for (;;) { - pos = strchr(pos, '/'); - if (pos == NULL) { - usage(sed_usage); - } - if (*(pos - 1) == '\\') { - pos++; - continue; + default: + usage(sed_usage); } + } + } + + if (argc == 0) { + switch (sed_f) { + case f_none: break; - } - *pos = 0; - newNeedle = ++pos; - for (;;) { - pos = strchr(pos, '/'); - if (pos == NULL) { - usage(sed_usage); - } - if (*(pos - 1) == '\\') { - pos++; - continue; - } + case f_replace: + do_sed_repl(stdin, needle, newNeedle, ignoreCase, printFlag, + quietFlag); break; - } - *pos = 0; - if (pos + 2 != 0) { - while (*++pos) { - switch (*pos) { - case 'i': - ignoreCase = TRUE; + case f_append: + do_sed_append(stdin, appendline, quietFlag); + break; + } + } else { + while (argc-- > 0) { + name = *argv++; + + fp = fopen(name, "r"); + if (fp == NULL) { + perror(name); + continue; + } + + switch (sed_f) { + case f_none: break; - case 'p': - printFlag = TRUE; + case f_replace: + do_sed_repl(fp, needle, newNeedle, ignoreCase, printFlag, + quietFlag); break; - case 'g': + case f_append: + do_sed_append(fp, appendline, quietFlag); break; - default: - usage(sed_usage); - } } - } - cp = pos; - /* fprintf(stderr, "replace '%s' with '%s'\n", needle, newNeedle); */ - break; - case 'a': /* APPEND */ - if (strlen(cp) < 2) - break; - sed_f = f_append; - appendline = ++cp; - /* fprintf(stderr, "append '%s'\n", appendline); */ - break; - } + if (ferror(fp)) + perror(name); - stopNow = TRUE; - break; - - default: - usage(sed_usage); - } - } - } - - if (argc == 0) { - switch (sed_f) { - case f_none: - break; - case f_replace: - do_sed_repl(stdin, needle, newNeedle, ignoreCase, printFlag, - quietFlag); - break; - case f_append: - do_sed_append(stdin, appendline, quietFlag); - break; - } - } else { - while (argc-- > 0) { - name = *argv++; - - fp = fopen(name, "r"); - if (fp == NULL) { - perror(name); - continue; - } - - switch (sed_f) { - case f_none: - break; - case f_replace: - do_sed_repl(fp, needle, newNeedle, ignoreCase, printFlag, - quietFlag); - break; - case f_append: - do_sed_append(fp, appendline, quietFlag); - break; - } - - if (ferror(fp)) - perror(name); - - fclose(fp); + fclose(fp); + } } - } - exit(TRUE); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * sfdisk version 3.0 - aeb - 950813 * @@ -39,52 +40,53 @@ #include "internal.h" #include <stdio.h> -#include <stdlib.h> /* atoi, free */ -#include <stdarg.h> /* varargs */ -#include <unistd.h> /* read, write */ -#include <fcntl.h> /* O_RDWR */ -#include <errno.h> /* ERANGE */ -#include <string.h> /* index() */ +#include <stdlib.h> /* atoi, free */ +#include <stdarg.h> /* varargs */ +#include <unistd.h> /* read, write */ +#include <fcntl.h> /* O_RDWR */ +#include <errno.h> /* ERANGE */ +#include <string.h> /* index() */ #include <ctype.h> #include <getopt.h> #include <sys/ioctl.h> #include <sys/stat.h> -#include <linux/unistd.h> /* _syscall */ -#include <linux/hdreg.h> /* HDIO_GETGEO */ -#include <linux/fs.h> /* BLKGETSIZE */ +#include <linux/unistd.h> /* _syscall */ +#include <linux/hdreg.h> /* HDIO_GETGEO */ +#include <linux/fs.h> /* BLKGETSIZE */ static const char sfdisk_usage[] = -"sfdisk [options] device ...\n" -"device: something like /dev/hda or /dev/sda\n" -"useful options:\n" -" -s [or --show-size]: list size of a partition\n" -" -c [or --id]: print or change partition Id\n" -" -l [or --list]: list partitions of each device\n" -" -d [or --dump]: idem, but in a format suitable for later input\n" -" -i [or --increment]: number cylinders etc. from 1 instead of from 0\n" -" -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/MB\n" -" -T [or --list-types]:list the known partition types\n" -" -D [or --DOS]: for DOS-compatibility: waste a little space\n" -" -R [or --re-read]: make kernel reread partition table\n" -" -N# : change only the partition with number #\n" -" -n : do not actually write to disk\n" -" -O file : save the sectors that will be overwritten to file\n" -" -I file : restore these sectors again\n" -" -v [or --version]: print version\n" -" -? [or --help]: print this message\n" -"dangerous options:\n" -" -g [or --show-geometry]: print the kernel's idea of the geometry\n" -" -x [or --show-extended]: also list extended partitions on output\n\n" -" or expect descriptors for them on input\n" -" -L [or --Linux]: do not complain about things irrelevant for Linux\n" -" -q [or --quiet]: suppress warning messages\n" -" You can override the detected geometry using:\n" -" -C# [or --cylinders #]:set the number of cylinders to use\n" -" -H# [or --heads #]: set the number of heads to use\n" -" -S# [or --sectors #]: set the number of sectors to use\n" -"You can disable all consistency checking with:\n" -" -f [or --force]: do what I say, even if it is stupid\n"; + "sfdisk [options] device ...\n" + "device: something like /dev/hda or /dev/sda\n" + "useful options:\n" + " -s [or --show-size]: list size of a partition\n" + " -c [or --id]: print or change partition Id\n" + " -l [or --list]: list partitions of each device\n" + " -d [or --dump]: idem, but in a format suitable for later input\n" + " -i [or --increment]: number cylinders etc. from 1 instead of from 0\n" + " -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/MB\n" + " -T [or --list-types]:list the known partition types\n" + " -D [or --DOS]: for DOS-compatibility: waste a little space\n" + " -R [or --re-read]: make kernel reread partition table\n" + " -N# : change only the partition with number #\n" + " -n : do not actually write to disk\n" + " -O file : save the sectors that will be overwritten to file\n" + " -I file : restore these sectors again\n" + " -v [or --version]: print version\n" + " -? [or --help]: print this message\n" + "dangerous options:\n" + " -g [or --show-geometry]: print the kernel's idea of the geometry\n" + " -x [or --show-extended]: also list extended partitions on output\n\n" + " or expect descriptors for them on input\n" + " -L [or --Linux]: do not complain about things irrelevant for Linux\n" + " -q [or --quiet]: suppress warning messages\n" + " You can override the detected geometry using:\n" + " -C# [or --cylinders #]:set the number of cylinders to use\n" + " -H# [or --heads #]: set the number of heads to use\n" + " -S# [or --sectors #]: set the number of sectors to use\n" + + "You can disable all consistency checking with:\n" + " -f [or --force]: do what I say, even if it is stupid\n"; @@ -100,14 +102,14 @@ static struct systypes i386_sys_types[] = { {0x02, "XENIX root"}, {0x03, "XENIX usr"}, {0x04, "FAT16 <32M"}, - {0x05, "Extended"}, /* DOS 3.3+ extended partition */ - {0x06, "FAT16"}, /* DOS 16-bit >=32M */ - {0x07, "HPFS/NTFS"}, /* OS/2 IFS, eg, HPFS or NTFS or QNX */ - {0x08, "AIX"}, /* AIX boot (AIX -- PS/2 port or SplitDrive) */ - {0x09, "AIX bootable"}, /* AIX data or Coherent */ - {0x0a, "OS/2 Boot Manager"},/* OS/2 Boot Manager */ + {0x05, "Extended"}, /* DOS 3.3+ extended partition */ + {0x06, "FAT16"}, /* DOS 16-bit >=32M */ + {0x07, "HPFS/NTFS"}, /* OS/2 IFS, eg, HPFS or NTFS or QNX */ + {0x08, "AIX"}, /* AIX boot (AIX -- PS/2 port or SplitDrive) */ + {0x09, "AIX bootable"}, /* AIX data or Coherent */ + {0x0a, "OS/2 Boot Manager"}, /* OS/2 Boot Manager */ {0x0b, "Win95 FAT32"}, - {0x0c, "Win95 FAT32 (LBA)"},/* LBA really is `Extended Int 13h' */ + {0x0c, "Win95 FAT32 (LBA)"}, /* LBA really is `Extended Int 13h' */ {0x0e, "Win95 FAT16 (LBA)"}, {0x0f, "Win95 Ext'd (LBA)"}, {0x10, "OPUS"}, @@ -130,7 +132,7 @@ static struct systypes i386_sys_types[] = { {0x4f, "QNX4.x 3rd part"}, {0x50, "OnTrack DM"}, {0x51, "OnTrack DM6 Aux1"}, /* (or Novell) */ - {0x52, "CP/M"}, /* CP/M or Microport SysV/AT */ + {0x52, "CP/M"}, /* CP/M or Microport SysV/AT */ {0x53, "OnTrack DM6 Aux3"}, {0x54, "OnTrackDM6"}, {0x55, "EZ-Drive"}, @@ -142,16 +144,16 @@ static struct systypes i386_sys_types[] = { {0x65, "Novell Netware 386"}, {0x70, "DiskSecure Multi-Boot"}, {0x75, "PC/IX"}, - {0x80, "Old Minix"}, /* Minix 1.4a and earlier */ - {0x81, "Minix / old Linux"},/* Minix 1.4b and later */ - {0x82, "Linux swap"}, /* also Solaris */ + {0x80, "Old Minix"}, /* Minix 1.4a and earlier */ + {0x81, "Minix / old Linux"}, /* Minix 1.4b and later */ + {0x82, "Linux swap"}, /* also Solaris */ {0x83, "Linux"}, {0x84, "OS/2 hidden C: drive"}, {0x85, "Linux extended"}, {0x86, "NTFS volume set"}, {0x87, "NTFS volume set"}, {0x93, "Amoeba"}, - {0x94, "Amoeba BBT"}, /* (bad block table) */ + {0x94, "Amoeba BBT"}, /* (bad block table) */ {0xa0, "IBM Thinkpad hibernation"}, {0xa5, "BSD/386"}, {0xa6, "OpenBSD"}, @@ -162,19 +164,19 @@ static struct systypes i386_sys_types[] = { {0xc4, "DRDOS/sec (FAT-16 < 32M)"}, {0xc6, "DRDOS/sec (FAT-16)"}, {0xc7, "Syrinx"}, - {0xdb, "CP/M / CTOS / ..."},/* CP/M or Concurrent CP/M or Concurrent DOS or CTOS */ - {0xe1, "DOS access"}, /* DOS access or SpeedStor 12-bit FAT extended partition */ - {0xe3, "DOS R/O"}, /* DOS R/O or SpeedStor */ - {0xe4, "SpeedStor"}, /* SpeedStor 16-bit FAT extended partition < 1024 cyl. */ + {0xdb, "CP/M / CTOS / ..."}, /* CP/M or Concurrent CP/M or Concurrent DOS or CTOS */ + {0xe1, "DOS access"}, /* DOS access or SpeedStor 12-bit FAT extended partition */ + {0xe3, "DOS R/O"}, /* DOS R/O or SpeedStor */ + {0xe4, "SpeedStor"}, /* SpeedStor 16-bit FAT extended partition < 1024 cyl. */ {0xeb, "BeOS fs"}, {0xf1, "SpeedStor"}, - {0xf4, "SpeedStor"}, /* SpeedStor large partition */ + {0xf4, "SpeedStor"}, /* SpeedStor large partition */ {0xf2, "DOS secondary"}, /* DOS 3.3+ secondary */ - {0xfd, "Linux raid autodetect"},/* New (2.2.x) raid partition with autodetect - using persistent superblock */ - {0xfe, "LANstep"}, /* SpeedStor >1024 cyl. or LANstep */ - {0xff, "BBT"}, /* Xenix Bad Block Table */ - { 0, 0 } + {0xfd, "Linux raid autodetect"}, /* New (2.2.x) raid partition with autodetect + using persistent superblock */ + {0xfe, "LANstep"}, /* SpeedStor >1024 cyl. or LANstep */ + {0xff, "BBT"}, /* Xenix Bad Block Table */ + {0, 0} }; #define SIZE(a) (sizeof(a)/sizeof(a[0])) @@ -193,51 +195,51 @@ static struct systypes i386_sys_types[] = { */ static int exit_status = 0; -static int force = 0; /* 1: do what I say, even if it is stupid ... */ -static int quiet = 0; /* 1: suppress all warnings */ -static int Linux = 0; /* 1: suppress warnings irrelevant for Linux */ -static int DOS = 0; /* 1: shift extended partitions by #sectors, not 1 */ -static int dump = 0; /* 1: list in a format suitable for later input */ -static int verify = 0; /* 1: check that listed partition is reasonable */ -static int no_write = 0; /* 1: do not actually write to disk */ -static int no_reread = 0; /* 1: skip the BLKRRPART ioctl test at startup */ -static int leave_last = 0; /* 1: don't allocate the last cylinder */ +static int force = 0; /* 1: do what I say, even if it is stupid ... */ +static int quiet = 0; /* 1: suppress all warnings */ +static int Linux = 0; /* 1: suppress warnings irrelevant for Linux */ +static int DOS = 0; /* 1: shift extended partitions by #sectors, not 1 */ +static int dump = 0; /* 1: list in a format suitable for later input */ +static int verify = 0; /* 1: check that listed partition is reasonable */ +static int no_write = 0; /* 1: do not actually write to disk */ +static int no_reread = 0; /* 1: skip the BLKRRPART ioctl test at startup */ +static int leave_last = 0; /* 1: don't allocate the last cylinder */ static int opt_list = 0; static char *save_sector_file = NULL; static char *restore_sector_file = NULL; -static void -warn(char *s, ...) { - va_list p; +static void warn(char *s, ...) +{ + va_list p; - va_start(p, s); - fflush(stdout); - if (!quiet) - vfprintf (stderr, s, p); - va_end(p); + va_start(p, s); + fflush(stdout); + if (!quiet) + vfprintf(stderr, s, p); + va_end(p); } -static void -error(char *s, ...) { - va_list p; +static void error(char *s, ...) +{ + va_list p; - va_start(p, s); - fflush(stdout); - fprintf(stderr, "\n" PROGNAME ": "); - vfprintf(stderr, s, p); - va_end(p); + va_start(p, s); + fflush(stdout); + fprintf(stderr, "\n" PROGNAME ": "); + vfprintf(stderr, s, p); + va_end(p); } -static void -fatal(char *s, ...) { - va_list p; +static void fatal(char *s, ...) +{ + va_list p; - va_start(p, s); - fflush(stdout); - fprintf(stderr, "\n" PROGNAME ": "); - vfprintf(stderr, s, p); - va_end(p); - exit(1); + va_start(p, s); + fflush(stdout); + fprintf(stderr, "\n" PROGNAME ": "); + vfprintf(stderr, s, p); + va_end(p); + exit(1); } /* @@ -254,33 +256,34 @@ fatal(char *s, ...) { */ #ifndef __alpha__ static -_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, - loff_t *, res, uint, wh); +_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, + loff_t *, res, uint, wh); #endif -static int -sseek(char *dev, unsigned int fd, unsigned long s) { - loff_t in, out; - in = ((loff_t) s << 9); - out = 1; +static int sseek(char *dev, unsigned int fd, unsigned long s) +{ + loff_t in, out; + + in = ((loff_t) s << 9); + out = 1; #ifndef __alpha__ - if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) { + if (_llseek(fd, in >> 32, in & 0xffffffff, &out, SEEK_SET) != 0) { #else - if ((out = lseek(fd, in, SEEK_SET)) != in) { + if ((out = lseek(fd, in, SEEK_SET)) != in) { #endif - perror("llseek"); - error("seek error on %s - cannot seek to %lu\n", dev, s); - return 0; - } + perror("llseek"); + error("seek error on %s - cannot seek to %lu\n", dev, s); + return 0; + } - if (in != out) { - error("seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", - (uint)(in>>32), (uint)(in & 0xffffffff), - (uint)(out>>32), (uint)(out & 0xffffffff)); - return 0; - } - return 1; + if (in != out) { + error("seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", + (uint) (in >> 32), (uint) (in & 0xffffffff), + (uint) (out >> 32), (uint) (out & 0xffffffff)); + return 0; + } + return 1; } /* @@ -292,196 +295,196 @@ sseek(char *dev, unsigned int fd, unsigned long s) { * have to be modified and written back. */ struct sector { - struct sector *next; - unsigned long sectornumber; - int to_be_written; - char data[512]; + struct sector *next; + unsigned long sectornumber; + int to_be_written; + char data[512]; } *sectorhead; -static void -free_sectors(void) { - struct sector *s; +static void free_sectors(void) +{ + struct sector *s; - while (sectorhead) { - s = sectorhead; - sectorhead = s->next; - free(s); - } + while (sectorhead) { + s = sectorhead; + sectorhead = s->next; + free(s); + } } -static struct sector * -get_sector(char *dev, int fd, unsigned long sno) { - struct sector *s; - - for(s = sectorhead; s; s = s->next) - if(s->sectornumber == sno) - return s; +static struct sector *get_sector(char *dev, int fd, unsigned long sno) +{ + struct sector *s; - if (!sseek(dev, fd, sno)) - return 0; + for (s = sectorhead; s; s = s->next) + if (s->sectornumber == sno) + return s; - if (!(s = (struct sector *) malloc(sizeof(struct sector)))) - fatal("out of memory - giving up\n"); + if (!sseek(dev, fd, sno)) + return 0; - if (read(fd, s->data, sizeof(s->data)) != sizeof(s->data)) { - perror("read"); - error("read error on %s - cannot read sector %lu\n", dev, sno); - free(s); - return 0; - } + if (!(s = (struct sector *) malloc(sizeof(struct sector)))) + fatal("out of memory - giving up\n"); - s->next = sectorhead; - sectorhead = s; - s->sectornumber = sno; - s->to_be_written = 0; + if (read(fd, s->data, sizeof(s->data)) != sizeof(s->data)) { + perror("read"); + error("read error on %s - cannot read sector %lu\n", dev, sno); + free(s); + return 0; + } - return s; -} + s->next = sectorhead; + sectorhead = s; + s->sectornumber = sno; + s->to_be_written = 0; -static int -msdos_signature (struct sector *s) { - if (*(unsigned short *) (s->data + 0x1fe) != 0xaa55) { - error("ERROR: sector %lu does not have an msdos signature\n", - s->sectornumber); - return 0; - } - return 1; + return s; } -static int -write_sectors(char *dev, int fd) { - struct sector *s; - - for (s = sectorhead; s; s = s->next) - if (s->to_be_written) { - if (!sseek(dev, fd, s->sectornumber)) +static int msdos_signature(struct sector *s) +{ + if (*(unsigned short *) (s->data + 0x1fe) != 0xaa55) { + error("ERROR: sector %lu does not have an msdos signature\n", + s->sectornumber); return 0; - if (write(fd, s->data, sizeof(s->data)) != sizeof(s->data)) { - perror("write"); - error("write error on %s - cannot write sector %lu\n", - dev, s->sectornumber); - return 0; - } - s->to_be_written = 0; } - return 1; + return 1; } -static void -ulong_to_chars(unsigned long u, char *uu) { - int i; +static int write_sectors(char *dev, int fd) +{ + struct sector *s; - for(i=0; i<4; i++) { - uu[i] = (u & 0xff); - u >>= 8; - } + for (s = sectorhead; s; s = s->next) + if (s->to_be_written) { + if (!sseek(dev, fd, s->sectornumber)) + return 0; + if (write(fd, s->data, sizeof(s->data)) != sizeof(s->data)) { + perror("write"); + error("write error on %s - cannot write sector %lu\n", + dev, s->sectornumber); + return 0; + } + s->to_be_written = 0; + } + return 1; } -static unsigned long -chars_to_ulong(unsigned char *uu) { - int i; - unsigned long u = 0; +static void ulong_to_chars(unsigned long u, char *uu) +{ + int i; - for(i=3; i>=0; i--) - u = (u << 8) | uu[i]; - return u; + for (i = 0; i < 4; i++) { + uu[i] = (u & 0xff); + u >>= 8; + } } -static int -save_sectors(char *dev, int fdin) { - struct sector *s; - char ss[516]; - int fdout; - - fdout = open(save_sector_file, O_WRONLY | O_CREAT, 0444); - if (fdout < 0) { - perror(save_sector_file); - error("cannot open partition sector save file (%s)\n", - save_sector_file); - return 0; - } +static unsigned long chars_to_ulong(unsigned char *uu) +{ + int i; + unsigned long u = 0; - for (s = sectorhead; s; s = s->next) - if (s->to_be_written) { - ulong_to_chars(s->sectornumber, ss); - if (!sseek(dev, fdin, s->sectornumber)) - return 0; - if (read(fdin, ss+4, 512) != 512) { - perror("read"); - error("read error on %s - cannot read sector %lu\n", - dev, s->sectornumber); - return 0; - } - if (write(fdout, ss, sizeof(ss)) != sizeof(ss)) { - perror("write"); - error("write error on %s\n"), save_sector_file; + for (i = 3; i >= 0; i--) + u = (u << 8) | uu[i]; + return u; +} + +static int save_sectors(char *dev, int fdin) +{ + struct sector *s; + char ss[516]; + int fdout; + + fdout = open(save_sector_file, O_WRONLY | O_CREAT, 0444); + if (fdout < 0) { + perror(save_sector_file); + error("cannot open partition sector save file (%s)\n", + save_sector_file); return 0; - } } - return 1; + + for (s = sectorhead; s; s = s->next) + if (s->to_be_written) { + ulong_to_chars(s->sectornumber, ss); + if (!sseek(dev, fdin, s->sectornumber)) + return 0; + if (read(fdin, ss + 4, 512) != 512) { + perror("read"); + error("read error on %s - cannot read sector %lu\n", + dev, s->sectornumber); + return 0; + } + if (write(fdout, ss, sizeof(ss)) != sizeof(ss)) { + perror("write"); + error("write error on %s\n"), save_sector_file; + return 0; + } + } + return 1; } static void reread_disk_partition(char *dev, int fd); -static int -restore_sectors(char *dev) { - int fdin, fdout, ct; - struct stat statbuf; - char *ss0, *ss; - unsigned long sno; - - if (stat(restore_sector_file, &statbuf) < 0) { - perror(restore_sector_file); - error("cannot stat partition restore file (%s)\n", - restore_sector_file); - return 0; - } - if (statbuf.st_size % 516) { - error("partition restore file has wrong size - not restoring\n"); - return 0; - } - if (!(ss = (char *) malloc(statbuf.st_size))) { - error("out of memory?\n"); - return 0; - } - fdin = open(restore_sector_file, O_RDONLY); - if (fdin < 0) { - perror(restore_sector_file); - error("cannot open partition restore file (%s)\n", - restore_sector_file); - return 0; - } - if (read(fdin, ss, statbuf.st_size) != statbuf.st_size) { - perror("read"); - error("error reading %s\n"), restore_sector_file; - return 0; - } +static int restore_sectors(char *dev) +{ + int fdin, fdout, ct; + struct stat statbuf; + char *ss0, *ss; + unsigned long sno; + + if (stat(restore_sector_file, &statbuf) < 0) { + perror(restore_sector_file); + error("cannot stat partition restore file (%s)\n", + restore_sector_file); + return 0; + } + if (statbuf.st_size % 516) { + error("partition restore file has wrong size - not restoring\n"); + return 0; + } + if (!(ss = (char *) malloc(statbuf.st_size))) { + error("out of memory?\n"); + return 0; + } + fdin = open(restore_sector_file, O_RDONLY); + if (fdin < 0) { + perror(restore_sector_file); + error("cannot open partition restore file (%s)\n", + restore_sector_file); + return 0; + } + if (read(fdin, ss, statbuf.st_size) != statbuf.st_size) { + perror("read"); + error("error reading %s\n"), restore_sector_file; + return 0; + } - fdout = open(dev, O_WRONLY); - if (fdout < 0) { - perror(dev); - error("cannot open device %s for writing\n"), dev; - return 0; - } + fdout = open(dev, O_WRONLY); + if (fdout < 0) { + perror(dev); + error("cannot open device %s for writing\n"), dev; + return 0; + } - ss0 = ss; - ct = statbuf.st_size/516; - while(ct--) { - sno = chars_to_ulong(ss); - if (!sseek(dev, fdout, sno)) - return 0; - if (write(fdout, ss+4, 512) != 512) { - perror(dev); - error("error writing sector %lu on %s\n", sno, dev); - return 0; + ss0 = ss; + ct = statbuf.st_size / 516; + while (ct--) { + sno = chars_to_ulong(ss); + if (!sseek(dev, fdout, sno)) + return 0; + if (write(fdout, ss + 4, 512) != 512) { + perror(dev); + error("error writing sector %lu on %s\n", sno, dev); + return 0; + } + ss += 516; } - ss += 516; - } - free(ss0); + free(ss0); - reread_disk_partition(dev, fdout); + reread_disk_partition(dev, fdout); - return 1; + return 1; } /* @@ -511,105 +514,111 @@ struct geometry { unsigned long heads, sectors, cylinders; } B, F, U; -static void -get_cylindersize(char *dev, int fd, int silent) { - struct hd_geometry g; - int ioctl_ok = 0; - - B.heads = B.sectors = B.cylinders = 0; - - if (!ioctl(fd, HDIO_GETGEO, &g)) { - ioctl_ok = 1; - - B.heads = g.heads; - B.sectors = g.sectors; - B.cylinders = g.cylinders; - } - - if (U.heads) - B.heads = U.heads; - if (U.sectors) - B.sectors = U.sectors; - if (U.cylinders) - B.cylinders = U.cylinders; - - B.cylindersize = B.heads * B.sectors; - - if (ioctl_ok) { - if (g.start && !force) { - warn( - "Warning: start=%d - this looks like a partition rather than\n" - "the entire disk. Using fdisk on it is probably meaningless.\n" - "[Use the --force option if you really want this]\n", g.start); - exit(1); - } - if (B.heads != g.heads) - warn("Warning: HDIO_GETGEO says that there are %d heads\n", - g.heads); - if (B.sectors != g.sectors) - warn("Warning: HDIO_GETGEO says that there are %d sectors\n", - g.sectors); - if (B.cylinders != g.cylinders) - warn("Warning: HDIO_GETGEO says that there are %d cylinders\n", - g.cylinders); - } else if (!silent) - if (!B.heads || !B.sectors || !B.cylinders) - printf("Disk %s: cannot get geometry\n", dev); - if (B.sectors > 63) - warn("Warning: unlikely number of sectors (%d - usually at most 63\n" - "This will give problems with all software that uses C/H/S addressing.\n", - B.sectors); - if (!silent) - printf("\nDisk %s: %lu cylinders, %lu heads, %lu sectors/track\n", - dev, B.cylinders, B.heads, B.sectors); -} - -typedef struct { unsigned char h,s,c; } chs; /* has some c bits in s */ -static chs zero_chs = { 0,0,0 }; - -typedef struct { unsigned long h,s,c; } longchs; +static void get_cylindersize(char *dev, int fd, int silent) +{ + struct hd_geometry g; + int ioctl_ok = 0; + + B.heads = B.sectors = B.cylinders = 0; + + if (!ioctl(fd, HDIO_GETGEO, &g)) { + ioctl_ok = 1; + + B.heads = g.heads; + B.sectors = g.sectors; + B.cylinders = g.cylinders; + } + + if (U.heads) + B.heads = U.heads; + if (U.sectors) + B.sectors = U.sectors; + if (U.cylinders) + B.cylinders = U.cylinders; + + B.cylindersize = B.heads * B.sectors; + + if (ioctl_ok) { + if (g.start && !force) { + warn + ("Warning: start=%d - this looks like a partition rather than\n" + "the entire disk. Using fdisk on it is probably meaningless.\n" + "[Use the --force option if you really want this]\n", + g.start); + exit(1); + } + if (B.heads != g.heads) + warn("Warning: HDIO_GETGEO says that there are %d heads\n", + g.heads); + if (B.sectors != g.sectors) + warn("Warning: HDIO_GETGEO says that there are %d sectors\n", + g.sectors); + if (B.cylinders != g.cylinders) + warn("Warning: HDIO_GETGEO says that there are %d cylinders\n", + g.cylinders); + } else if (!silent) + if (!B.heads || !B.sectors || !B.cylinders) + printf("Disk %s: cannot get geometry\n", dev); + if (B.sectors > 63) + warn + ("Warning: unlikely number of sectors (%d - usually at most 63\n" + "This will give problems with all software that uses C/H/S addressing.\n", + B.sectors); + if (!silent) + printf("\nDisk %s: %lu cylinders, %lu heads, %lu sectors/track\n", + dev, B.cylinders, B.heads, B.sectors); +} + +typedef struct { + unsigned char h, s, c; +} chs; /* has some c bits in s */ +static chs zero_chs = { 0, 0, 0 }; + +typedef struct { + unsigned long h, s, c; +} longchs; static longchs zero_longchs; -static chs -longchs_to_chs (longchs aa, struct geometry G) { - chs a; - - if (aa.h < 256 && aa.s < 64 && aa.c < 1024) { - a.h = aa.h; - a.s = aa.s | ((aa.c >> 2) & 0xc0); - a.c = (aa.c & 0xff); - } else if (G.heads && G.sectors) { - a.h = G.heads - 1; - a.s = G.sectors | 0xc0; - a.c = 0xff; - } else - a = zero_chs; - return a; -} - -static longchs -chs_to_longchs (chs a) { - longchs aa; - - aa.h = a.h; - aa.s = (a.s & 0x3f); - aa.c = (a.s & 0xc0); - aa.c = (aa.c << 2) + a.c; - return aa; -} - -static longchs -ulong_to_longchs (unsigned long sno, struct geometry G) { - longchs aa; - - if (G.heads && G.sectors && G.cylindersize) { - aa.s = 1 + sno % G.sectors; - aa.h = (sno / G.sectors) % G.heads; - aa.c = sno / G.cylindersize; +static chs longchs_to_chs(longchs aa, struct geometry G) +{ + chs a; + + if (aa.h < 256 && aa.s < 64 && aa.c < 1024) { + a.h = aa.h; + a.s = aa.s | ((aa.c >> 2) & 0xc0); + a.c = (aa.c & 0xff); + } else if (G.heads && G.sectors) { + a.h = G.heads - 1; + a.s = G.sectors | 0xc0; + a.c = 0xff; + } else + a = zero_chs; + return a; +} + +static longchs chs_to_longchs(chs a) +{ + longchs aa; + + aa.h = a.h; + aa.s = (a.s & 0x3f); + aa.c = (a.s & 0xc0); + aa.c = (aa.c << 2) + a.c; return aa; - } else { - return zero_longchs; - } +} + +static longchs ulong_to_longchs(unsigned long sno, struct geometry G) +{ + longchs aa; + + if (G.heads && G.sectors && G.cylindersize) { + aa.s = 1 + sno % G.sectors; + aa.h = (sno / G.sectors) % G.heads; + aa.c = sno / G.cylindersize; + return aa; + } else { + return zero_longchs; + } } //static unsigned long @@ -617,9 +626,9 @@ ulong_to_longchs (unsigned long sno, struct geometry G) { // return (aa.c*G.cylindersize + aa.h*G.sectors + aa.s - 1); //} -static chs -ulong_to_chs (unsigned long sno, struct geometry G) { - return longchs_to_chs(ulong_to_longchs(sno, G), G); +static chs ulong_to_chs(unsigned long sno, struct geometry G) +{ + return longchs_to_chs(ulong_to_longchs(sno, G), G); } //static unsigned long @@ -627,34 +636,34 @@ ulong_to_chs (unsigned long sno, struct geometry G) { // return longchs_to_ulong(chs_to_longchs(a), G); //} -static int -is_equal_chs (chs a, chs b) { - return (a.h == b.h && a.s == b.s && a.c == b.c); +static int is_equal_chs(chs a, chs b) +{ + return (a.h == b.h && a.s == b.s && a.c == b.c); } -static int -chs_ok (chs a, char *v, char *w) { - longchs aa = chs_to_longchs(a); - int ret = 1; - - if (is_equal_chs(a, zero_chs)) - return 1; - if (B.heads && aa.h >= B.heads) { - warn("%s of partition %s has impossible value for head: " - "%d (should be in 0-%d)\n", w, v, aa.h, B.heads-1); - ret = 0; - } - if (B.sectors && (aa.s == 0 || aa.s > B.sectors)) { - warn("%s of partition %s has impossible value for sector: " - "%d (should be in 1-%d)\n", w, v, aa.s, B.sectors); - ret = 0; - } - if (B.cylinders && aa.c >= B.cylinders) { - warn("%s of partition %s has impossible value for cylinders: " - "%d (should be in 0-%d)\n", w, v, aa.c, B.cylinders-1); - ret = 0; - } - return ret; +static int chs_ok(chs a, char *v, char *w) +{ + longchs aa = chs_to_longchs(a); + int ret = 1; + + if (is_equal_chs(a, zero_chs)) + return 1; + if (B.heads && aa.h >= B.heads) { + warn("%s of partition %s has impossible value for head: " + "%d (should be in 0-%d)\n", w, v, aa.h, B.heads - 1); + ret = 0; + } + if (B.sectors && (aa.s == 0 || aa.s > B.sectors)) { + warn("%s of partition %s has impossible value for sector: " + "%d (should be in 1-%d)\n", w, v, aa.s, B.sectors); + ret = 0; + } + if (B.cylinders && aa.c >= B.cylinders) { + warn("%s of partition %s has impossible value for cylinders: " + "%d (should be in 0-%d)\n", w, v, aa.c, B.cylinders - 1); + ret = 0; + } + return ret; } /* @@ -675,34 +684,33 @@ chs_ok (chs a, char *v, char *w) { /* List of partition types now in i386_sys_types.c */ -static const char * -sysname(unsigned char type) { - struct systypes *s; +static const char *sysname(unsigned char type) +{ + struct systypes *s; - for (s = i386_sys_types; s->name; s++) - if (s->type == type) - return s->name; - return "Unknown"; + for (s = i386_sys_types; s->name; s++) + if (s->type == type) + return s->name; + return "Unknown"; } -static void -list_types(void) { - struct systypes *s; +static void list_types(void) +{ + struct systypes *s; - printf("Id Name\n\n"); - for (s = i386_sys_types; s->name; s++) - printf("%2x %s\n", s->type, s->name); + printf("Id Name\n\n"); + for (s = i386_sys_types; s->name; s++) + printf("%2x %s\n", s->type, s->name); } -static int -is_extended(unsigned char type) { +static int is_extended(unsigned char type) +{ return (type == EXTENDED_PARTITION - || type == LINUX_EXTENDED - || type == WIN98_EXTENDED); + || type == LINUX_EXTENDED || type == WIN98_EXTENDED); } -static int -is_bsd(unsigned char type) { +static int is_bsd(unsigned char type) +{ return (type == BSD_PARTITION); } @@ -713,61 +721,64 @@ is_bsd(unsigned char type) { /* MS/DOS partition */ struct partition { - unsigned char bootable; /* 0 or 0x80 */ - chs begin_chs; - unsigned char sys_type; - chs end_chs; - unsigned int start_sect; /* starting sector counting from 0 */ - unsigned int nr_sects; /* nr of sectors in partition */ + unsigned char bootable; /* 0 or 0x80 */ + chs begin_chs; + unsigned char sys_type; + chs end_chs; + unsigned int start_sect; /* starting sector counting from 0 */ + unsigned int nr_sects; /* nr of sectors in partition */ }; /* Unfortunately, partitions are not aligned, and non-Intel machines are unhappy with non-aligned integers. So, we need a copy by hand. */ -static int -copy_to_int(unsigned char *cp) { - unsigned int m; - - m = *cp++; - m += (*cp++ << 8); - m += (*cp++ << 16); - m += (*cp++ << 24); - return m; -} - -static void -copy_from_int(int m, char *cp) { - *cp++ = (m & 0xff); m >>= 8; - *cp++ = (m & 0xff); m >>= 8; - *cp++ = (m & 0xff); m >>= 8; - *cp++ = (m & 0xff); -} - -static void -copy_to_part(char *cp, struct partition *p) { - p->bootable = *cp++; - p->begin_chs.h = *cp++; - p->begin_chs.s = *cp++; - p->begin_chs.c = *cp++; - p->sys_type = *cp++; - p->end_chs.h = *cp++; - p->end_chs.s = *cp++; - p->end_chs.c = *cp++; - p->start_sect = copy_to_int(cp); - p->nr_sects = copy_to_int(cp+4); -} - -static void -copy_from_part(struct partition *p, char *cp) { - *cp++ = p->bootable; - *cp++ = p->begin_chs.h; - *cp++ = p->begin_chs.s; - *cp++ = p->begin_chs.c; - *cp++ = p->sys_type; - *cp++ = p->end_chs.h; - *cp++ = p->end_chs.s; - *cp++ = p->end_chs.c; - copy_from_int(p->start_sect, cp); - copy_from_int(p->nr_sects, cp+4); +static int copy_to_int(unsigned char *cp) +{ + unsigned int m; + + m = *cp++; + m += (*cp++ << 8); + m += (*cp++ << 16); + m += (*cp++ << 24); + return m; +} + +static void copy_from_int(int m, char *cp) +{ + *cp++ = (m & 0xff); + m >>= 8; + *cp++ = (m & 0xff); + m >>= 8; + *cp++ = (m & 0xff); + m >>= 8; + *cp++ = (m & 0xff); +} + +static void copy_to_part(char *cp, struct partition *p) +{ + p->bootable = *cp++; + p->begin_chs.h = *cp++; + p->begin_chs.s = *cp++; + p->begin_chs.c = *cp++; + p->sys_type = *cp++; + p->end_chs.h = *cp++; + p->end_chs.s = *cp++; + p->end_chs.c = *cp++; + p->start_sect = copy_to_int(cp); + p->nr_sects = copy_to_int(cp + 4); +} + +static void copy_from_part(struct partition *p, char *cp) +{ + *cp++ = p->bootable; + *cp++ = p->begin_chs.h; + *cp++ = p->begin_chs.s; + *cp++ = p->begin_chs.c; + *cp++ = p->sys_type; + *cp++ = p->end_chs.h; + *cp++ = p->end_chs.s; + *cp++ = p->end_chs.c; + copy_from_int(p->start_sect, cp); + copy_from_int(p->nr_sects, cp + 4); } /* Roughly speaking, Linux doesn't use any of the above fields except @@ -777,122 +788,125 @@ copy_from_part(struct partition *p, char *cp) { for equality with EXTENDED_PARTITION (and these Disk Manager types). */ struct part_desc { - unsigned long start; - unsigned long size; - unsigned long sector, offset; /* disk location of this info */ - struct partition p; - struct part_desc *ep; /* extended partition containing this one */ - int ptype; + unsigned long start; + unsigned long size; + unsigned long sector, offset; /* disk location of this info */ + struct partition p; + struct part_desc *ep; /* extended partition containing this one */ + int ptype; #define DOS_TYPE 0 #define BSD_TYPE 1 } zero_part_desc; -struct part_desc * -outer_extended_partition(struct part_desc *p) { - while (p->ep) - p = p->ep; - return p; +struct part_desc *outer_extended_partition(struct part_desc *p) +{ + while (p->ep) + p = p->ep; + return p; } -static int -is_parent(struct part_desc *pp, struct part_desc *p) { - while (p) { - if (pp == p) - return 1; - p = p->ep; - } - return 0; +static int is_parent(struct part_desc *pp, struct part_desc *p) +{ + while (p) { + if (pp == p) + return 1; + p = p->ep; + } + return 0; } struct disk_desc { - struct part_desc partitions[128]; - int partno; + struct part_desc partitions[128]; + int partno; } oldp, newp; /* determine where on the disk this information goes */ -static void -add_sector_and_offset(struct disk_desc *z) { - int pno; - struct part_desc *p; +static void add_sector_and_offset(struct disk_desc *z) +{ + int pno; + struct part_desc *p; + + for (pno = 0; pno < z->partno; pno++) { + p = &(z->partitions[pno]); + p->offset = 0x1be + (pno % 4) * sizeof(struct partition); - for (pno = 0; pno < z->partno; pno++) { - p = &(z->partitions[pno]); - p->offset = 0x1be + (pno%4)*sizeof(struct partition); - p->sector = (p->ep ? p->ep->start : 0); - } + p->sector = (p->ep ? p->ep->start : 0); + } } /* tell the kernel to reread the partition tables */ -static int -reread_ioctl(int fd) { - if(ioctl(fd, BLKRRPART)) { - perror("BLKRRPART"); - return -1; - } - return 0; +static int reread_ioctl(int fd) +{ + if (ioctl(fd, BLKRRPART)) { + perror("BLKRRPART"); + return -1; + } + return 0; } -static int -is_blockdev(int fd) { - struct stat statbuf; +static int is_blockdev(int fd) +{ + struct stat statbuf; - return(fstat(fd, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)); + return (fstat(fd, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)); } /* reread after writing */ -static void -reread_disk_partition(char *dev, int fd) { - printf("Re-reading the partition table ...\n"); - fflush(stdout); - sync(); - sleep(3); /* superfluous since 1.3.20 */ - - if(reread_ioctl(fd) && is_blockdev(fd)) - printf("The command to re-read the partition table failed\n" - "Reboot your system now, before using mkfs\n"); - - if (close(fd)) { - perror(dev); - printf("Error closing %s\n", dev); - } - printf("\n"); +static void reread_disk_partition(char *dev, int fd) +{ + printf("Re-reading the partition table ...\n"); + fflush(stdout); + sync(); + sleep(3); /* superfluous since 1.3.20 */ + + if (reread_ioctl(fd) && is_blockdev(fd)) + printf("The command to re-read the partition table failed\n" + "Reboot your system now, before using mkfs\n"); + + if (close(fd)) { + perror(dev); + printf("Error closing %s\n", dev); + } + printf("\n"); } /* find Linux name of this partition, assuming that it will have a name */ -static int -index_to_linux(int pno, struct disk_desc *z) { - int i, ct = 1; - struct part_desc *p = &(z->partitions[0]); - for (i=0; i<pno; i++,p++) - if(i < 4 || (p->size > 0 && !is_extended(p->p.sys_type))) - ct++; - return ct; -} - -static int -linux_to_index(int lpno, struct disk_desc *z) { - int i, ct = 0; - struct part_desc *p = &(z->partitions[0]); - for (i=0; i<z->partno && ct < lpno; i++,p++) - if((i < 4 || (p->size > 0 && !is_extended(p->p.sys_type))) - && ++ct == lpno) - return i; - return -1; +static int index_to_linux(int pno, struct disk_desc *z) +{ + int i, ct = 1; + struct part_desc *p = &(z->partitions[0]); + + for (i = 0; i < pno; i++, p++) + if (i < 4 || (p->size > 0 && !is_extended(p->p.sys_type))) + ct++; + return ct; +} + +static int linux_to_index(int lpno, struct disk_desc *z) +{ + int i, ct = 0; + struct part_desc *p = &(z->partitions[0]); + + for (i = 0; i < z->partno && ct < lpno; i++, p++) + if ((i < 4 || (p->size > 0 && !is_extended(p->p.sys_type))) + && ++ct == lpno) + return i; + return -1; } -static int -asc_to_index(char *pnam, struct disk_desc *z) { - int pnum, pno; +static int asc_to_index(char *pnam, struct disk_desc *z) +{ + int pnum, pno; - if (*pnam == '#') { - pno = atoi(pnam+1); - } else { - pnum = atoi(pnam); - pno = linux_to_index(pnum, z); - } - if (!(pno >= 0 && pno < z->partno)) - fatal("%s: no such partition\n"), pnam; - return pno; + if (*pnam == '#') { + pno = atoi(pnam + 1); + } else { + pnum = atoi(pnam); + pno = linux_to_index(pnum, z); + } + if (!(pno >= 0 && pno < z->partno)) + fatal("%s: no such partition\n"), pnam; + return pno; } /* @@ -910,523 +924,573 @@ static int one_only = 0; static int one_only_pno; static int increment = 0; -static void -set_format(char c) { - switch(c) { - default: - printf("unrecognized format - using sectors\n"); - case 'S': specified_format = F_SECTOR; break; - case 'B': specified_format = F_BLOCK; break; - case 'C': specified_format = F_CYLINDER; break; - case 'M': specified_format = F_MEGABYTE; break; - } +static void set_format(char c) +{ + switch (c) { + default: + printf("unrecognized format - using sectors\n"); + case 'S': + specified_format = F_SECTOR; + break; + case 'B': + specified_format = F_BLOCK; + break; + case 'C': + specified_format = F_CYLINDER; + break; + case 'M': + specified_format = F_MEGABYTE; + break; + } } -static unsigned long -unitsize(int format) { - default_format = (B.cylindersize ? F_CYLINDER : F_MEGABYTE); - if (!format && !(format = specified_format)) - format = default_format; - - switch(format) { - default: - case F_CYLINDER: - if(B.cylindersize) - return B.cylindersize; - case F_SECTOR: - return 1; - case F_BLOCK: - return 2; - case F_MEGABYTE: - return 2048; - } +static unsigned long unitsize(int format) +{ + default_format = (B.cylindersize ? F_CYLINDER : F_MEGABYTE); + if (!format && !(format = specified_format)) + format = default_format; + + switch (format) { + default: + case F_CYLINDER: + if (B.cylindersize) + return B.cylindersize; + case F_SECTOR: + return 1; + case F_BLOCK: + return 2; + case F_MEGABYTE: + return 2048; + } } -static unsigned long -get_disksize(int format) { - unsigned long cs = B.cylinders; - if (cs && leave_last) - cs--; - return (cs * B.cylindersize) / unitsize(format); +static unsigned long get_disksize(int format) +{ + unsigned long cs = B.cylinders; + + if (cs && leave_last) + cs--; + return (cs * B.cylindersize) / unitsize(format); } -static void -out_partition_header(char *dev, int format, struct geometry G) { - if (dump) { - printf("# partition table of %s\n", dev); - printf("unit: sectors\n\n"); - return; - } - - default_format = (G.cylindersize ? F_CYLINDER : F_MEGABYTE); - if (!format && !(format = specified_format)) - format = default_format; - - switch(format) { - default: - printf("unimplemented format - using %s\n", - G.cylindersize ? "cylinders" : "sectors"); - case F_CYLINDER: - if (G.cylindersize) { - printf("Units = cylinders of %lu bytes, blocks of 1024 bytes" - ", counting from %d\n\n", - G.cylindersize<<9, increment); - printf(" Device Boot Start End #cyls #blocks Id System\n"); - break; - } - /* fall through */ - case F_SECTOR: - printf("Units = sectors of 512 bytes, counting from %d\n\n", - increment); - printf(" Device Boot Start End #sectors Id System\n"); - break; - case F_BLOCK: - printf("Units = blocks of 1024 bytes, counting from %d\n\n", - increment); - printf(" Device Boot Start End #blocks Id System\n"); - break; - case F_MEGABYTE: - printf("Units = megabytes of 1048576 bytes, blocks of 1024 bytes" - ", counting from %d\n\n", increment); - printf(" Device Boot Start End MB #blocks Id System\n"); - break; - } +static void out_partition_header(char *dev, int format, struct geometry G) +{ + if (dump) { + printf("# partition table of %s\n", dev); + printf("unit: sectors\n\n"); + return; + } + + default_format = (G.cylindersize ? F_CYLINDER : F_MEGABYTE); + if (!format && !(format = specified_format)) + format = default_format; + + switch (format) { + default: + printf("unimplemented format - using %s\n", + G.cylindersize ? "cylinders" : "sectors"); + case F_CYLINDER: + if (G.cylindersize) { + printf("Units = cylinders of %lu bytes, blocks of 1024 bytes" + ", counting from %d\n\n", + G.cylindersize << 9, increment); + printf + (" Device Boot Start End #cyls #blocks Id System\n"); + break; + } + /* fall through */ + case F_SECTOR: + printf("Units = sectors of 512 bytes, counting from %d\n\n", + increment); + printf + (" Device Boot Start End #sectors Id System\n"); + break; + case F_BLOCK: + printf("Units = blocks of 1024 bytes, counting from %d\n\n", + increment); + printf + (" Device Boot Start End #blocks Id System\n"); + break; + case F_MEGABYTE: + printf("Units = megabytes of 1048576 bytes, blocks of 1024 bytes" + ", counting from %d\n\n", increment); + printf + (" Device Boot Start End MB #blocks Id System\n"); + break; + } } static void -out_rounddown(int width, unsigned long n, unsigned long unit, int inc) { - printf("%*lu", width, inc + n/unit); - if (unit != 1) - putchar((n % unit) ? '+' : ' '); - putchar(' '); +out_rounddown(int width, unsigned long n, unsigned long unit, int inc) +{ + printf("%*lu", width, inc + n / unit); + if (unit != 1) + putchar((n % unit) ? '+' : ' '); + putchar(' '); } static void -out_roundup(int width, unsigned long n, unsigned long unit, int inc) { - if (n == (unsigned long)(-1)) - printf("%*s", width, "-"); - else - printf("%*lu", width, inc + n/unit); - if (unit != 1) - putchar(((n+1) % unit) ? '-' : ' '); - putchar(' '); +out_roundup(int width, unsigned long n, unsigned long unit, int inc) +{ + if (n == (unsigned long) (-1)) + printf("%*s", width, "-"); + else + printf("%*lu", width, inc + n / unit); + if (unit != 1) + putchar(((n + 1) % unit) ? '-' : ' '); + putchar(' '); } static void -out_roundup_size(int width, unsigned long n, unsigned long unit) { - printf("%*lu", width, (n+unit-1)/unit); - if (unit != 1) - putchar((n % unit) ? '-' : ' '); - putchar(' '); +out_roundup_size(int width, unsigned long n, unsigned long unit) +{ + printf("%*lu", width, (n + unit - 1) / unit); + if (unit != 1) + putchar((n % unit) ? '-' : ' '); + putchar(' '); } -static int -get_fdisk_geometry(struct part_desc *p) { - chs b = p->p.end_chs; - longchs bb = chs_to_longchs(b); - F.heads = bb.h+1; - F.sectors = bb.s; - F.cylindersize = F.heads*F.sectors; - return (F.sectors != B.sectors || F.heads != B.heads); +static int get_fdisk_geometry(struct part_desc *p) +{ + chs b = p->p.end_chs; + longchs bb = chs_to_longchs(b); + + F.heads = bb.h + 1; + F.sectors = bb.s; + F.cylindersize = F.heads * F.sectors; + return (F.sectors != B.sectors || F.heads != B.heads); } static void out_partition(char *dev, int format, struct part_desc *p, - struct disk_desc *z, struct geometry G) { - unsigned long start, end, size; - int pno, lpno; - - if (!format && !(format = specified_format)) - format = default_format; - - pno = p - &(z->partitions[0]); /* our index */ - lpno = index_to_linux(pno, z); /* name of next one that has a name */ - if(pno == linux_to_index(lpno, z)) /* was that us? */ - printf("%8s%-2u", dev, lpno); /* yes */ - else if(show_extended) - printf(" - "); - else - return; - putchar(dump ? ':' : ' '); - - start = p->start; - end = p->start + p->size - 1; - size = p->size; - - if (dump) { - printf(" start=%9lu", start); - printf(", size=%8lu", size); - if (p->ptype == DOS_TYPE) { - printf(", Id=%2x", p->p.sys_type); - if (p->p.bootable == 0x80) - printf(", bootable"); + struct disk_desc *z, struct geometry G) +{ + unsigned long start, end, size; + int pno, lpno; + + if (!format && !(format = specified_format)) + format = default_format; + + pno = p - &(z->partitions[0]); /* our index */ + lpno = index_to_linux(pno, z); /* name of next one that has a name */ + if (pno == linux_to_index(lpno, z)) /* was that us? */ + printf("%8s%-2u", dev, lpno); /* yes */ + else if (show_extended) + printf(" - "); + else + return; + putchar(dump ? ':' : ' '); + + start = p->start; + end = p->start + p->size - 1; + size = p->size; + + if (dump) { + printf(" start=%9lu", start); + printf(", size=%8lu", size); + if (p->ptype == DOS_TYPE) { + printf(", Id=%2x", p->p.sys_type); + if (p->p.bootable == 0x80) + printf(", bootable"); + } + printf("\n"); + return; } - printf("\n"); - return; - } - - if(p->ptype != DOS_TYPE || p->p.bootable == 0) - printf(" "); - else if(p->p.bootable == 0x80) - printf(" * "); - else - printf(" ? "); /* garbage */ - - switch(format) { - case F_CYLINDER: - if (G.cylindersize) { - out_rounddown(6, start, G.cylindersize, increment); - out_roundup(6, end, G.cylindersize, increment); - out_roundup_size(6, size, G.cylindersize); - out_rounddown(8, size, 2, 0); - break; - } - /* fall through */ - default: - case F_SECTOR: - out_rounddown(9, start, 1, increment); - out_roundup(9, end, 1, increment); - out_rounddown(9, size, 1, 0); - break; - case F_BLOCK: + + if (p->ptype != DOS_TYPE || p->p.bootable == 0) + printf(" "); + else if (p->p.bootable == 0x80) + printf(" * "); + else + printf(" ? "); /* garbage */ + + switch (format) { + case F_CYLINDER: + if (G.cylindersize) { + out_rounddown(6, start, G.cylindersize, increment); + out_roundup(6, end, G.cylindersize, increment); + out_roundup_size(6, size, G.cylindersize); + out_rounddown(8, size, 2, 0); + break; + } + /* fall through */ + default: + case F_SECTOR: + out_rounddown(9, start, 1, increment); + out_roundup(9, end, 1, increment); + out_rounddown(9, size, 1, 0); + break; + case F_BLOCK: #if 0 - printf("%8lu,%3lu ", - p->sector/2, ((p->sector & 1) ? 512 : 0) + p->offset); + printf("%8lu,%3lu ", + p->sector / 2, ((p->sector & 1) ? 512 : 0) + p->offset); #endif - out_rounddown(8, start, 2, increment); - out_roundup(8, end, 2, increment); - out_rounddown(8, size, 2, 0); - break; - case F_MEGABYTE: - out_rounddown(5, start, 2048, increment); - out_roundup(5, end, 2048, increment); - out_roundup_size(5, size, 2048); - out_rounddown(8, size, 2, 0); - break; - } - if (p->ptype == DOS_TYPE) { - printf(" %2x %s\n", - p->p.sys_type, sysname(p->p.sys_type)); - } else { - printf("\n"); - } - - /* Is chs as we expect? */ - if (!quiet && p->ptype == DOS_TYPE) { - chs a, b; - longchs aa, bb; - a = (size ? ulong_to_chs(start,G) : zero_chs); - b = p->p.begin_chs; - aa = chs_to_longchs(a); - bb = chs_to_longchs(b); - if(a.s && !is_equal_chs(a, b)) - printf("\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", - aa.c, aa.h, aa.s, bb.c, bb.h, bb.s); - a = (size ? ulong_to_chs(end,G) : zero_chs); - b = p->p.end_chs; - aa = chs_to_longchs(a); - bb = chs_to_longchs(b); - if(a.s && !is_equal_chs(a, b)) - printf("\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", - aa.c, aa.h, aa.s, bb.c, bb.h, bb.s); - if(G.cylinders && G.cylinders < 1024 && bb.c > G.cylinders) - printf("partition ends on cylinder %ld, beyond the end of the disk\n", - bb.c); - } -} - -static void -out_partitions(char *dev, struct disk_desc *z) { - struct part_desc *p; - int pno, format = 0; - - if (z->partno == 0) - printf("No partitions found\n"); - else { - for (pno=0; pno < z->partno; pno++) { - p = &(z->partitions[pno]); - if (p->size != 0 && p->p.sys_type != 0) { - if (get_fdisk_geometry(p)) - printf( - "Warning: The first partition looks like it was made\n" - " for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n" - "For this listing I'll assume that geometry.\n", - F.heads, F.sectors, B.cylinders, B.heads, B.sectors); + out_rounddown(8, start, 2, increment); + out_roundup(8, end, 2, increment); + out_rounddown(8, size, 2, 0); + break; + case F_MEGABYTE: + out_rounddown(5, start, 2048, increment); + out_roundup(5, end, 2048, increment); + out_roundup_size(5, size, 2048); + out_rounddown(8, size, 2, 0); break; - } } - out_partition_header(dev, format, F); - for(pno=0; pno < z->partno; pno++) { - out_partition(dev, format, &(z->partitions[pno]), z, F); - if(show_extended && pno%4==3) - printf("\n"); + if (p->ptype == DOS_TYPE) { + printf(" %2x %s\n", p->p.sys_type, sysname(p->p.sys_type)); + } else { + printf("\n"); + } + + /* Is chs as we expect? */ + if (!quiet && p->ptype == DOS_TYPE) { + chs a, b; + longchs aa, bb; + + a = (size ? ulong_to_chs(start, G) : zero_chs); + b = p->p.begin_chs; + aa = chs_to_longchs(a); + bb = chs_to_longchs(b); + if (a.s && !is_equal_chs(a, b)) + printf + ("\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", + aa.c, aa.h, aa.s, bb.c, bb.h, bb.s); + a = (size ? ulong_to_chs(end, G) : zero_chs); + b = p->p.end_chs; + aa = chs_to_longchs(a); + bb = chs_to_longchs(b); + if (a.s && !is_equal_chs(a, b)) + printf + ("\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", + aa.c, aa.h, aa.s, bb.c, bb.h, bb.s); + if (G.cylinders && G.cylinders < 1024 && bb.c > G.cylinders) + printf + ("partition ends on cylinder %ld, beyond the end of the disk\n", + bb.c); } - } } -static int -disj(struct part_desc *p, struct part_desc *q) { - return - ((p->start + p->size <= q->start) - || (is_extended(p->p.sys_type) - && q->start + q->size <= p->start + p->size)); +static void out_partitions(char *dev, struct disk_desc *z) +{ + struct part_desc *p; + int pno, format = 0; + + if (z->partno == 0) + printf("No partitions found\n"); + else { + for (pno = 0; pno < z->partno; pno++) { + p = &(z->partitions[pno]); + if (p->size != 0 && p->p.sys_type != 0) { + if (get_fdisk_geometry(p)) + printf + ("Warning: The first partition looks like it was made\n" + " for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n" + "For this listing I'll assume that geometry.\n", + F.heads, F.sectors, B.cylinders, B.heads, + B.sectors); + break; + } + } + out_partition_header(dev, format, F); + for (pno = 0; pno < z->partno; pno++) { + out_partition(dev, format, &(z->partitions[pno]), z, F); + if (show_extended && pno % 4 == 3) + printf("\n"); + } + } } -static char * -pnumber(struct part_desc *p, struct disk_desc *z) { - static char buf[20]; - int this, next; - struct part_desc *p0 = &(z->partitions[0]); +static int disj(struct part_desc *p, struct part_desc *q) +{ + return ((p->start + p->size <= q->start) + || (is_extended(p->p.sys_type) + && q->start + q->size <= p->start + p->size)); +} + +static char *pnumber(struct part_desc *p, struct disk_desc *z) +{ + static char buf[20]; + int this, next; + struct part_desc *p0 = &(z->partitions[0]); - this = index_to_linux(p-p0, z); - next = index_to_linux(p-p0+1, z); + this = index_to_linux(p - p0, z); + next = index_to_linux(p - p0 + 1, z); - if (next > this) - sprintf(buf, "%d", this); - else - sprintf(buf, "[%d]", this); - return buf; + if (next > this) + sprintf(buf, "%d", this); + else + sprintf(buf, "[%d]", this); + return buf; } -static int -partitions_ok(struct disk_desc *z) { - struct part_desc *partitions = &(z->partitions[0]), *p, *q; - int partno = z->partno; +static int partitions_ok(struct disk_desc *z) +{ + struct part_desc *partitions = &(z->partitions[0]), *p, *q; + int partno = z->partno; #define PNO(p) pnumber(p, z) - /* Have at least 4 partitions been defined? */ - if (partno < 4) { - if (!partno) - fatal("no partition table present.\n"); - else - fatal("strange, only %d partitions defined.\n"), partno; - return 0; - } - - /* Are the partitions of size 0 marked empty? - And do they have start = 0? And bootable = 0? */ - for (p = partitions; p - partitions < partno; p++) - if (p->size == 0) { - if(p->p.sys_type != EMPTY_PARTITION) - warn("Warning: partition %s has size 0 but is not marked Empty\n", - PNO(p)); - else if(p->p.bootable != 0) - warn("Warning: partition %s has size 0 and is bootable\n", - PNO(p)); - else if(p->p.start_sect != 0) - warn("Warning: partition %s has size 0 and nonzero start\n", - PNO(p)); - /* all this is probably harmless, no error return */ - } - - /* Are the logical partitions contained in their extended partitions? */ - for (p = partitions+4; p < partitions+partno; p++) - if (p->ptype == DOS_TYPE) - if (p->size && !is_extended(p->p.sys_type)) { - q = p->ep; - if (p->start < q->start || p->start + p->size > q->start + q->size) { - warn("Warning: partition %s "), PNO(p); - warn("is not contained in partition %s\n"), PNO(q); - return 0; - } - } - - /* Are the data partitions mutually disjoint? */ - for (p = partitions; p < partitions+partno; p++) - if (p->size && !is_extended(p->p.sys_type)) - for (q = p+1; q < partitions+partno; q++) - if (q->size && !is_extended(q->p.sys_type)) - if(!((p->start > q-> start) ? disj(q,p) : disj(p,q))) { - warn("Warning: partitions %s "), PNO(p); - warn("and %s overlap\n"), PNO(q); - return 0; - } - - /* Are the data partitions and the extended partition - table sectors disjoint? */ - for (p = partitions; p < partitions+partno; p++) - if (p->size && !is_extended(p->p.sys_type)) - for (q = partitions; q < partitions+partno; q++) - if (is_extended(q->p.sys_type)) - if (p->start <= q->start && p->start + p->size > q->start) { - warn("Warning: partition %s contains part of ", PNO(p)); - warn("the partition table (sector %lu),\n", q->start); - warn("and will destroy it when filled\n"); + /* Have at least 4 partitions been defined? */ + if (partno < 4) { + if (!partno) + fatal("no partition table present.\n"); + else + fatal("strange, only %d partitions defined.\n"), partno; return 0; - } - - /* Do they start past zero and end before end-of-disk? */ - { unsigned long ds = get_disksize(F_SECTOR); - for (p = partitions; p < partitions+partno; p++) - if (p->size) { - if(p->start == 0) { - warn("Warning: partition %s starts at sector 0\n", PNO(p)); - return 0; - } - if (p->size && p->start + p->size > ds) { - warn("Warning: partition %s extends past end of disk\n", PNO(p)); - return 0; - } - } - } - - /* At most one chain of DOS extended partitions ? */ - /* It seems that the OS/2 fdisk has the additional requirement - that the extended partition must be the fourth one */ - { int ect = 0; - for (p = partitions; p < partitions+4; p++) - if (p->p.sys_type == EXTENDED_PARTITION) - ect++; - if (ect > 1 && !Linux) { - warn("Among the primary partitions, at most one can be extended\n"); - warn(" (although this is not a problem under Linux)\n"); - return 0; - } - } - - /* - * Do all partitions start at a cylinder boundary ? - * (this is not required for Linux) - * The first partition starts after MBR. - * Logical partitions start slightly after the containing extended partn. - */ - if (B.cylindersize) { - for(p = partitions; p < partitions+partno; p++) - if (p->size) { - if(p->start % B.cylindersize != 0 - && (!p->ep || p->start / B.cylindersize != p->ep->start / B.cylindersize) - && (p->p.start_sect >= B.cylindersize)) { - warn("Warning: partition %s does not start " - "at a cylinder boundary\n", PNO(p)); - if (!Linux) - return 0; - } - if((p->start + p->size) % B.cylindersize) { - warn("Warning: partition %s does not end " - "at a cylinder boundary\n", PNO(p)); - if (!Linux) - return 0; - } - } - } - - /* Usually, one can boot only from primary partitions. */ - /* In fact, from a unique one only. */ - /* do not warn about bootable extended partitions - - often LILO is there */ - { int pno = -1; - for(p = partitions; p < partitions+partno; p++) - if (p->p.bootable) { - if (pno == -1) - pno = p - partitions; - else if (p - partitions < 4) { - warn("Warning: more than one primary partition is marked " - "bootable (active)\n" - "This does not matter for LILO, but the DOS MBR will " - "not boot this disk.\n"); - break; - } - if (p - partitions >= 4) { - warn("Warning: usually one can boot from primary partitions " - "only\nLILO disregards the `bootable' flag.\n"); - break; - } - } - if (pno == -1 || pno >= 4) - warn("Warning: no primary partition is marked bootable (active)\n" - "This does not matter for LILO, but the DOS MBR will " - "not boot this disk.\n"); - } - - /* Is chs as we expect? */ - for(p = partitions; p < partitions+partno; p++) - if(p->ptype == DOS_TYPE) { - chs a, b; - longchs aa, bb; - a = p->size ? ulong_to_chs(p->start,B) : zero_chs; - b = p->p.begin_chs; - aa = chs_to_longchs(a); - bb = chs_to_longchs(b); - if (!chs_ok(b, PNO(p), "start")) - return 0; - if(a.s && !is_equal_chs(a, b)) - warn("partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", - PNO(p), aa.c, aa.h, aa.s, bb.c, bb.h, bb.s); - a = p->size ? ulong_to_chs(p->start + p->size - 1, B) : zero_chs; - b = p->p.end_chs; - aa = chs_to_longchs(a); - bb = chs_to_longchs(b); - if (!chs_ok(b, PNO(p), "end")) - return 0; - if(a.s && !is_equal_chs(a, b)) - warn("partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", - PNO(p), aa.c, aa.h, aa.s, bb.c, bb.h, bb.s); - if(B.cylinders && B.cylinders < 1024 && bb.c > B.cylinders) - warn("partition %s ends on cylinder %ld, beyond the end of the disk\n", - PNO(p), bb.c); - } - - return 1; + } + + /* Are the partitions of size 0 marked empty? + And do they have start = 0? And bootable = 0? */ + for (p = partitions; p - partitions < partno; p++) + if (p->size == 0) { + if (p->p.sys_type != EMPTY_PARTITION) + warn + ("Warning: partition %s has size 0 but is not marked Empty\n", + PNO(p)); + else if (p->p.bootable != 0) + warn("Warning: partition %s has size 0 and is bootable\n", + PNO(p)); + else if (p->p.start_sect != 0) + warn + ("Warning: partition %s has size 0 and nonzero start\n", + PNO(p)); + /* all this is probably harmless, no error return */ + } + + /* Are the logical partitions contained in their extended partitions? */ + for (p = partitions + 4; p < partitions + partno; p++) + if (p->ptype == DOS_TYPE) + if (p->size && !is_extended(p->p.sys_type)) { + q = p->ep; + if (p->start < q->start + || p->start + p->size > q->start + q->size) { + warn("Warning: partition %s "), PNO(p); + warn("is not contained in partition %s\n"), PNO(q); + return 0; + } + } + + /* Are the data partitions mutually disjoint? */ + for (p = partitions; p < partitions + partno; p++) + if (p->size && !is_extended(p->p.sys_type)) + for (q = p + 1; q < partitions + partno; q++) + if (q->size && !is_extended(q->p.sys_type)) + if (!((p->start > q->start) ? disj(q, p) : disj(p, q))) { + warn("Warning: partitions %s "), PNO(p); + warn("and %s overlap\n"), PNO(q); + return 0; + } + + /* Are the data partitions and the extended partition + table sectors disjoint? */ + for (p = partitions; p < partitions + partno; p++) + if (p->size && !is_extended(p->p.sys_type)) + for (q = partitions; q < partitions + partno; q++) + if (is_extended(q->p.sys_type)) + if (p->start <= q->start + && p->start + p->size > q->start) { + warn("Warning: partition %s contains part of ", + PNO(p)); + warn("the partition table (sector %lu),\n", + q->start); + warn("and will destroy it when filled\n"); + return 0; + } + + /* Do they start past zero and end before end-of-disk? */ + { + unsigned long ds = get_disksize(F_SECTOR); + + for (p = partitions; p < partitions + partno; p++) + if (p->size) { + if (p->start == 0) { + warn("Warning: partition %s starts at sector 0\n", + PNO(p)); + return 0; + } + if (p->size && p->start + p->size > ds) { + warn + ("Warning: partition %s extends past end of disk\n", + PNO(p)); + return 0; + } + } + } + + /* At most one chain of DOS extended partitions ? */ + /* It seems that the OS/2 fdisk has the additional requirement + that the extended partition must be the fourth one */ + { + int ect = 0; + + for (p = partitions; p < partitions + 4; p++) + if (p->p.sys_type == EXTENDED_PARTITION) + ect++; + if (ect > 1 && !Linux) { + warn + ("Among the primary partitions, at most one can be extended\n"); + warn(" (although this is not a problem under Linux)\n"); + return 0; + } + } + + /* + * Do all partitions start at a cylinder boundary ? + * (this is not required for Linux) + * The first partition starts after MBR. + * Logical partitions start slightly after the containing extended partn. + */ + if (B.cylindersize) { + for (p = partitions; p < partitions + partno; p++) + if (p->size) { + if (p->start % B.cylindersize != 0 + && (!p->ep + || p->start / B.cylindersize != + p->ep->start / B.cylindersize) + && (p->p.start_sect >= B.cylindersize)) { + warn("Warning: partition %s does not start " + "at a cylinder boundary\n", PNO(p)); + if (!Linux) + return 0; + } + if ((p->start + p->size) % B.cylindersize) { + warn("Warning: partition %s does not end " + "at a cylinder boundary\n", PNO(p)); + if (!Linux) + return 0; + } + } + } + + /* Usually, one can boot only from primary partitions. */ + /* In fact, from a unique one only. */ + /* do not warn about bootable extended partitions - + often LILO is there */ + { + int pno = -1; + + for (p = partitions; p < partitions + partno; p++) + if (p->p.bootable) { + if (pno == -1) + pno = p - partitions; + else if (p - partitions < 4) { + warn + ("Warning: more than one primary partition is marked " + "bootable (active)\n" + "This does not matter for LILO, but the DOS MBR will " + "not boot this disk.\n"); + break; + } + if (p - partitions >= 4) { + warn + ("Warning: usually one can boot from primary partitions " + "only\nLILO disregards the `bootable' flag.\n"); + break; + } + } + if (pno == -1 || pno >= 4) + warn + ("Warning: no primary partition is marked bootable (active)\n" + "This does not matter for LILO, but the DOS MBR will " + "not boot this disk.\n"); + } + + /* Is chs as we expect? */ + for (p = partitions; p < partitions + partno; p++) + if (p->ptype == DOS_TYPE) { + chs a, b; + longchs aa, bb; + + a = p->size ? ulong_to_chs(p->start, B) : zero_chs; + b = p->p.begin_chs; + aa = chs_to_longchs(a); + bb = chs_to_longchs(b); + if (!chs_ok(b, PNO(p), "start")) + return 0; + if (a.s && !is_equal_chs(a, b)) + warn + ("partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", + PNO(p), aa.c, aa.h, aa.s, bb.c, bb.h, bb.s); + a = + p->size ? ulong_to_chs(p->start + p->size - 1, + B) : zero_chs; + b = p->p.end_chs; + aa = chs_to_longchs(a); + bb = chs_to_longchs(b); + if (!chs_ok(b, PNO(p), "end")) + return 0; + if (a.s && !is_equal_chs(a, b)) + warn + ("partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", + PNO(p), aa.c, aa.h, aa.s, bb.c, bb.h, bb.s); + if (B.cylinders && B.cylinders < 1024 && bb.c > B.cylinders) + warn + ("partition %s ends on cylinder %ld, beyond the end of the disk\n", + PNO(p), bb.c); + } + + return 1; #undef PNO } static void -extended_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) { - char *cp; - struct sector *s; - unsigned long start, here, next; - int i, moretodo = 1; - struct partition p; - struct part_desc *partitions = &(z->partitions[0]); - int pno = z->partno; +extended_partition(char *dev, int fd, struct part_desc *ep, + struct disk_desc *z) +{ + char *cp; + struct sector *s; + unsigned long start, here, next; + int i, moretodo = 1; + struct partition p; + struct part_desc *partitions = &(z->partitions[0]); + int pno = z->partno; - here = start = ep->start; + here = start = ep->start; - while (moretodo) { - moretodo = 0; + while (moretodo) { + moretodo = 0; - if (!(s = get_sector(dev, fd, here))) - break; + if (!(s = get_sector(dev, fd, here))) + break; - if (!msdos_signature(s)) - break; + if (!msdos_signature(s)) + break; - cp = s->data + 0x1be; + cp = s->data + 0x1be; - if (pno+4 >= SIZE(z->partitions)) { - printf("too many partitions - ignoring those past nr (%d)\n", - pno-1); - break; - } + if (pno + 4 >= SIZE(z->partitions)) { + printf("too many partitions - ignoring those past nr (%d)\n", + pno - 1); + break; + } - next = 0; + next = 0; + + for (i = 0; i < 4; i++, cp += sizeof(struct partition)) { + partitions[pno].sector = here; + partitions[pno].offset = cp - s->data; + partitions[pno].ep = ep; + copy_to_part(cp, &p); + if (is_extended(p.sys_type)) { + partitions[pno].start = start + p.start_sect; + if (next) + printf("tree of partitions?\n"); + else + next = partitions[pno].start; /* follow `upper' branch */ + moretodo = 1; + } else { + partitions[pno].start = here + p.start_sect; + } + partitions[pno].size = p.nr_sects; + partitions[pno].ptype = DOS_TYPE; + partitions[pno].p = p; + pno++; + } + here = next; + } - for (i=0; i<4; i++,cp += sizeof(struct partition)) { - partitions[pno].sector = here; - partitions[pno].offset = cp - s->data; - partitions[pno].ep = ep; - copy_to_part(cp,&p); - if (is_extended(p.sys_type)) { - partitions[pno].start = start + p.start_sect; - if (next) - printf("tree of partitions?\n"); - else - next = partitions[pno].start; /* follow `upper' branch */ - moretodo = 1; - } else { - partitions[pno].start = here + p.start_sect; - } - partitions[pno].size = p.nr_sects; - partitions[pno].ptype = DOS_TYPE; - partitions[pno].p = p; - pno++; - } - here = next; - } - - z->partno = pno; + z->partno = pno; } #define BSD_DISKMAGIC (0x82564557UL) @@ -1436,27 +1500,28 @@ typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; struct bsd_disklabel { - u32 d_magic; - char d_junk1[4]; - char d_typename[16]; - char d_packname[16]; - char d_junk2[92]; - u32 d_magic2; - char d_junk3[2]; - u16 d_npartitions; /* number of partitions in following */ - char d_junk4[8]; - struct bsd_partition { /* the partition table */ - u32 p_size; /* number of sectors in partition */ - u32 p_offset; /* starting sector */ - u32 p_fsize; /* filesystem basic fragment size */ - u8 p_fstype; /* filesystem type, see below */ - u8 p_frag; /* filesystem fragments per block */ - u16 p_cpg; /* filesystem cylinders per group */ - } d_partitions[BSD_MAXPARTITIONS]; /* actually may be more */ + u32 d_magic; + char d_junk1[4]; + char d_typename[16]; + char d_packname[16]; + char d_junk2[92]; + u32 d_magic2; + char d_junk3[2]; + u16 d_npartitions; /* number of partitions in following */ + char d_junk4[8]; + struct bsd_partition { /* the partition table */ + u32 p_size; /* number of sectors in partition */ + u32 p_offset; /* starting sector */ + u32 p_fsize; /* filesystem basic fragment size */ + u8 p_fstype; /* filesystem type, see below */ + u8 p_frag; /* filesystem fragments per block */ + u16 p_cpg; /* filesystem cylinders per group */ + } d_partitions[BSD_MAXPARTITIONS]; /* actually may be more */ }; static void -bsd_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) { +bsd_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) +{ struct bsd_disklabel *l; struct bsd_partition *bp, *bp0; unsigned long start = ep->start; @@ -1464,7 +1529,7 @@ bsd_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) { struct part_desc *partitions = &(z->partitions[0]); int pno = z->partno; - if (!(s = get_sector(dev,fd,start+1))) + if (!(s = get_sector(dev, fd, start + 1))) return; l = (struct bsd_disklabel *) (s->data); if (l->d_magic != BSD_DISKMAGIC) @@ -1472,16 +1537,16 @@ bsd_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) { bp = bp0 = &l->d_partitions[0]; while (bp - bp0 <= BSD_MAXPARTITIONS) { - if (pno+1 >= SIZE(z->partitions)) { + if (pno + 1 >= SIZE(z->partitions)) { printf("too many partitions - ignoring those " - "past nr (%d)\n", pno-1); + "past nr (%d)\n", pno - 1); break; } if (bp->p_fstype != BSD_FS_UNUSED) { partitions[pno].start = bp->p_offset; partitions[pno].size = bp->p_size; - partitions[pno].sector = start+1; - partitions[pno].offset = (char *)bp - (char *)bp0; + partitions[pno].sector = start + 1; + partitions[pno].offset = (char *) bp - (char *) bp0; partitions[pno].ep = 0; partitions[pno].ptype = BSD_TYPE; pno++; @@ -1492,129 +1557,138 @@ bsd_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) { } static int -msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) { - int i; - char *cp; - struct partition pt; - struct sector *s; - struct part_desc *partitions = &(z->partitions[0]); - int pno = z->partno; - - if (!(s = get_sector(dev, fd, start))) - return 0; +msdos_partition(char *dev, int fd, unsigned long start, + struct disk_desc *z) +{ + int i; + char *cp; + struct partition pt; + struct sector *s; + struct part_desc *partitions = &(z->partitions[0]); + int pno = z->partno; - if (!msdos_signature(s)) - return 0; + if (!(s = get_sector(dev, fd, start))) + return 0; - cp = s->data + 0x1be; - copy_to_part(cp,&pt); + if (!msdos_signature(s)) + return 0; - /* If I am not mistaken, recent kernels will hide this from us, + cp = s->data + 0x1be; + copy_to_part(cp, &pt); + + /* If I am not mistaken, recent kernels will hide this from us, so we will never actually see traces of a Disk Manager */ - if (pt.sys_type == DM6_PARTITION - || pt.sys_type == EZD_PARTITION - || pt.sys_type == DM6_AUX1PARTITION - || pt.sys_type == DM6_AUX3PARTITION) { - printf("detected Disk Manager - unable to handle that\n"); - return 0; - } - { unsigned int sig = *(unsigned short *)(s->data + 2); - if (sig <= 0x1ae - && *(unsigned short *)(s->data + sig) == 0x55aa - && (1 & *(unsigned char *)(s->data + sig + 2))) { - printf("DM6 signature found - giving up\n"); - return 0; - } - } - - for (pno=0; pno<4; pno++,cp += sizeof(struct partition)) { - partitions[pno].sector = start; - partitions[pno].offset = cp - s->data; - copy_to_part(cp,&pt); - partitions[pno].start = start + pt.start_sect; - partitions[pno].size = pt.nr_sects; - partitions[pno].ep = 0; - partitions[pno].p = pt; - } - - z->partno = pno; - - for (i=0; i<4; i++) { - if (is_extended(partitions[i].p.sys_type)) { - if (!partitions[i].size) { - printf("strange..., an extended partition of size 0?\n"); - continue; - } - extended_partition(dev, fd, &partitions[i], z); - } - if (is_bsd(partitions[i].p.sys_type)) { - if (!partitions[i].size) { - printf("strange..., a BSD partition of size 0?\n"); - continue; - } - bsd_partition(dev, fd, &partitions[i], z); - } - } - return 1; + if (pt.sys_type == DM6_PARTITION + || pt.sys_type == EZD_PARTITION + || pt.sys_type == DM6_AUX1PARTITION + || pt.sys_type == DM6_AUX3PARTITION) { + printf("detected Disk Manager - unable to handle that\n"); + return 0; + } + { + unsigned int sig = *(unsigned short *) (s->data + 2); + + if (sig <= 0x1ae + && *(unsigned short *) (s->data + sig) == 0x55aa + && (1 & *(unsigned char *) (s->data + sig + 2))) { + printf("DM6 signature found - giving up\n"); + return 0; + } + } + + for (pno = 0; pno < 4; pno++, cp += sizeof(struct partition)) { + partitions[pno].sector = start; + partitions[pno].offset = cp - s->data; + copy_to_part(cp, &pt); + partitions[pno].start = start + pt.start_sect; + partitions[pno].size = pt.nr_sects; + partitions[pno].ep = 0; + partitions[pno].p = pt; + } + + z->partno = pno; + + for (i = 0; i < 4; i++) { + if (is_extended(partitions[i].p.sys_type)) { + if (!partitions[i].size) { + printf("strange..., an extended partition of size 0?\n"); + continue; + } + extended_partition(dev, fd, &partitions[i], z); + } + if (is_bsd(partitions[i].p.sys_type)) { + if (!partitions[i].size) { + printf("strange..., a BSD partition of size 0?\n"); + continue; + } + bsd_partition(dev, fd, &partitions[i], z); + } + } + return 1; } static int -osf_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) { +osf_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) +{ return 0; } static int -sun_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) { +sun_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) +{ return 0; } static int -amiga_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) { +amiga_partition(char *dev, int fd, unsigned long start, + struct disk_desc *z) +{ return 0; } -static void -get_partitions(char *dev, int fd, struct disk_desc *z) { - z->partno = 0; +static void get_partitions(char *dev, int fd, struct disk_desc *z) +{ + z->partno = 0; - if (!msdos_partition(dev, fd, 0, z) - && !osf_partition(dev, fd, 0, z) - && !sun_partition(dev, fd, 0, z) - && !amiga_partition(dev, fd, 0, z)) { - printf(" %s: unrecognized partition\n", dev); - return; - } + if (!msdos_partition(dev, fd, 0, z) + && !osf_partition(dev, fd, 0, z) + && !sun_partition(dev, fd, 0, z) + && !amiga_partition(dev, fd, 0, z)) { + printf(" %s: unrecognized partition\n", dev); + return; + } } -static int -write_partitions(char *dev, int fd, struct disk_desc *z) { - struct sector *s; - struct part_desc *partitions = &(z->partitions[0]), *p; - int pno = z->partno; - - if (no_write) { - printf("-n flag was given: Nothing changed\n"); - exit(0); - } - - for (p = partitions; p < partitions+pno; p++) { - s = get_sector(dev, fd, p->sector); - if (!s) return 0; - s->to_be_written = 1; - copy_from_part(&(p->p), s->data + p->offset); - *(unsigned short *)(&(s->data[0x1fe])) = 0xaa55; - } - if (save_sector_file) { - if (!save_sectors(dev, fd)) { - fatal("Failed saving the old sectors - aborting\n"); - return 0; - } - } - if (!write_sectors(dev, fd)) { - error("Failed writing the partition on %s\n"), dev; - return 0; - } - return 1; +static int write_partitions(char *dev, int fd, struct disk_desc *z) +{ + struct sector *s; + struct part_desc *partitions = &(z->partitions[0]), *p; + int pno = z->partno; + + if (no_write) { + printf("-n flag was given: Nothing changed\n"); + exit(0); + } + + for (p = partitions; p < partitions + pno; p++) { + s = get_sector(dev, fd, p->sector); + if (!s) + return 0; + s->to_be_written = 1; + copy_from_part(&(p->p), s->data + p->offset); + *(unsigned short *) (&(s->data[0x1fe])) = 0xaa55; + } + if (save_sector_file) { + if (!save_sectors(dev, fd)) { + fatal("Failed saving the old sectors - aborting\n"); + return 0; + } + } + if (!write_sectors(dev, fd)) { + error("Failed writing the partition on %s\n"), dev; + return 0; + } + return 1; } /* @@ -1644,20 +1718,21 @@ write_partitions(char *dev, int fd, struct disk_desc *z) { static int eof, eob; struct dumpfld { - int fldno; - char *fldname; - int is_bool; + int fldno; + char *fldname; + int is_bool; } dumpflds[] = { - { 0, "start", 0 }, - { 1, "size", 0 }, - { 2, "Id", 0 }, - { 3, "bootable", 1 }, - { 4, "bh", 0 }, - { 5, "bs", 0 }, - { 6, "bc", 0 }, - { 7, "eh", 0 }, - { 8, "es", 0 }, - { 9, "ec", 0 } + { + 0, "start", 0}, { + 1, "size", 0}, { + 2, "Id", 0}, { + 3, "bootable", 1}, { + 4, "bh", 0}, { + 5, "bs", 0}, { + 6, "bc", 0}, { + 7, "eh", 0}, { + 8, "es", 0}, { + 9, "ec", 0} }; /* @@ -1670,115 +1745,117 @@ struct dumpfld { #define RD_CMD (-2) static int -read_stdin(unsigned char **fields, unsigned char *line, int fieldssize, int linesize) { - unsigned char *lp, *ip; - int c, fno; - - /* boolean true and empty string at start */ - line[0] = '*'; - line[1] = 0; - for (fno=0; fno < fieldssize; fno++) - fields[fno] = line + 1; - fno = 0; - - /* read a line from stdin */ - lp = fgets(line+2, linesize, stdin); - if (lp == NULL) { - eof = 1; - return RD_EOF; - } - if (!(lp = index(lp, '\n'))) - fatal("long or incomplete input line - quitting\n"); - *lp = 0; - - /* remove comments, if any */ - if ((lp = index(line+2, '#')) != 0) - *lp = 0; - - /* recognize a few commands - to be expanded */ - if (!strcmp(line+2, "unit: sectors")) { - specified_format = F_SECTOR; - return RD_CMD; - } - - /* dump style? - then bad input is fatal */ - if ((ip = index(line+2, ':')) != 0) { - struct dumpfld *d; - - nxtfld: - ip++; - while(isspace(*ip)) - ip++; - if (*ip == 0) - return fno; - for(d = dumpflds; d-dumpflds < SIZE(dumpflds); d++) { - if(!strncmp(ip, d->fldname, strlen(d->fldname))) { - ip += strlen(d->fldname); - while(isspace(*ip)) - ip++; - if (d->is_bool) - fields[d->fldno] = line; - else if (*ip == '=') { - while(isspace(*++ip)) ; - fields[d->fldno] = ip; - while(isalnum(*ip)) /* 0x07FF */ - ip++; - } else - fatal("input error: `=' expected after %s field\n", - d->fldname); - if (fno <= d->fldno) - fno = d->fldno + 1; - if(*ip == 0) - return fno; - if(*ip != ',' && *ip != ';') - fatal("input error: unexpected character %c after %s field\n", - *ip, d->fldname); - *ip = 0; - goto nxtfld; +read_stdin(unsigned char **fields, unsigned char *line, int fieldssize, + int linesize) +{ + unsigned char *lp, *ip; + int c, fno; + + /* boolean true and empty string at start */ + line[0] = '*'; + line[1] = 0; + for (fno = 0; fno < fieldssize; fno++) + fields[fno] = line + 1; + fno = 0; + + /* read a line from stdin */ + lp = fgets(line + 2, linesize, stdin); + if (lp == NULL) { + eof = 1; + return RD_EOF; + } + if (!(lp = index(lp, '\n'))) + fatal("long or incomplete input line - quitting\n"); + *lp = 0; + + /* remove comments, if any */ + if ((lp = index(line + 2, '#')) != 0) + *lp = 0; + + /* recognize a few commands - to be expanded */ + if (!strcmp(line + 2, "unit: sectors")) { + specified_format = F_SECTOR; + return RD_CMD; + } + + /* dump style? - then bad input is fatal */ + if ((ip = index(line + 2, ':')) != 0) { + struct dumpfld *d; + + nxtfld: + ip++; + while (isspace(*ip)) + ip++; + if (*ip == 0) + return fno; + for (d = dumpflds; d - dumpflds < SIZE(dumpflds); d++) { + if (!strncmp(ip, d->fldname, strlen(d->fldname))) { + ip += strlen(d->fldname); + while (isspace(*ip)) + ip++; + if (d->is_bool) + fields[d->fldno] = line; + else if (*ip == '=') { + while (isspace(*++ip)); + fields[d->fldno] = ip; + while (isalnum(*ip)) /* 0x07FF */ + ip++; + } else + fatal("input error: `=' expected after %s field\n", + d->fldname); + if (fno <= d->fldno) + fno = d->fldno + 1; + if (*ip == 0) + return fno; + if (*ip != ',' && *ip != ';') + fatal + ("input error: unexpected character %c after %s field\n", + *ip, d->fldname); + *ip = 0; + goto nxtfld; + } } - } - fatal("unrecognized input: %s\n"), ip; - } - - /* split line into fields */ - lp = ip = line+2; - fields[fno++] = lp; - while((c = *ip++) != 0) { - if (!lp[-1] && (c == '\t' || c == ' ')) - ; - else if (c == '\t' || c == ' ' || c == ',' || c == ';') { - *lp++ = 0; - if (fno < fieldssize) - fields[fno++] = lp; - continue; - } else - *lp++ = c; - } + fatal("unrecognized input: %s\n"), ip; + } + + /* split line into fields */ + lp = ip = line + 2; + fields[fno++] = lp; + while ((c = *ip++) != 0) { + if (!lp[-1] && (c == '\t' || c == ' ')); + else if (c == '\t' || c == ' ' || c == ',' || c == ';') { + *lp++ = 0; + if (fno < fieldssize) + fields[fno++] = lp; + continue; + } else + *lp++ = c; + } - if (lp == fields[fno-1]) - fno--; - return fno; + if (lp == fields[fno - 1]) + fno--; + return fno; } /* read a number, use default if absent */ -static int -get_ul(char *u, unsigned long *up, unsigned long def, int base) { - char *nu; - - if (*u) { - errno = 0; - *up = strtoul(u, &nu, base); - if (errno == ERANGE) { - printf("number too big\n"); - return -1; - } - if (*nu) { - printf("trailing junk after number\n"); - return -1; - } - } else - *up = def; - return 0; +static int get_ul(char *u, unsigned long *up, unsigned long def, int base) +{ + char *nu; + + if (*u) { + errno = 0; + *up = strtoul(u, &nu, base); + if (errno == ERANGE) { + printf("number too big\n"); + return -1; + } + if (*nu) { + printf("trailing junk after number\n"); + return -1; + } + } else + *up = def; + return 0; } /* There are two common ways to structure extended partitions: @@ -1800,445 +1877,460 @@ static enum { NESTED, CHAINED, ONESECTOR } boxes = NESTED; /* find the default value for <start> - assuming entire units */ static unsigned long first_free(int pno, int is_extended, struct part_desc *ep, int format, - unsigned long mid, struct disk_desc *z) { - unsigned long ff, fff; - unsigned long unit = unitsize(format); - struct part_desc *partitions = &(z->partitions[0]), *pp = 0; - - /* if containing ep undefined, look at its container */ - if (ep && ep->p.sys_type == EMPTY_PARTITION) - ep = ep->ep; - - if (ep) { - if (boxes == NESTED || (boxes == CHAINED && !is_extended)) - pp = ep; - else if (all_logicals_inside_outermost_extended) - pp = outer_extended_partition(ep); - } + unsigned long mid, struct disk_desc *z) +{ + unsigned long ff, fff; + unsigned long unit = unitsize(format); + struct part_desc *partitions = &(z->partitions[0]), *pp = 0; + + /* if containing ep undefined, look at its container */ + if (ep && ep->p.sys_type == EMPTY_PARTITION) + ep = ep->ep; + + if (ep) { + if (boxes == NESTED || (boxes == CHAINED && !is_extended)) + pp = ep; + else if (all_logicals_inside_outermost_extended) + pp = outer_extended_partition(ep); + } #if 0 - ff = pp ? (pp->start + unit - 1) / unit : 0; + ff = pp ? (pp->start + unit - 1) / unit : 0; #else - /* rounding up wastes almost an entire cylinder - round down - and leave it to compute_start_sect() to fix the difference */ - ff = pp ? pp->start / unit : 0; + /* rounding up wastes almost an entire cylinder - round down + and leave it to compute_start_sect() to fix the difference */ + ff = pp ? pp->start / unit : 0; #endif - /* MBR and 1st sector of an extended partition are never free */ - if (unit == 1) - ff++; + /* MBR and 1st sector of an extended partition are never free */ + if (unit == 1) + ff++; again: - for(pp = partitions; pp < partitions+pno; pp++) { - if (!is_parent(pp, ep) && pp->size > 0) { - if ((partitions_in_order || pp->start / unit <= ff - || (mid && pp->start / unit <= mid)) - && (fff = (pp->start + pp->size + unit - 1) / unit) > ff) { - ff = fff; - goto again; - } + for (pp = partitions; pp < partitions + pno; pp++) { + if (!is_parent(pp, ep) && pp->size > 0) { + if ((partitions_in_order || pp->start / unit <= ff + || (mid && pp->start / unit <= mid)) + && (fff = (pp->start + pp->size + unit - 1) / unit) > ff) { + ff = fff; + goto again; + } + } } - } - return ff; + return ff; } /* find the default value for <size> - assuming entire units */ static unsigned long max_length(int pno, int is_extended, struct part_desc *ep, int format, - unsigned long start, struct disk_desc *z) { - unsigned long fu; - unsigned long unit = unitsize(format); - struct part_desc *partitions = &(z->partitions[0]), *pp = 0; - - /* if containing ep undefined, look at its container */ - if (ep && ep->p.sys_type == EMPTY_PARTITION) - ep = ep->ep; - - if (ep) { - if (boxes == NESTED || (boxes == CHAINED && !is_extended)) - pp = ep; - else if (all_logicals_inside_outermost_extended) - pp = outer_extended_partition(ep); - } - fu = pp ? (pp->start + pp->size) / unit : get_disksize(format); - - for(pp = partitions; pp < partitions+pno; pp++) - if (!is_parent(pp, ep) && pp->size > 0 - && pp->start / unit >= start && pp->start / unit < fu) - fu = pp->start / unit; - - return (fu > start) ? fu - start : 0; + unsigned long start, struct disk_desc *z) +{ + unsigned long fu; + unsigned long unit = unitsize(format); + struct part_desc *partitions = &(z->partitions[0]), *pp = 0; + + /* if containing ep undefined, look at its container */ + if (ep && ep->p.sys_type == EMPTY_PARTITION) + ep = ep->ep; + + if (ep) { + if (boxes == NESTED || (boxes == CHAINED && !is_extended)) + pp = ep; + else if (all_logicals_inside_outermost_extended) + pp = outer_extended_partition(ep); + } + fu = pp ? (pp->start + pp->size) / unit : get_disksize(format); + + for (pp = partitions; pp < partitions + pno; pp++) + if (!is_parent(pp, ep) && pp->size > 0 + && pp->start / unit >= start && pp->start / unit < fu) + fu = pp->start / unit; + + return (fu > start) ? fu - start : 0; } /* compute starting sector of a partition inside an extended one */ /* ep is 0 or points to surrounding extended partition */ -static int -compute_start_sect(struct part_desc *p, struct part_desc *ep) { - unsigned long base; - int inc = (DOS && B.sectors) ? B.sectors : 1; - int delta; - - if (ep && p->start + p->size >= ep->start + 1) - delta = p->start - ep->start - inc; - else if (p->start == 0 && p->size > 0) - delta = -inc; - else - delta = 0; - if (delta < 0) { - p->start -= delta; - p->size += delta; - if (is_extended(p->p.sys_type) && boxes == ONESECTOR) - p->size = inc; - else if ((int)(p->size) <= 0) { - warn("no room for partition descriptor\n"); - return 0; - } - } - base = (!ep ? 0 - : (is_extended(p->p.sys_type) ? - outer_extended_partition(ep) : ep)->start); - p->ep = ep; - if (p->p.sys_type == EMPTY_PARTITION && p->size == 0) { - p->p.start_sect = 0; - p->p.begin_chs = zero_chs; - p->p.end_chs = zero_chs; - } else { - p->p.start_sect = p->start - base; - p->p.begin_chs = ulong_to_chs(p->start,B); - p->p.end_chs = ulong_to_chs(p->start + p->size - 1,B); - } - p->p.nr_sects = p->size; - return 1; -} +static int compute_start_sect(struct part_desc *p, struct part_desc *ep) +{ + unsigned long base; + int inc = (DOS && B.sectors) ? B.sectors : 1; + int delta; + + if (ep && p->start + p->size >= ep->start + 1) + delta = p->start - ep->start - inc; + else if (p->start == 0 && p->size > 0) + delta = -inc; + else + delta = 0; + if (delta < 0) { + p->start -= delta; + p->size += delta; + if (is_extended(p->p.sys_type) && boxes == ONESECTOR) + p->size = inc; + else if ((int) (p->size) <= 0) { + warn("no room for partition descriptor\n"); + return 0; + } + } + base = (!ep ? 0 + : (is_extended(p->p.sys_type) ? + outer_extended_partition(ep) : ep)->start); + p->ep = ep; + if (p->p.sys_type == EMPTY_PARTITION && p->size == 0) { + p->p.start_sect = 0; + p->p.begin_chs = zero_chs; + p->p.end_chs = zero_chs; + } else { + p->p.start_sect = p->start - base; + p->p.begin_chs = ulong_to_chs(p->start, B); + p->p.end_chs = ulong_to_chs(p->start + p->size - 1, B); + } + p->p.nr_sects = p->size; + return 1; +} /* build the extended partition surrounding a given logical partition */ static int build_surrounding_extended(struct part_desc *p, struct part_desc *ep, - struct disk_desc *z) { - int inc = (DOS && B.sectors) ? B.sectors : 1; - int format = F_SECTOR; - struct part_desc *p0 = &(z->partitions[0]), *eep = ep->ep; - - if (boxes == NESTED) { - ep->start = first_free(ep-p0, 1, eep, format, p->start, z); - ep->size = max_length(ep-p0, 1, eep, format, ep->start, z); - if (ep->start > p->start || ep->start + ep->size < p->start + p->size) { - warn("cannot build surrounding extended partition\n"); - return 0; - } - } else { - ep->start = p->start; - if(boxes == CHAINED) - ep->size = p->size; - else - ep->size = inc; - } - - ep->p.nr_sects = ep->size; - ep->p.bootable = 0; - ep->p.sys_type = EXTENDED_PARTITION; - if (!compute_start_sect(ep, eep) || !compute_start_sect(p, ep)) { - ep->p.sys_type = EMPTY_PARTITION; - ep->size = 0; - return 0; - } + struct disk_desc *z) +{ + int inc = (DOS && B.sectors) ? B.sectors : 1; + int format = F_SECTOR; + struct part_desc *p0 = &(z->partitions[0]), *eep = ep->ep; + + if (boxes == NESTED) { + ep->start = first_free(ep - p0, 1, eep, format, p->start, z); + ep->size = max_length(ep - p0, 1, eep, format, ep->start, z); + if (ep->start > p->start + || ep->start + ep->size < p->start + p->size) { + warn("cannot build surrounding extended partition\n"); + return 0; + } + } else { + ep->start = p->start; + if (boxes == CHAINED) + ep->size = p->size; + else + ep->size = inc; + } + + ep->p.nr_sects = ep->size; + ep->p.bootable = 0; + ep->p.sys_type = EXTENDED_PARTITION; + if (!compute_start_sect(ep, eep) || !compute_start_sect(p, ep)) { + ep->p.sys_type = EMPTY_PARTITION; + ep->size = 0; + return 0; + } - return 1; + return 1; } static int read_line(int pno, struct part_desc *ep, char *dev, int interactive, - struct disk_desc *z) { - unsigned char line[1000]; - unsigned char *fields[11]; - int fno, pct = pno%4; - struct part_desc p, *orig; - unsigned long ff, ff1, ul, ml, ml1, def; - int format, lpno, is_extd; - - if (eof || eob) - return -1; - - lpno = index_to_linux(pno, z); - - if (interactive) { - if (pct == 0 && (show_extended || pno == 0)) - warn("\n"); - warn("%8s%d: ", dev, lpno); - } - - /* read input line - skip blank lines when reading from a file */ - do { - fno = read_stdin(fields, line, SIZE(fields), SIZE(line)); - } while(fno == RD_CMD || (fno == 0 && !interactive)); - if (fno == RD_EOF) { - return -1; - } else if (fno > 10 && *(fields[10]) != 0) { - printf("too many input fields\n"); - return 0; - } + struct disk_desc *z) +{ + unsigned char line[1000]; + unsigned char *fields[11]; + int fno, pct = pno % 4; + struct part_desc p, *orig; + unsigned long ff, ff1, ul, ml, ml1, def; + int format, lpno, is_extd; - if (fno == 1 && !strcmp(fields[0], ".")) { - eob = 1; - return -1; - } + if (eof || eob) + return -1; + + lpno = index_to_linux(pno, z); + + if (interactive) { + if (pct == 0 && (show_extended || pno == 0)) + warn("\n"); + warn("%8s%d: ", dev, lpno); + } - /* use specified format, but round to cylinders if F_MEGABYTE specified */ - format = 0; - if (B.cylindersize && specified_format == F_MEGABYTE) - format = F_CYLINDER; + /* read input line - skip blank lines when reading from a file */ + do { + fno = read_stdin(fields, line, SIZE(fields), SIZE(line)); + } while (fno == RD_CMD || (fno == 0 && !interactive)); + if (fno == RD_EOF) { + return -1; + } else if (fno > 10 && *(fields[10]) != 0) { + printf("too many input fields\n"); + return 0; + } - orig = (one_only ? &(oldp.partitions[pno]) : 0); + if (fno == 1 && !strcmp(fields[0], ".")) { + eob = 1; + return -1; + } - p = zero_part_desc; - p.ep = ep; + /* use specified format, but round to cylinders if F_MEGABYTE specified */ + format = 0; + if (B.cylindersize && specified_format == F_MEGABYTE) + format = F_CYLINDER; + + orig = (one_only ? &(oldp.partitions[pno]) : 0); + + p = zero_part_desc; + p.ep = ep; + + /* first read the type - we need to know whether it is extended */ + /* stop reading when input blank (defaults) and all is full */ + is_extd = 0; + if (fno == 0) { /* empty line */ + if (orig && is_extended(orig->p.sys_type)) + is_extd = 1; + ff = first_free(pno, is_extd, ep, format, 0, z); + ml = max_length(pno, is_extd, ep, format, ff, z); + if (ml == 0 && is_extd == 0) { + is_extd = 1; + ff = first_free(pno, is_extd, ep, format, 0, z); + ml = max_length(pno, is_extd, ep, format, ff, z); + } + if (ml == 0 && pno >= 4) { + /* no free blocks left - don't read any further */ + warn("No room for more\n"); + return -1; + } + } + if (fno < 3 || !*(fields[2])) + ul = orig ? orig->p.sys_type : + (is_extd || (pno > 3 && pct == 1 && show_extended)) + ? EXTENDED_PARTITION : LINUX_NATIVE; + else if (!strcmp(fields[2], "L")) + ul = LINUX_NATIVE; + else if (!strcmp(fields[2], "S")) + ul = LINUX_SWAP; + else if (!strcmp(fields[2], "E")) + ul = EXTENDED_PARTITION; + else if (!strcmp(fields[2], "X")) + ul = LINUX_EXTENDED; + else if (get_ul(fields[2], &ul, LINUX_NATIVE, 16)) + return 0; + if (ul > 255) { + warn("Illegal type\n"); + return 0; + } + p.p.sys_type = ul; + is_extd = is_extended(ul); - /* first read the type - we need to know whether it is extended */ - /* stop reading when input blank (defaults) and all is full */ - is_extd = 0; - if (fno == 0) { /* empty line */ - if (orig && is_extended(orig->p.sys_type)) - is_extd = 1; + /* find start */ ff = first_free(pno, is_extd, ep, format, 0, z); - ml = max_length(pno, is_extd, ep, format, ff, z); - if (ml == 0 && is_extd == 0) { - is_extd = 1; - ff = first_free(pno, is_extd, ep, format, 0, z); - ml = max_length(pno, is_extd, ep, format, ff, z); - } - if (ml == 0 && pno >= 4) { - /* no free blocks left - don't read any further */ - warn("No room for more\n"); - return -1; - } - } - if (fno < 3 || !*(fields[2])) - ul = orig ? orig->p.sys_type : - (is_extd || (pno > 3 && pct == 1 && show_extended)) - ? EXTENDED_PARTITION : LINUX_NATIVE; - else if(!strcmp(fields[2], "L")) - ul = LINUX_NATIVE; - else if(!strcmp(fields[2], "S")) - ul = LINUX_SWAP; - else if(!strcmp(fields[2], "E")) - ul = EXTENDED_PARTITION; - else if(!strcmp(fields[2], "X")) - ul = LINUX_EXTENDED; - else if (get_ul(fields[2], &ul, LINUX_NATIVE, 16)) - return 0; - if (ul > 255) { - warn("Illegal type\n"); - return 0; - } - p.p.sys_type = ul; - is_extd = is_extended(ul); - - /* find start */ - ff = first_free(pno, is_extd, ep, format, 0, z); - ff1 = ff * unitsize(format); - def = orig ? orig->start : (pno > 4 && pct > 1) ? 0 : ff1; - if (fno < 1 || !*(fields[0])) - p.start = def; - else { - if (get_ul(fields[0], &ul, def / unitsize(0), 0)) - return 0; - p.start = ul * unitsize(0); - p.start -= (p.start % unitsize(format)); - } - - /* find length */ - ml = max_length(pno, is_extd, ep, format, p.start / unitsize(format), z); - ml1 = ml * unitsize(format); - def = orig ? orig->size : (pno > 4 && pct > 1) ? 0 : ml1; - if (fno < 2 || !*(fields[1])) - p.size = def; - else { - if (get_ul(fields[1], &ul, def / unitsize(0), 0)) - return 0; - p.size = ul * unitsize(0) + unitsize(format) - 1; - p.size -= (p.size % unitsize(format)); - } - if (p.size > ml1) { - warn("Warning: exceeds max allowable size (%lu)\n", ml1 / unitsize(0)); - if (!force) - return 0; - } - if (p.size == 0 && pno >= 4 && (fno < 2 || !*(fields[1]))) { - warn("Warning: empty partition\n"); - if (!force) - return 0; - } - p.p.nr_sects = p.size; - - if (p.size == 0 && !orig) { - if(fno < 1 || !*(fields[0])) - p.start = 0; - if(fno < 3 || !*(fields[2])) - p.p.sys_type = EMPTY_PARTITION; - } - - if (p.start < ff1 && p.size > 0) { - warn("Warning: bad partition start (earliest %lu)\n", - (ff1 + unitsize(0) - 1) / unitsize(0)); - if (!force) - return 0; - } - - if (fno < 4 || !*(fields[3])) - ul = (orig ? orig->p.bootable : 0); - else if (!strcmp(fields[3], "-")) - ul = 0; - else if (!strcmp(fields[3], "*") || !strcmp(fields[3], "+")) - ul = 0x80; - else { - warn("unrecognized bootable flag - choose - or *\n"); - return 0; - } - p.p.bootable = ul; - - if (ep && ep->p.sys_type == EMPTY_PARTITION) { - if(!build_surrounding_extended(&p, ep, z)) - return 0; - } else - if(!compute_start_sect(&p, ep)) - return 0; + ff1 = ff * unitsize(format); + def = orig ? orig->start : (pno > 4 && pct > 1) ? 0 : ff1; + if (fno < 1 || !*(fields[0])) + p.start = def; + else { + if (get_ul(fields[0], &ul, def / unitsize(0), 0)) + return 0; + p.start = ul * unitsize(0); + p.start -= (p.start % unitsize(format)); + } - { longchs aa = chs_to_longchs(p.p.begin_chs), bb; + /* find length */ + ml = + max_length(pno, is_extd, ep, format, p.start / unitsize(format), + z); + ml1 = ml * unitsize(format); + def = orig ? orig->size : (pno > 4 && pct > 1) ? 0 : ml1; + if (fno < 2 || !*(fields[1])) + p.size = def; + else { + if (get_ul(fields[1], &ul, def / unitsize(0), 0)) + return 0; + p.size = ul * unitsize(0) + unitsize(format) - 1; + p.size -= (p.size % unitsize(format)); + } + if (p.size > ml1) { + warn("Warning: exceeds max allowable size (%lu)\n", + ml1 / unitsize(0)); + if (!force) + return 0; + } + if (p.size == 0 && pno >= 4 && (fno < 2 || !*(fields[1]))) { + warn("Warning: empty partition\n"); + if (!force) + return 0; + } + p.p.nr_sects = p.size; - if (fno < 5) { - bb = aa; - } else if (fno < 7) { - warn("partial c,h,s specification?\n"); - return 0; - } else if(get_ul(fields[4], &bb.c, aa.c, 0) || - get_ul(fields[5], &bb.h, aa.h, 0) || - get_ul(fields[6], &bb.s, aa.s, 0)) - return 0; - p.p.begin_chs = longchs_to_chs(bb,B); - } - { longchs aa = chs_to_longchs(p.p.end_chs), bb; - - if (fno < 8) { - bb = aa; - } else if (fno < 10) { - warn("partial c,h,s specification?\n"); - return 0; - } else if(get_ul(fields[7], &bb.c, aa.c, 0) || - get_ul(fields[8], &bb.h, aa.h, 0) || - get_ul(fields[9], &bb.s, aa.s, 0)) - return 0; - p.p.end_chs = longchs_to_chs(bb, B); - } + if (p.size == 0 && !orig) { + if (fno < 1 || !*(fields[0])) + p.start = 0; + if (fno < 3 || !*(fields[2])) + p.p.sys_type = EMPTY_PARTITION; + } + + if (p.start < ff1 && p.size > 0) { + warn("Warning: bad partition start (earliest %lu)\n", + (ff1 + unitsize(0) - 1) / unitsize(0)); + if (!force) + return 0; + } + + if (fno < 4 || !*(fields[3])) + ul = (orig ? orig->p.bootable : 0); + else if (!strcmp(fields[3], "-")) + ul = 0; + else if (!strcmp(fields[3], "*") || !strcmp(fields[3], "+")) + ul = 0x80; + else { + warn("unrecognized bootable flag - choose - or *\n"); + return 0; + } + p.p.bootable = ul; + + if (ep && ep->p.sys_type == EMPTY_PARTITION) { + if (!build_surrounding_extended(&p, ep, z)) + return 0; + } else if (!compute_start_sect(&p, ep)) + return 0; - if (pno > 3 && p.size && show_extended && p.p.sys_type != EMPTY_PARTITION - && (is_extended(p.p.sys_type) != (pct == 1))) { - warn("Extended partition not where expected\n"); - if (!force) - return 0; - } + { + longchs aa = chs_to_longchs(p.p.begin_chs), bb; + + if (fno < 5) { + bb = aa; + } else if (fno < 7) { + warn("partial c,h,s specification?\n"); + return 0; + } else if (get_ul(fields[4], &bb.c, aa.c, 0) || + get_ul(fields[5], &bb.h, aa.h, 0) || + get_ul(fields[6], &bb.s, aa.s, 0)) + return 0; + p.p.begin_chs = longchs_to_chs(bb, B); + } + { + longchs aa = chs_to_longchs(p.p.end_chs), bb; + + if (fno < 8) { + bb = aa; + } else if (fno < 10) { + warn("partial c,h,s specification?\n"); + return 0; + } else if (get_ul(fields[7], &bb.c, aa.c, 0) || + get_ul(fields[8], &bb.h, aa.h, 0) || + get_ul(fields[9], &bb.s, aa.s, 0)) + return 0; + p.p.end_chs = longchs_to_chs(bb, B); + } + + if (pno > 3 && p.size && show_extended + && p.p.sys_type != EMPTY_PARTITION + && (is_extended(p.p.sys_type) != (pct == 1))) { + warn("Extended partition not where expected\n"); + if (!force) + return 0; + } - z->partitions[pno] = p; - if (pno >= z->partno) - z->partno += 4; /* reqd for out_partition() */ + z->partitions[pno] = p; + if (pno >= z->partno) + z->partno += 4; /* reqd for out_partition() */ - if (interactive) - out_partition(dev, 0, &(z->partitions[pno]), z, B); + if (interactive) + out_partition(dev, 0, &(z->partitions[pno]), z, B); - return 1; + return 1; } /* ep either points to the extended partition to contain this one, or to the empty partition that may become extended or is 0 */ static int read_partition(char *dev, int interactive, int pno, struct part_desc *ep, - struct disk_desc *z) { - struct part_desc *p = &(z->partitions[pno]); - int i; - - if (one_only) { - *p = oldp.partitions[pno]; - if (one_only_pno != pno) - goto ret; - } else if (!show_extended && pno > 4 && pno%4) - goto ret; - - while (!(i = read_line(pno, ep, dev, interactive, z))) - if (!interactive) - fatal("bad input\n"); - if (i < 0) { - p->ep = ep; - return 0; - } + struct disk_desc *z) +{ + struct part_desc *p = &(z->partitions[pno]); + int i; + + if (one_only) { + *p = oldp.partitions[pno]; + if (one_only_pno != pno) + goto ret; + } else if (!show_extended && pno > 4 && pno % 4) + goto ret; + + while (!(i = read_line(pno, ep, dev, interactive, z))) + if (!interactive) + fatal("bad input\n"); + if (i < 0) { + p->ep = ep; + return 0; + } ret: - p->ep = ep; - if (pno >= z->partno) - z->partno += 4; - return 1; + p->ep = ep; + if (pno >= z->partno) + z->partno += 4; + return 1; } static void read_partition_chain(char *dev, int interactive, struct part_desc *ep, - struct disk_desc *z) { - int i, base; - - eob = 0; - while (1) { - base = z->partno; - if (base+4 > SIZE(z->partitions)) { - printf("too many partitions\n"); - break; - } - for (i=0; i<4; i++) - if (!read_partition(dev, interactive, base+i, ep, z)) - return; - for (i=0; i<4; i++) { - ep = &(z->partitions[base+i]); - if (is_extended(ep->p.sys_type) && ep->size) - break; - } - if (i == 4) { - /* nothing found - maybe an empty partition is going - to be extended */ - if (one_only || show_extended) - break; - ep = &(z->partitions[base+1]); - if (ep->size || ep->p.sys_type != EMPTY_PARTITION) - break; - } - } + struct disk_desc *z) +{ + int i, base; + + eob = 0; + while (1) { + base = z->partno; + if (base + 4 > SIZE(z->partitions)) { + printf("too many partitions\n"); + break; + } + for (i = 0; i < 4; i++) + if (!read_partition(dev, interactive, base + i, ep, z)) + return; + for (i = 0; i < 4; i++) { + ep = &(z->partitions[base + i]); + if (is_extended(ep->p.sys_type) && ep->size) + break; + } + if (i == 4) { + /* nothing found - maybe an empty partition is going + to be extended */ + if (one_only || show_extended) + break; + ep = &(z->partitions[base + 1]); + if (ep->size || ep->p.sys_type != EMPTY_PARTITION) + break; + } + } } -static void -read_input(char *dev, int interactive, struct disk_desc *z) { - int i; - struct part_desc *partitions = &(z->partitions[0]), *ep; - - for (i=0; i < SIZE(z->partitions); i++) - partitions[i] = zero_part_desc; - z->partno = 0; - - if (interactive) - warn("Input in the following format; absent fields get a default value.\n" - "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n" - "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"); - eof = 0; - - for (i=0; i<4; i++) - read_partition(dev, interactive, i, 0, z); - for (i=0; i<4; i++) { - ep = partitions+i; - if (is_extended(ep->p.sys_type) && ep->size) - read_partition_chain(dev, interactive, ep, z); - } - add_sector_and_offset(z); +static void read_input(char *dev, int interactive, struct disk_desc *z) +{ + int i; + struct part_desc *partitions = &(z->partitions[0]), *ep; + + for (i = 0; i < SIZE(z->partitions); i++) + partitions[i] = zero_part_desc; + z->partno = 0; + + if (interactive) + warn + ("Input in the following format; absent fields get a default value.\n" + "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n" + "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"); + eof = 0; + + for (i = 0; i < 4; i++) + read_partition(dev, interactive, i, 0, z); + for (i = 0; i < 4; i++) { + ep = partitions + i; + if (is_extended(ep->p.sys_type) && ep->size) + read_partition_chain(dev, interactive, ep, z); + } + add_sector_and_offset(z); } /* * G. The command line */ -static void version(void) { - printf("%s %s %s (aeb@cwi.nl, %s)\n", PROGNAME, "version", VERSION, DATE); +static void version(void) +{ + printf("%s %s %s (aeb@cwi.nl, %s)\n", PROGNAME, "version", VERSION, + DATE); } static char short_opts[] = "cdfgilnqsu:vx?1A::C:DH:I:LN:O:RS:TU::V"; @@ -2247,77 +2339,78 @@ static char short_opts[] = "cdfgilnqsu:vx?1A::C:DH:I:LN:O:RS:TU::V"; #define CHANGE_ID 01000 static const struct option long_opts[] = { - { "change-id", no_argument, NULL, 'c' + CHANGE_ID }, - { "print-id", no_argument, NULL, 'c' + PRINT_ID }, - { "id", no_argument, NULL, 'c' }, - { "dump", no_argument, NULL, 'd' }, - { "force", no_argument, NULL, 'f' }, - { "show-geometry", no_argument, NULL, 'g' }, - { "increment", no_argument, NULL, 'i' }, - { "list", no_argument, NULL, 'l' }, - { "quiet", no_argument, NULL, 'q' }, - { "show-size", no_argument, NULL, 's' }, - { "unit", required_argument, NULL, 'u' }, - { "version", no_argument, NULL, 'v' }, - { "show-extended", no_argument, NULL, 'x' }, - { "help", no_argument, NULL, '?' }, - { "one-only", no_argument, NULL, '1' }, - { "cylinders", required_argument, NULL, 'C' }, - { "heads", required_argument, NULL, 'H' }, - { "sectors", required_argument, NULL, 'S' }, - { "activate", optional_argument, NULL, 'A' }, - { "DOS", no_argument, NULL, 'D' }, - { "Linux", no_argument, NULL, 'L' }, - { "re-read", no_argument, NULL, 'R' }, - { "list-types", no_argument, NULL, 'T' }, - { "unhide", optional_argument, NULL, 'U' }, - { "no-reread", no_argument, NULL, 160 }, - { "IBM", no_argument, NULL, 161 }, - { "leave-last", no_argument, NULL, 161 }, + {"change-id", no_argument, NULL, 'c' + CHANGE_ID}, + {"print-id", no_argument, NULL, 'c' + PRINT_ID}, + {"id", no_argument, NULL, 'c'}, + {"dump", no_argument, NULL, 'd'}, + {"force", no_argument, NULL, 'f'}, + {"show-geometry", no_argument, NULL, 'g'}, + {"increment", no_argument, NULL, 'i'}, + {"list", no_argument, NULL, 'l'}, + {"quiet", no_argument, NULL, 'q'}, + {"show-size", no_argument, NULL, 's'}, + {"unit", required_argument, NULL, 'u'}, + {"version", no_argument, NULL, 'v'}, + {"show-extended", no_argument, NULL, 'x'}, + {"help", no_argument, NULL, '?'}, + {"one-only", no_argument, NULL, '1'}, + {"cylinders", required_argument, NULL, 'C'}, + {"heads", required_argument, NULL, 'H'}, + {"sectors", required_argument, NULL, 'S'}, + {"activate", optional_argument, NULL, 'A'}, + {"DOS", no_argument, NULL, 'D'}, + {"Linux", no_argument, NULL, 'L'}, + {"re-read", no_argument, NULL, 'R'}, + {"list-types", no_argument, NULL, 'T'}, + {"unhide", optional_argument, NULL, 'U'}, + {"no-reread", no_argument, NULL, 160}, + {"IBM", no_argument, NULL, 161}, + {"leave-last", no_argument, NULL, 161}, /* undocumented flags - not all completely implemented */ - { "in-order", no_argument, NULL, 128 }, - { "not-in-order", no_argument, NULL, 129 }, - { "inside-outer", no_argument, NULL, 130 }, - { "not-inside-outer", no_argument, NULL, 131 }, - { "nested", no_argument, NULL, 132 }, - { "chained", no_argument, NULL, 133 }, - { "onesector", no_argument, NULL, 134 }, - { NULL, 0, NULL, 0 } + {"in-order", no_argument, NULL, 128}, + {"not-in-order", no_argument, NULL, 129}, + {"inside-outer", no_argument, NULL, 130}, + {"not-inside-outer", no_argument, NULL, 131}, + {"nested", no_argument, NULL, 132}, + {"chained", no_argument, NULL, 133}, + {"onesector", no_argument, NULL, 134}, + {NULL, 0, NULL, 0} }; /* default devices to list */ static struct devd { - char *pref, *letters; + char *pref, *letters; } defdevs[] = { - { "hd", "abcdefgh" }, - { "sd", "abcde" }, - { "xd", "ab" }, - { "ed", "abcd" } + { + "hd", "abcdefgh"}, { + "sd", "abcde"}, { + "xd", "ab"}, { + "ed", "abcd"} }; -static int -is_ide_cdrom(char *device) { - /* No device was given explicitly, and we are trying some - likely things. But opening /dev/hdc may produce errors like - "hdc: tray open or drive not ready" - if it happens to be a CD-ROM drive. So try to be careful. - This only works since 2.1.73. */ +static int is_ide_cdrom(char *device) +{ + /* No device was given explicitly, and we are trying some + likely things. But opening /dev/hdc may produce errors like + "hdc: tray open or drive not ready" + if it happens to be a CD-ROM drive. So try to be careful. + This only works since 2.1.73. */ - FILE *procf; - char buf[100]; - struct stat statbuf; + FILE *procf; + char buf[100]; + struct stat statbuf; - sprintf(buf, "/proc/ide/%s/media", device+5); - procf = fopen(buf, "r"); - if (procf != NULL && fgets(buf, sizeof(buf), procf)) - return !strncmp(buf, "cdrom", 5); + sprintf(buf, "/proc/ide/%s/media", device + 5); + procf = fopen(buf, "r"); + if (procf != NULL && fgets(buf, sizeof(buf), procf)) + return !strncmp(buf, "cdrom", 5); - /* Now when this proc file does not exist, skip the - device when it is read-only. */ - if (stat(device, &statbuf) == 0) - return (statbuf.st_mode & 0222) == 0; + /* Now when this proc file does not exist, skip the + device when it is read-only. */ + if (stat(device, &statbuf) == 0) + return (statbuf.st_mode & 0222) == 0; - return 0; + return 0; } static void do_list(char *dev, int silent); @@ -2331,275 +2424,310 @@ static void do_activate(char **av, int ac, char *arg); static int total_size; -extern int -sfdisk_main(int argc, char **argv) { - int c; - char *dev; - int opt_size = 0; - int opt_out_geom = 0; - int opt_reread = 0; - int activate = 0; - int do_id = 0; - int unhide = 0; - char *activatearg = 0; - char *unhidearg = 0; - - if (argc < 1) - usage(sfdisk_usage); - - while ((c = getopt_long (argc, argv, short_opts, long_opts, NULL)) != -1) { - switch (c) { - case 'f': - force = 1; break; /* does not imply quiet */ - case 'g': - opt_out_geom = 1; break; - case 'i': - increment = 1; break; - case 'c': - case 'c' + PRINT_ID: - case 'c' + CHANGE_ID: - do_id = c; break; - case 'd': - dump = 1; /* fall through */ - case 'l': - opt_list = 1; break; - case 'n': - no_write = 1; break; - case 'q': - quiet = 1; break; - case 's': - opt_size = 1; break; - case 'u': - set_format(*optarg); break; - case 'v': - version(); - exit(0); - case 'x': - show_extended = 1; break; - case 'A': - activatearg = optarg; - activate = 1; break; - case 'C': - U.cylinders = atoi(optarg); break; - case 'D': - DOS = 1; break; - case 'H': - U.heads = atoi(optarg); break; - case 'L': - Linux = 1; break; - case 'N': - one_only = atoi(optarg); break; - case 'I': - restore_sector_file = optarg; break; - case 'O': - save_sector_file = optarg; break; - case 'R': - opt_reread = 1; break; - case 'S': - U.sectors = atoi(optarg); break; - case 'T': - list_types(); - exit(0); - case 'U': - unhidearg = optarg; - unhide = 1; break; - case 'V': - verify = 1; break; - case '?': - default: - usage(sfdisk_usage); - - /* undocumented flags */ - case 128: - partitions_in_order = 1; break; - case 129: - partitions_in_order = 0; break; - case 130: - all_logicals_inside_outermost_extended = 1; break; - case 131: - all_logicals_inside_outermost_extended = 0; break; - case 132: - boxes = NESTED; break; - case 133: - boxes = CHAINED; break; - case 134: - boxes = ONESECTOR; break; - - /* more flags */ - case 160: - no_reread = 1; break; - case 161: - leave_last = 1; break; - } - } - - if (optind == argc && (opt_list || opt_out_geom || opt_size || verify)) { - struct devd *dp; - char *lp; - char device[10]; - - total_size = 0; - - for(dp = defdevs; dp-defdevs < SIZE(defdevs); dp++) { - lp = dp->letters; - while(*lp) { - sprintf(device, "/dev/%s%c", dp->pref, *lp++); - if (!strcmp(dp->pref, "hd") && is_ide_cdrom(device)) - continue; - if (opt_out_geom) - do_geom(device, 1); - if (opt_size) - do_size(device, 1); - if (opt_list || verify) - do_list(device, 1); - } +extern int sfdisk_main(int argc, char **argv) +{ + int c; + char *dev; + int opt_size = 0; + int opt_out_geom = 0; + int opt_reread = 0; + int activate = 0; + int do_id = 0; + int unhide = 0; + char *activatearg = 0; + char *unhidearg = 0; + + if (argc < 1) + usage(sfdisk_usage); + + while ((c = getopt_long(argc, argv, short_opts, long_opts, NULL)) != + -1) { + switch (c) { + case 'f': + force = 1; + break; /* does not imply quiet */ + case 'g': + opt_out_geom = 1; + break; + case 'i': + increment = 1; + break; + case 'c': + case 'c' + PRINT_ID: + case 'c' + CHANGE_ID: + do_id = c; + break; + case 'd': + dump = 1; /* fall through */ + case 'l': + opt_list = 1; + break; + case 'n': + no_write = 1; + break; + case 'q': + quiet = 1; + break; + case 's': + opt_size = 1; + break; + case 'u': + set_format(*optarg); + break; + case 'v': + version(); + exit(0); + case 'x': + show_extended = 1; + break; + case 'A': + activatearg = optarg; + activate = 1; + break; + case 'C': + U.cylinders = atoi(optarg); + break; + case 'D': + DOS = 1; + break; + case 'H': + U.heads = atoi(optarg); + break; + case 'L': + Linux = 1; + break; + case 'N': + one_only = atoi(optarg); + break; + case 'I': + restore_sector_file = optarg; + break; + case 'O': + save_sector_file = optarg; + break; + case 'R': + opt_reread = 1; + break; + case 'S': + U.sectors = atoi(optarg); + break; + case 'T': + list_types(); + exit(0); + case 'U': + unhidearg = optarg; + unhide = 1; + break; + case 'V': + verify = 1; + break; + case '?': + default: + usage(sfdisk_usage); + + /* undocumented flags */ + case 128: + partitions_in_order = 1; + break; + case 129: + partitions_in_order = 0; + break; + case 130: + all_logicals_inside_outermost_extended = 1; + break; + case 131: + all_logicals_inside_outermost_extended = 0; + break; + case 132: + boxes = NESTED; + break; + case 133: + boxes = CHAINED; + break; + case 134: + boxes = ONESECTOR; + break; + + /* more flags */ + case 160: + no_reread = 1; + break; + case 161: + leave_last = 1; + break; + } } - if (opt_size) - printf("total: %d blocks\n", total_size); + if (optind == argc && (opt_list || opt_out_geom || opt_size || verify)) { + struct devd *dp; + char *lp; + char device[10]; + + total_size = 0; + + for (dp = defdevs; dp - defdevs < SIZE(defdevs); dp++) { + lp = dp->letters; + while (*lp) { + sprintf(device, "/dev/%s%c", dp->pref, *lp++); + if (!strcmp(dp->pref, "hd") && is_ide_cdrom(device)) + continue; + if (opt_out_geom) + do_geom(device, 1); + if (opt_size) + do_size(device, 1); + if (opt_list || verify) + do_list(device, 1); + } + } + + if (opt_size) + printf("total: %d blocks\n", total_size); - exit(exit_status); - } + exit(exit_status); + } - if (optind == argc) usage(sfdisk_usage); + if (optind == argc) + usage(sfdisk_usage); + + if (opt_list || opt_out_geom || opt_size || verify) { + while (optind < argc) { + if (opt_out_geom) + do_geom(argv[optind], 0); + if (opt_size) + do_size(argv[optind], 0); + if (opt_list || verify) + do_list(argv[optind], 0); + optind++; + } + exit(exit_status); + } - if (opt_list || opt_out_geom || opt_size || verify) { - while (optind < argc) { - if (opt_out_geom) - do_geom(argv[optind], 0); - if (opt_size) - do_size(argv[optind], 0); - if (opt_list || verify) - do_list(argv[optind], 0); - optind++; + if (activate) { + do_activate(argv + optind, argc - optind, activatearg); + exit(exit_status); + } + if (unhide) { + do_unhide(argv + optind, argc - optind, unhidearg); + exit(exit_status); + } + if (do_id) { + if ((do_id & PRINT_ID) != 0 && optind != argc - 2) + fatal("usage: sfdisk --print-id device partition-number\n"); + else if ((do_id & CHANGE_ID) != 0 && optind != argc - 3) + fatal + ("usage: sfdisk --change-id device partition-number Id\n"); + else if (optind != argc - 3 && optind != argc - 2) + fatal("usage: sfdisk --id device partition-number [Id]\n"); + do_change_id(argv[optind], argv[optind + 1], + (optind == argc - 2) ? 0 : argv[optind + 2]); + exit(exit_status); } - exit(exit_status); - } - if (activate) { - do_activate(argv+optind, argc-optind, activatearg); - exit(exit_status); - } - if (unhide) { - do_unhide(argv+optind, argc-optind, unhidearg); - exit(exit_status); - } - if (do_id) { - if ((do_id & PRINT_ID) != 0 && optind != argc-2) - fatal("usage: sfdisk --print-id device partition-number\n"); - else if ((do_id & CHANGE_ID) != 0 && optind != argc-3) - fatal("usage: sfdisk --change-id device partition-number Id\n"); - else if (optind != argc-3 && optind != argc-2) - fatal("usage: sfdisk --id device partition-number [Id]\n"); - do_change_id(argv[optind], argv[optind+1], - (optind == argc-2) ? 0 : argv[optind+2]); - exit(exit_status); - } - - if (optind != argc-1) - fatal("can specify only one device (except with -l or -s)\n"); - dev = argv[optind]; + if (optind != argc - 1) + fatal("can specify only one device (except with -l or -s)\n"); + dev = argv[optind]; - if (opt_reread) - do_reread(dev); - else if (restore_sector_file) - restore_sectors(dev); - else - do_fdisk(dev); + if (opt_reread) + do_reread(dev); + else if (restore_sector_file) + restore_sectors(dev); + else + do_fdisk(dev); - return ( TRUE); + return (TRUE); } /* * H. Listing the current situation */ -static int -my_open (char *dev, int rw, int silent) { - int fd, mode; +static int my_open(char *dev, int rw, int silent) +{ + int fd, mode; - mode = (rw ? O_RDWR : O_RDONLY); - fd = open(dev, mode); - if (fd < 0 && !silent) { - perror(dev); - fatal("cannot open %s %s\n", dev, rw ? "read-write" : "for reading"); - } - return fd; + mode = (rw ? O_RDWR : O_RDONLY); + fd = open(dev, mode); + if (fd < 0 && !silent) { + perror(dev); + fatal("cannot open %s %s\n", dev, + rw ? "read-write" : "for reading"); + } + return fd; } -static void -do_list (char *dev, int silent) { - int fd; - struct disk_desc *z; +static void do_list(char *dev, int silent) +{ + int fd; + struct disk_desc *z; - fd = my_open(dev, 0, silent); - if (fd < 0) - return; + fd = my_open(dev, 0, silent); + if (fd < 0) + return; - z = &oldp; + z = &oldp; - free_sectors(); - get_cylindersize(dev, fd, dump ? 1 : opt_list ? 0 : 1); - get_partitions(dev, fd, z); + free_sectors(); + get_cylindersize(dev, fd, dump ? 1 : opt_list ? 0 : 1); + get_partitions(dev, fd, z); - if (opt_list) - out_partitions(dev, z); + if (opt_list) + out_partitions(dev, z); - if (verify) { - if (partitions_ok(z)) - warn("%s: OK\n"), dev; - else - exit_status = 1; - } + if (verify) { + if (partitions_ok(z)) + warn("%s: OK\n"), dev; + else + exit_status = 1; + } } -static void -do_geom (char *dev, int silent) { - int fd; - struct hd_geometry g; +static void do_geom(char *dev, int silent) +{ + int fd; + struct hd_geometry g; - fd = my_open(dev, 0, silent); - if (fd < 0) - return; + fd = my_open(dev, 0, silent); + if (fd < 0) + return; - /* get_cylindersize(dev, fd, silent); */ - if (!ioctl(fd, HDIO_GETGEO, &g)) - printf("%s: %d cylinders, %d heads, %d sectors/track\n", - dev, g.cylinders, g.heads, g.sectors); - else - printf("%s: unknown geometry\n", dev); + /* get_cylindersize(dev, fd, silent); */ + if (!ioctl(fd, HDIO_GETGEO, &g)) + printf("%s: %d cylinders, %d heads, %d sectors/track\n", + dev, g.cylinders, g.heads, g.sectors); + else + printf("%s: unknown geometry\n", dev); } /* for compatibility with earlier fdisk: provide option -s */ -static void -do_size (char *dev, int silent) { - int fd; - long size; +static void do_size(char *dev, int silent) +{ + int fd; + long size; - fd = my_open(dev, 0, silent); - if (fd < 0) - return; + fd = my_open(dev, 0, silent); + if (fd < 0) + return; - if(ioctl(fd, BLKGETSIZE, &size)) { - if(!silent) { - perror(dev); - fatal("BLKGETSIZE ioctl failed for %s\n"), dev; + if (ioctl(fd, BLKGETSIZE, &size)) { + if (!silent) { + perror(dev); + fatal("BLKGETSIZE ioctl failed for %s\n"), dev; + } + return; } - return; - } - size /= 2; /* convert sectors to blocks */ + size /= 2; /* convert sectors to blocks */ - /* a CDROM drive without mounted CD yields MAXINT */ - if (silent && size == ((1<<30)-1)) - return; + /* a CDROM drive without mounted CD yields MAXINT */ + if (silent && size == ((1 << 30) - 1)) + return; - if (silent) - printf("%s: %9ld\n", dev, size); - else - printf("%ld\n", size); + if (silent) + printf("%s: %9ld\n", dev, size); + else + printf("%ld\n", size); - total_size += size; + total_size += size; } /* @@ -2626,255 +2754,263 @@ do_size (char *dev, int silent) { * The present syntax was chosen to be (somewhat) compatible with the * activate from the LILO package. */ -static void -set_active (struct disk_desc *z, char *pnam) { - int pno; - - pno = asc_to_index(pnam, z); - z->partitions[pno].p.bootable = 0x80; -} - -static void -do_activate (char **av, int ac, char *arg) { - char *dev = av[0]; - int fd; - int rw, i, pno, lpno; - struct disk_desc *z; - - z = &oldp; - - rw = (!no_write && (arg || ac > 1)); - fd = my_open(dev, rw, 0); - - free_sectors(); - get_cylindersize(dev, fd, 1); - get_partitions(dev, fd, z); - - if (!arg && ac == 1) { - /* list active partitions */ - for (pno=0; pno < z->partno; pno++) { - if (z->partitions[pno].p.bootable) { - lpno = index_to_linux(pno, z); - if (pno == linux_to_index(lpno, z)) - printf("%s%d\n", dev, lpno); +static void set_active(struct disk_desc *z, char *pnam) +{ + int pno; + + pno = asc_to_index(pnam, z); + z->partitions[pno].p.bootable = 0x80; +} + +static void do_activate(char **av, int ac, char *arg) +{ + char *dev = av[0]; + int fd; + int rw, i, pno, lpno; + struct disk_desc *z; + + z = &oldp; + + rw = (!no_write && (arg || ac > 1)); + fd = my_open(dev, rw, 0); + + free_sectors(); + get_cylindersize(dev, fd, 1); + get_partitions(dev, fd, z); + + if (!arg && ac == 1) { + /* list active partitions */ + for (pno = 0; pno < z->partno; pno++) { + if (z->partitions[pno].p.bootable) { + lpno = index_to_linux(pno, z); + if (pno == linux_to_index(lpno, z)) + printf("%s%d\n", dev, lpno); + else + printf("%s#%d\n", dev, pno); + if (z->partitions[pno].p.bootable != 0x80) + warn("bad active byte: 0x%x instead of 0x80\n", + z->partitions[pno].p.bootable); + } + } + } else { + /* clear `active byte' everywhere */ + for (pno = 0; pno < z->partno; pno++) + z->partitions[pno].p.bootable = 0; + + /* then set where desired */ + if (ac == 1) + set_active(z, arg); else - printf("%s#%d\n", dev, pno); - if (z->partitions[pno].p.bootable != 0x80) - warn("bad active byte: 0x%x instead of 0x80\n", - z->partitions[pno].p.bootable); - } - } - } else { - /* clear `active byte' everywhere */ - for (pno=0; pno < z->partno; pno++) - z->partitions[pno].p.bootable = 0; - - /* then set where desired */ - if (ac == 1) - set_active(z, arg); - else for(i=1; i<ac; i++) - set_active(z, av[i]); + for (i = 1; i < ac; i++) + set_active(z, av[i]); - /* then write to disk */ - if(write_partitions(dev, fd, z)) - warn("Done\n\n"); + /* then write to disk */ + if (write_partitions(dev, fd, z)) + warn("Done\n\n"); + else + exit_status = 1; + } + i = 0; + for (pno = 0; pno < z->partno && pno < 4; pno++) + if (z->partitions[pno].p.bootable) + i++; + if (i != 1) + warn + ("You have %d active primary partitions. This does not matter for LILO,\n" + "but the DOS MBR will only boot a disk with 1 active partition.\n", + i); +} + +static void set_unhidden(struct disk_desc *z, char *pnam) +{ + int pno; + unsigned char id; + + pno = asc_to_index(pnam, z); + id = z->partitions[pno].p.sys_type; + if (id == 0x11 || id == 0x14 || id == 0x16 || id == 0x17) + id -= 0x10; else - exit_status = 1; - } - i = 0; - for (pno=0; pno < z->partno && pno < 4; pno++) - if (z->partitions[pno].p.bootable) - i++; - if (i != 1) - warn("You have %d active primary partitions. This does not matter for LILO,\n" - "but the DOS MBR will only boot a disk with 1 active partition.\n", i); -} - -static void -set_unhidden (struct disk_desc *z, char *pnam) { - int pno; - unsigned char id; - - pno = asc_to_index(pnam, z); - id = z->partitions[pno].p.sys_type; - if (id == 0x11 || id == 0x14 || id == 0x16 || id == 0x17) - id -= 0x10; - else - fatal("partition %s has id %x and is not hidden\n", pnam, id); - z->partitions[pno].p.sys_type = id; + fatal("partition %s has id %x and is not hidden\n", pnam, id); + z->partitions[pno].p.sys_type = id; } /* * maybe remove and make part of --change-id */ -static void -do_unhide (char **av, int ac, char *arg) { - char *dev = av[0]; - int fd, rw, i; - struct disk_desc *z; +static void do_unhide(char **av, int ac, char *arg) +{ + char *dev = av[0]; + int fd, rw, i; + struct disk_desc *z; - z = &oldp; + z = &oldp; - rw = !no_write; - fd = my_open(dev, rw, 0); + rw = !no_write; + fd = my_open(dev, rw, 0); - free_sectors(); - get_cylindersize(dev, fd, 1); - get_partitions(dev, fd, z); + free_sectors(); + get_cylindersize(dev, fd, 1); + get_partitions(dev, fd, z); - /* unhide where desired */ - if (ac == 1) - set_unhidden(z, arg); - else for(i=1; i<ac; i++) - set_unhidden(z, av[i]); + /* unhide where desired */ + if (ac == 1) + set_unhidden(z, arg); + else + for (i = 1; i < ac; i++) + set_unhidden(z, av[i]); - /* then write to disk */ - if(write_partitions(dev, fd, z)) - warn("Done\n\n"); - else - exit_status = 1; + /* then write to disk */ + if (write_partitions(dev, fd, z)) + warn("Done\n\n"); + else + exit_status = 1; } -static void do_change_id(char *dev, char *pnam, char *id) { - int fd, rw, pno; - struct disk_desc *z; - unsigned long i; +static void do_change_id(char *dev, char *pnam, char *id) +{ + int fd, rw, pno; + struct disk_desc *z; + unsigned long i; - z = &oldp; + z = &oldp; - rw = !no_write; - fd = my_open(dev, rw, 0); + rw = !no_write; + fd = my_open(dev, rw, 0); - free_sectors(); - get_cylindersize(dev, fd, 1); - get_partitions(dev, fd, z); + free_sectors(); + get_cylindersize(dev, fd, 1); + get_partitions(dev, fd, z); - pno = asc_to_index(pnam, z); - if (id == 0) { - printf("%x\n", z->partitions[pno].p.sys_type); - return; - } - i = strtoul(id, NULL, 16); - if (i > 255) - fatal("Bad Id %x\n"), i; - z->partitions[pno].p.sys_type = i; + pno = asc_to_index(pnam, z); + if (id == 0) { + printf("%x\n", z->partitions[pno].p.sys_type); + return; + } + i = strtoul(id, NULL, 16); + if (i > 255) + fatal("Bad Id %x\n"), i; + z->partitions[pno].p.sys_type = i; - if(write_partitions(dev, fd, z)) - warn("Done\n\n"); - else - exit_status = 1; + if (write_partitions(dev, fd, z)) + warn("Done\n\n"); + else + exit_status = 1; } -static void -do_reread(char *dev) { - int fd; +static void do_reread(char *dev) +{ + int fd; - fd = my_open(dev, 0, 0); - if(reread_ioctl(fd)) - printf("This disk is currently in use.\n"); + fd = my_open(dev, 0, 0); + if (reread_ioctl(fd)) + printf("This disk is currently in use.\n"); } /* * I. Writing the new situation */ -static void -do_fdisk(char *dev){ - int fd; - int c, answer; - struct stat statbuf; - int interactive = isatty(0); - struct disk_desc *z; - - if (stat(dev, &statbuf) < 0) { - perror(dev); - fatal("Fatal error: cannot find %s\n"), dev; - } - if (!S_ISBLK(statbuf.st_mode)) { - warn("Warning: %s is not a block device\n"), dev; - no_reread = 1; - } - fd = my_open(dev, !no_write, 0); - - if(!no_write && !no_reread) { - warn("Checking that no-one is using this disk right now ...\n"); - if(reread_ioctl(fd)) { - printf("\nThis disk is currently in use - repartitioning is probably a bad idea." - "Umount all file systems, and swapoff all swap partitions on this disk." - "Use the --no-reread flag to suppress this check.\n"); - if (!force) { - printf("Use the --force flag to overrule all checks.\n"); - exit(1); - } - } else - warn("OK"); - } +static void do_fdisk(char *dev) +{ + int fd; + int c, answer; + struct stat statbuf; + int interactive = isatty(0); + struct disk_desc *z; + + if (stat(dev, &statbuf) < 0) { + perror(dev); + fatal("Fatal error: cannot find %s\n"), dev; + } + if (!S_ISBLK(statbuf.st_mode)) { + warn("Warning: %s is not a block device\n"), dev; + no_reread = 1; + } + fd = my_open(dev, !no_write, 0); + + if (!no_write && !no_reread) { + warn("Checking that no-one is using this disk right now ...\n"); + if (reread_ioctl(fd)) { + printf + ("\nThis disk is currently in use - repartitioning is probably a bad idea." + "Umount all file systems, and swapoff all swap partitions on this disk." + "Use the --no-reread flag to suppress this check.\n"); + if (!force) { + printf("Use the --force flag to overrule all checks.\n"); + exit(1); + } + } else + warn("OK"); + } - z = &oldp; + z = &oldp; - free_sectors(); - get_cylindersize(dev, fd, 0); - get_partitions(dev, fd, z); + free_sectors(); + get_cylindersize(dev, fd, 0); + get_partitions(dev, fd, z); - printf("Old situation:\n"); - out_partitions(dev, z); + printf("Old situation:\n"); + out_partitions(dev, z); - if (one_only && (one_only_pno = linux_to_index(one_only, z)) < 0) - fatal("Partition %d does not exist, cannot change it\n"), one_only; + if (one_only && (one_only_pno = linux_to_index(one_only, z)) < 0) + fatal("Partition %d does not exist, cannot change it\n"), one_only; - z = &newp; + z = &newp; - while(1) { + while (1) { - read_input(dev, interactive, z); + read_input(dev, interactive, z); - printf("New situation:\n"); - out_partitions(dev, z); + printf("New situation:\n"); + out_partitions(dev, z); - if (!partitions_ok(z) && !force) { - if(!interactive) - fatal("I don't like these partitions - nothing changed.\n" - "(If you really want this, use the --force option.)\n"); - else - printf("I don't like this - probably you should answer No\n"); + if (!partitions_ok(z) && !force) { + if (!interactive) + fatal("I don't like these partitions - nothing changed.\n" + "(If you really want this, use the --force option.)\n"); + else + printf + ("I don't like this - probably you should answer No\n"); + } + ask: + if (interactive) { + if (no_write) + printf("Are you satisfied with this? [ynq] "); + else + printf("Do you want to write this to disk? [ynq] "); + answer = c = getchar(); + while (c != '\n' && c != EOF) + c = getchar(); + if (c == EOF) + printf("\nsfdisk: premature end of input\n"); + if (c == EOF || answer == 'q' || answer == 'Q') { + fatal("Quitting - nothing changed\n"); + } else if (answer == 'n' || answer == 'N') { + continue; + } else if (answer == 'y' || answer == 'Y') { + break; + } else { + printf("Please answer one of y,n,q\n"); + goto ask; + } + } else + break; } - ask: - if (interactive) { - if (no_write) - printf("Are you satisfied with this? [ynq] "); - else - printf("Do you want to write this to disk? [ynq] "); - answer = c = getchar(); - while (c != '\n' && c != EOF) - c = getchar(); - if (c == EOF) - printf("\nsfdisk: premature end of input\n"); - if (c == EOF || answer == 'q' || answer == 'Q') { - fatal("Quitting - nothing changed\n"); - } else if (answer == 'n' || answer == 'N') { - continue; - } else if (answer == 'y' || answer == 'Y') { - break; - } else { - printf("Please answer one of y,n,q\n"); - goto ask; - } - } else - break; - } - - if(write_partitions(dev, fd, z)) - printf("Successfully wrote the new partition table\n\n"); - else - exit_status = 1; - - reread_disk_partition(dev, fd); - - warn("If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n" - "to zero the first 512 bytes: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n" - "(See fdisk(8).)\n"); - - sync(); /* superstition */ - sleep(3); - exit(exit_status); + + if (write_partitions(dev, fd, z)) + printf("Successfully wrote the new partition table\n\n"); + else + exit_status = 1; + + reread_disk_partition(dev, fd); + + warn + ("If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n" + "to zero the first 512 bytes: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n" + "(See fdisk(8).)\n"); + + sync(); /* superstition */ + sleep(3); + exit(exit_status); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini sleep implementation for busybox * @@ -23,19 +24,17 @@ #include "internal.h" #include <stdio.h> -const char sleep_usage[] = "sleep N\n\n" -"Pause for N seconds.\n"; +const char sleep_usage[] = "sleep N\n\n" "Pause for N seconds.\n"; -extern int -sleep_main(int argc, char * * argv) +extern int sleep_main(int argc, char **argv) { - if ( (argc < 2) || (**(argv+1) == '-') ) { - usage( sleep_usage ); + if ((argc < 2) || (**(argv + 1) == '-')) { + usage(sleep_usage); } - if ( sleep(atoi(*(++argv))) != 0 ) { - perror( "sleep"); - exit (FALSE); + if (sleep(atoi(*(++argv))) != 0) { + perror("sleep"); + exit(FALSE); } else - exit (TRUE); + exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini sort implementation for busybox * @@ -28,29 +29,27 @@ #include <stdio.h> #include <errno.h> -static const char sort_usage[] = -"sort [OPTION]... [FILE]...\n\n" -; +static const char sort_usage[] = "sort [OPTION]... [FILE]...\n\n"; /* typedefs _______________________________________________________________ */ /* line node */ typedef struct Line { - char *data; /* line data */ - struct Line *next; /* pointer to next line node */ + char *data; /* line data */ + struct Line *next; /* pointer to next line node */ } Line; /* singly-linked list of lines */ typedef struct { - int len; /* number of Lines */ - Line **sorted; /* array fed to qsort */ + int len; /* number of Lines */ + Line **sorted; /* array fed to qsort */ - Line *head; /* head of List */ - Line *current; /* current Line */ + Line *head; /* head of List */ + Line *current; /* current Line */ } List; /* comparison function */ -typedef int (Compare)(const void *, const void *); +typedef int (Compare) (const void *, const void *); /* methods ________________________________________________________________ */ @@ -58,175 +57,176 @@ typedef int (Compare)(const void *, const void *); static const int max = 1024; /* mallocate Line */ -static Line * -line_alloc() +static Line *line_alloc() { - Line *self; - self = malloc(1 * sizeof(Line)); - return self; + Line *self; + + self = malloc(1 * sizeof(Line)); + return self; } /* Initialize Line with string */ -static Line * -line_init(Line *self, const char *string) +static Line *line_init(Line * self, const char *string) { - self->data = malloc((strlen(string) + 1) * sizeof(char)); - if (self->data == NULL) { return NULL; } - strcpy(self->data, string); - self->next = NULL; - return self; + self->data = malloc((strlen(string) + 1) * sizeof(char)); + + if (self->data == NULL) { + return NULL; + } + strcpy(self->data, string); + self->next = NULL; + return self; } /* Construct Line from FILE* */ -static Line * -line_newFromFile(FILE *src) +static Line *line_newFromFile(FILE * src) { - char buffer[max]; - Line *self; - - if (fgets(buffer, max, src)) { - self = line_alloc(); - if (self == NULL) { return NULL; } - line_init(self, buffer); - return self; - } - return NULL; + char buffer[max]; + Line *self; + + if (fgets(buffer, max, src)) { + self = line_alloc(); + if (self == NULL) { + return NULL; + } + line_init(self, buffer); + return self; + } + return NULL; } /* Line destructor */ -static Line * -line_release(Line *self) +static Line *line_release(Line * self) { - if (self->data) { - free(self->data); - free(self); - } - return self; + if (self->data) { + free(self->data); + free(self); + } + return self; } /* Comparison */ /* ascii order */ -static int -compare_ascii(const void *a, const void *b) +static int compare_ascii(const void *a, const void *b) { - Line **doh; - Line *x, *y; + Line **doh; + Line *x, *y; - doh = (Line **) a; - x = *doh; - doh = (Line **) b; - y = *doh; + doh = (Line **) a; + x = *doh; + doh = (Line **) b; + y = *doh; - // fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data); - return strcmp(x->data, y->data); + // fprintf(stdout, "> %p: %s< %p: %s", x, x->data, y, y->data); + return strcmp(x->data, y->data); } /* numeric order */ -static int -compare_numeric(const void *a, const void *b) +static int compare_numeric(const void *a, const void *b) { - Line **doh; - Line *x, *y; - int xint, yint; + Line **doh; + Line *x, *y; + int xint, yint; - doh = (Line **) a; - x = *doh; - doh = (Line **) b; - y = *doh; + doh = (Line **) a; + x = *doh; + doh = (Line **) b; + y = *doh; - xint = strtoul(x->data, NULL, 10); - yint = strtoul(y->data, NULL, 10); + xint = strtoul(x->data, NULL, 10); + yint = strtoul(y->data, NULL, 10); - return (xint - yint); + return (xint - yint); } /* List */ /* */ -static List * -list_init(List *self) +static List *list_init(List * self) { - self->len = 0; - self->sorted = NULL; - self->head = NULL; - self->current = NULL; - return self; + self->len = 0; + self->sorted = NULL; + self->head = NULL; + self->current = NULL; + return self; } /* for simplicity, the List gains ownership of the line */ -static List * -list_insert(List *self, Line *line) +static List *list_insert(List * self, Line * line) { - if (line == NULL) { return NULL; } - - /* first insertion */ - if (self->head == NULL) { - self->head = line; - self->current = line; - - /* all subsequent insertions */ - } else { - self->current->next = line; - self->current = line; - } - self->len++; - return self; + if (line == NULL) { + return NULL; + } + + /* first insertion */ + if (self->head == NULL) { + self->head = line; + self->current = line; + + /* all subsequent insertions */ + } else { + self->current->next = line; + self->current = line; + } + self->len++; + return self; } /* order the list according to compare() */ -static List * -list_sort(List *self, Compare *compare) +static List *list_sort(List * self, Compare * compare) { - int i; - Line *line; - - /* mallocate array of Line*s */ - self->sorted = (Line **) malloc(self->len * sizeof(Line*)); - if (self->sorted == NULL) { return NULL; } - - /* fill array w/ List's contents */ - i = 0; - line = self->head; - while (line) { - self->sorted[i++] = line; - line = line->next; - } - - /* apply qsort */ - qsort(self->sorted, self->len, sizeof(Line*), compare); - return self; + int i; + Line *line; + + /* mallocate array of Line*s */ + self->sorted = (Line **) malloc(self->len * sizeof(Line *)); + if (self->sorted == NULL) { + return NULL; + } + + /* fill array w/ List's contents */ + i = 0; + line = self->head; + while (line) { + self->sorted[i++] = line; + line = line->next; + } + + /* apply qsort */ + qsort(self->sorted, self->len, sizeof(Line *), compare); + return self; } /* precondition: list must be sorted */ -static List * -list_writeToFile(List *self, FILE* dst) +static List *list_writeToFile(List * self, FILE * dst) { - int i; - Line **line = self->sorted; - - if (self->sorted == NULL) { return NULL; } - for (i = 0; i < self->len; i++) { - fprintf(dst, "%s", line[i]->data); - } - return self; + int i; + Line **line = self->sorted; + + if (self->sorted == NULL) { + return NULL; + } + for (i = 0; i < self->len; i++) { + fprintf(dst, "%s", line[i]->data); + } + return self; } /* deallocate */ -static void -list_release(List *self) +static void list_release(List * self) { - Line *i; - Line *die; - - i = self->head; - while (i) { - die = i; - i = die->next; - line_release(die); - } + Line *i; + Line *die; + + i = self->head; + while (i) { + die = i; + i = die->next; + line_release(die); + } } @@ -237,76 +237,77 @@ list_release(List *self) * and finally print it */ -int -sort_main(int argc, char **argv) +int sort_main(int argc, char **argv) { - int i; - char opt; - List list; - Line *l; - Compare *compare; - - /* init */ - compare = compare_ascii; - list_init(&list); - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'g': - /* what's the diff between -g && -n? */ - compare = compare_numeric; - break; - case 'h': - usage(sort_usage); - break; - case 'n': - /* what's the diff between -g && -n? */ - compare = compare_numeric; - break; - case 'r': - /* reverse */ - break; - default: - fprintf(stderr, "sort: invalid option -- %c\n", opt); - usage(sort_usage); - } - } else { - break; + int i; + char opt; + List list; + Line *l; + Compare *compare; + + /* init */ + compare = compare_ascii; + list_init(&list); + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 'g': + /* what's the diff between -g && -n? */ + compare = compare_numeric; + break; + case 'h': + usage(sort_usage); + break; + case 'n': + /* what's the diff between -g && -n? */ + compare = compare_numeric; + break; + case 'r': + /* reverse */ + break; + default: + fprintf(stderr, "sort: invalid option -- %c\n", opt); + usage(sort_usage); + } + } else { + break; + } } - } - /* this could be factored better */ + /* this could be factored better */ - /* work w/ stdin */ - if (i >= argc) { - while ( (l = line_newFromFile(stdin))) { - list_insert(&list, l); - } - list_sort(&list, compare); - list_writeToFile(&list, stdout); - list_release(&list); - - /* work w/ what's left in argv[] */ - } else { - FILE *src; - - for ( ; i < argc; i++) { - src = fopen(argv[i], "r"); - if (src == NULL) { break; } - while ( (l = line_newFromFile(src))) { - list_insert(&list, l); - } - fclose(src); + /* work w/ stdin */ + if (i >= argc) { + while ((l = line_newFromFile(stdin))) { + list_insert(&list, l); + } + list_sort(&list, compare); + list_writeToFile(&list, stdout); + list_release(&list); + + /* work w/ what's left in argv[] */ + } else { + FILE *src; + + for (; i < argc; i++) { + src = fopen(argv[i], "r"); + if (src == NULL) { + break; + } + while ((l = line_newFromFile(src))) { + list_insert(&list, l); + } + fclose(src); + } + list_sort(&list, compare); + list_writeToFile(&list, stdout); + list_release(&list); } - list_sort(&list, compare); - list_writeToFile(&list, stdout); - list_release(&list); - } - exit(0); + exit(0); } -/* $Id: sort.c,v 1.10 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: sort.c,v 1.11 2000/02/08 19:58:47 erik Exp $ */ diff --git a/swaponoff.c b/swaponoff.c index 3c02bdd42..6bda22277 100644 --- a/swaponoff.c +++ b/swaponoff.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini swapon/swapoff implementation for busybox * @@ -32,91 +33,93 @@ static int whichApp; -static const char* appName; +static const char *appName; -static const char swapoff_usage[] = -"swapoff device\n" -"\nStop swapping virtual memory pages on the given device.\n"; -static const char swapon_usage[] = -"swapon device\n" -"\nStart swapping virtual memory pages on the given device.\n"; +static const char swapoff_usage[] = + + "swapoff device\n" + "\nStop swapping virtual memory pages on the given device.\n"; +static const char swapon_usage[] = + + "swapon device\n" + "\nStart swapping virtual memory pages on the given device.\n"; #define SWAPON_APP 1 #define SWAPOFF_APP 2 -static void -swap_enable_disable( char *device) +static void swap_enable_disable(char *device) { - int status; - if ( whichApp == SWAPON_APP ) - status = swapon(device, 0); - else - status = swapoff(device); - - if ( status != 0 ) { - perror(appName); - exit( FALSE); - } + int status; + + if (whichApp == SWAPON_APP) + status = swapon(device, 0); + else + status = swapoff(device); + + if (status != 0) { + perror(appName); + exit(FALSE); + } } -static void -do_em_all() +static void do_em_all() { struct mntent *m; - FILE *f = setmntent ("/etc/fstab", "r"); + FILE *f = setmntent("/etc/fstab", "r"); if (f == NULL) { - perror("/etc/fstab"); - exit( FALSE); + perror("/etc/fstab"); + exit(FALSE); } - while ((m = getmntent (f)) != NULL) { - if (!strstr (m->mnt_type, MNTTYPE_SWAP)) { - swap_enable_disable( m->mnt_fsname); - } + while ((m = getmntent(f)) != NULL) { + if (!strstr(m->mnt_type, MNTTYPE_SWAP)) { + swap_enable_disable(m->mnt_fsname); + } } - endmntent (f); - exit( TRUE); + endmntent(f); + exit(TRUE); } -extern int -swap_on_off_main(int argc, char * * argv) +extern int swap_on_off_main(int argc, char **argv) { - struct stat statBuf; - if (stat("/etc/fstab", &statBuf) < 0) - fprintf(stderr, "/etc/fstab file missing -- Please install one.\n\n"); - - if (strcmp(*argv, "swapon")==0) { - appName = *argv; - whichApp = SWAPON_APP; - - } else { - appName = *argv; - whichApp = SWAPOFF_APP; - } - - if (argc < 2) - goto usage_and_exit; - argc--; - argv++; - - /* Parse any options */ - while (**argv == '-') { - while (*++(*argv)) switch (**argv) { - case 'a': - do_em_all(); - break; - default: + struct stat statBuf; + + if (stat("/etc/fstab", &statBuf) < 0) + fprintf(stderr, + "/etc/fstab file missing -- Please install one.\n\n"); + + if (strcmp(*argv, "swapon") == 0) { + appName = *argv; + whichApp = SWAPON_APP; + + } else { + appName = *argv; + whichApp = SWAPOFF_APP; + } + + if (argc < 2) goto usage_and_exit; + argc--; + argv++; + + /* Parse any options */ + while (**argv == '-') { + while (*++(*argv)) + switch (**argv) { + case 'a': + do_em_all(); + break; + default: + goto usage_and_exit; + } } - } - swap_enable_disable(*argv); - exit( TRUE); + swap_enable_disable(*argv); + exit(TRUE); -usage_and_exit: - usage( (whichApp==SWAPON_APP)? swapon_usage : swapoff_usage); - exit( FALSE); + usage_and_exit: + usage((whichApp == SWAPON_APP) ? swapon_usage : swapoff_usage); + exit(FALSE); } - @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini sync implementation for busybox * @@ -23,12 +24,10 @@ #include "internal.h" #include <stdio.h> -extern int -sync_main(int argc, char * * argv) +extern int sync_main(int argc, char **argv) { - if ( argc>1 && **(argv+1) == '-' ) { - usage( "sync\n\nWrite all buffered filesystem blocks to disk.\n"); - } - exit( sync()); + if (argc > 1 && **(argv + 1) == '-') { + usage("sync\n\nWrite all buffered filesystem blocks to disk.\n"); + } + exit(sync()); } - diff --git a/sysklogd/logger.c b/sysklogd/logger.c index aab95b984..a9e0afcc8 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini logger implementation for busybox * @@ -39,21 +40,22 @@ */ #include <sys/syslog.h> typedef struct _code { - char *c_name; - int c_val; + char *c_name; + int c_val; } CODE; extern CODE prioritynames[]; extern CODE facilitynames[]; #endif static const char logger_usage[] = - "logger [OPTION]... [MESSAGE]\n\n" - "Write MESSAGE to the system log. If MESSAGE is '-', log stdin.\n\n" - "Options:\n" - "\t-s\tLog to stderr as well as the system log.\n" - "\t-t\tLog using the specified tag (defaults to user name).\n" - "\t-p\tEnter the message with the specified priority.\n" - "\t\tThis may be numerical or a ``facility.level'' pair.\n"; + "logger [OPTION]... [MESSAGE]\n\n" + "Write MESSAGE to the system log. If MESSAGE is '-', log stdin.\n\n" + "Options:\n" + "\t-s\tLog to stderr as well as the system log.\n" + "\t-t\tLog using the specified tag (defaults to user name).\n" + + "\t-p\tEnter the message with the specified priority.\n" + "\t\tThis may be numerical or a ``facility.level'' pair.\n"; /* Decode a symbolic name to a numeric value @@ -61,20 +63,19 @@ static const char logger_usage[] = * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. */ -static int -decode(char* name, CODE* codetab) +static int decode(char *name, CODE * codetab) { - CODE *c; + CODE *c; - if (isdigit(*name)) - return (atoi(name)); - for (c = codetab; c->c_name; c++) { - if (!strcasecmp(name, c->c_name)) { - return (c->c_val); + if (isdigit(*name)) + return (atoi(name)); + for (c = codetab; c->c_name; c++) { + if (!strcasecmp(name, c->c_name)) { + return (c->c_val); + } } - } - return (-1); + return (-1); } /* Decode a symbolic name to a numeric value @@ -82,96 +83,94 @@ decode(char* name, CODE* codetab) * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. */ -static int -pencode(char* s) +static int pencode(char *s) { - char *save; - int lev, fac=LOG_USER; - - for (save = s; *s && *s != '.'; ++s); - if (*s) { - *s = '\0'; - fac = decode(save, facilitynames); - if (fac < 0) { - fprintf(stderr, "unknown facility name: %s\n", save); - exit( FALSE); + char *save; + int lev, fac = LOG_USER; + + for (save = s; *s && *s != '.'; ++s); + if (*s) { + *s = '\0'; + fac = decode(save, facilitynames); + if (fac < 0) { + fprintf(stderr, "unknown facility name: %s\n", save); + exit(FALSE); + } + *s++ = '.'; + } else { + s = save; + } + lev = decode(s, prioritynames); + if (lev < 0) { + fprintf(stderr, "unknown priority name: %s\n", save); + exit(FALSE); } - *s++ = '.'; - } - else { - s = save; - } - lev = decode(s, prioritynames); - if (lev < 0) { - fprintf(stderr, "unknown priority name: %s\n", save); - exit( FALSE); - } - return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); + return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); } extern int logger_main(int argc, char **argv) { - int pri = LOG_USER|LOG_NOTICE; - int option = 0; - int fromStdinFlag=FALSE; - int stopLookingAtMeLikeThat=FALSE; - char *message, buf[1024], name[128]; - - /* Fill out the name string early (may be overwritten later */ - my_getpwuid(name, geteuid()); - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv)+1) == '\0') { - fromStdinFlag=TRUE; - } - stopLookingAtMeLikeThat=FALSE; - while (*(++(*argv)) && stopLookingAtMeLikeThat==FALSE) { - switch (**argv) { - case 's': - option |= LOG_PERROR; - break; - case 'p': - if (--argc == 0) { - usage(logger_usage); + int pri = LOG_USER | LOG_NOTICE; + int option = 0; + int fromStdinFlag = FALSE; + int stopLookingAtMeLikeThat = FALSE; + char *message, buf[1024], name[128]; + + /* Fill out the name string early (may be overwritten later */ + my_getpwuid(name, geteuid()); + + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + if (*((*argv) + 1) == '\0') { + fromStdinFlag = TRUE; } - pri = pencode(*(++argv)); - stopLookingAtMeLikeThat=TRUE; - break; - case 't': - if (--argc == 0) { - usage(logger_usage); + stopLookingAtMeLikeThat = FALSE; + while (*(++(*argv)) && stopLookingAtMeLikeThat == FALSE) { + switch (**argv) { + case 's': + option |= LOG_PERROR; + break; + case 'p': + if (--argc == 0) { + usage(logger_usage); + } + pri = pencode(*(++argv)); + stopLookingAtMeLikeThat = TRUE; + break; + case 't': + if (--argc == 0) { + usage(logger_usage); + } + strncpy(name, *(++argv), sizeof(name)); + stopLookingAtMeLikeThat = TRUE; + break; + default: + usage(logger_usage); + } } - strncpy(name, *(++argv), sizeof(name)); - stopLookingAtMeLikeThat=TRUE; - break; - default: - usage(logger_usage); - } } - } - if (fromStdinFlag==TRUE) { - /* read from stdin */ - int c, i=0; - while ((c = getc(stdin)) != EOF && i<sizeof(buf)) { - buf[i++]=c; - } - message=buf; - } else { - if (argc>=1) { - message = *argv; + if (fromStdinFlag == TRUE) { + /* read from stdin */ + int c, i = 0; + + while ((c = getc(stdin)) != EOF && i < sizeof(buf)) { + buf[i++] = c; + } + message = buf; } else { - fprintf(stderr, "No message\n"); - exit( FALSE); + if (argc >= 1) { + message = *argv; + } else { + fprintf(stderr, "No message\n"); + exit(FALSE); + } } - } - openlog( name, option, (pri | LOG_FACMASK)); - syslog( pri, message); - closelog(); + openlog(name, option, (pri | LOG_FACMASK)); + syslog(pri, message); + closelog(); - exit( TRUE); + exit(TRUE); } - diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index c48d5a435..db535044c 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini syslogd implementation for busybox * @@ -49,266 +50,272 @@ extern int ksyslog(int type, char *buf, int len); #define __LOG_FILE "/var/log/messages" -static char* logFilePath = __LOG_FILE; +static char *logFilePath = __LOG_FILE; + /* interval between marks in seconds */ -static int MarkInterval = 20*60; +static int MarkInterval = 20 * 60; + /* localhost's name */ static char LocalHostName[32]; static const char syslogd_usage[] = - "syslogd [OPTION]...\n\n" - "Linux system and kernel (provides klogd) logging utility.\n" - "Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n" - "Options:\n" - "\t-m\tChange the mark timestamp interval. default=20min. 0=off\n" - "\t-n\tDo not fork into the background (for when run by init)\n" + "syslogd [OPTION]...\n\n" + "Linux system and kernel (provides klogd) logging utility.\n" + "Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n" + "Options:\n" + "\t-m\tChange the mark timestamp interval. default=20min. 0=off\n" + "\t-n\tDo not fork into the background (for when run by init)\n" #ifdef BB_KLOGD - "\t-K\tDo not start up the klogd process (by default syslogd spawns klogd).\n" + "\t-K\tDo not start up the klogd process (by default syslogd spawns klogd).\n" #endif - "\t-O\tSpecify an alternate log file. default=/var/log/messages\n"; + "\t-O\tSpecify an alternate log file. default=/var/log/messages\n"; /* print a message to the log file */ static void message(char *fmt, ...) { - int fd; - va_list arguments; - - if ((fd = device_open(logFilePath, O_WRONLY|O_CREAT|O_NOCTTY|O_APPEND|O_NONBLOCK)) >= 0) { - va_start(arguments, fmt); - vdprintf(fd, fmt, arguments); - va_end(arguments); - close(fd); - } else { - /* Always send console messages to /dev/console so people will see them. */ - if ((fd = device_open(_PATH_CONSOLE, O_WRONLY|O_NOCTTY|O_NONBLOCK)) >= 0) { - va_start(arguments, fmt); - vdprintf(fd, fmt, arguments); - va_end(arguments); - close(fd); + int fd; + va_list arguments; + + if ( + (fd = + device_open(logFilePath, + O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND | + O_NONBLOCK)) >= 0) { + va_start(arguments, fmt); + vdprintf(fd, fmt, arguments); + va_end(arguments); + close(fd); } else { - fprintf(stderr, "Bummer, can't print: "); - va_start(arguments, fmt); - vfprintf(stderr, fmt, arguments); - fflush(stderr); - va_end(arguments); + /* Always send console messages to /dev/console so people will see them. */ + if ( + (fd = + device_open(_PATH_CONSOLE, + O_WRONLY | O_NOCTTY | O_NONBLOCK)) >= 0) { + va_start(arguments, fmt); + vdprintf(fd, fmt, arguments); + va_end(arguments); + close(fd); + } else { + fprintf(stderr, "Bummer, can't print: "); + va_start(arguments, fmt); + vfprintf(stderr, fmt, arguments); + fflush(stderr); + va_end(arguments); + } } - } } -static void logMessage( int pri, char* msg) +static void logMessage(int pri, char *msg) { - time_t now; - char *timestamp; - static char res[20]; - CODE *c_pri, *c_fac; - - for (c_fac=facilitynames; c_fac->c_name && !(c_fac->c_val==LOG_FAC(pri)<<3); c_fac++); - for (c_pri=prioritynames; c_pri->c_name && !(c_pri->c_val==LOG_PRI(pri)); c_pri++); - if (*c_fac->c_name=='\0' || *c_pri->c_name=='\0') - snprintf (res, sizeof(res), "<%d>", pri); - else - snprintf (res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name); - - if (strlen(msg) < 16 || msg[3] != ' ' || msg[6] != ' ' || - msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') - { - time(&now); - timestamp = ctime(&now) + 4; - timestamp[15] = '\0'; - } else { - timestamp = msg; - timestamp[15] = '\0'; - msg += 16; - } - - /* todo: supress duplicates */ - - /* now spew out the message to wherever it is supposed to go */ - message( "%s %s %s %s\n", timestamp, LocalHostName, res, msg); + time_t now; + char *timestamp; + static char res[20]; + CODE *c_pri, *c_fac; + + for (c_fac = facilitynames; + c_fac->c_name && !(c_fac->c_val == LOG_FAC(pri) << 3); c_fac++); + for (c_pri = prioritynames; + c_pri->c_name && !(c_pri->c_val == LOG_PRI(pri)); c_pri++); + if (*c_fac->c_name == '\0' || *c_pri->c_name == '\0') + snprintf(res, sizeof(res), "<%d>", pri); + else + snprintf(res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name); + + if (strlen(msg) < 16 || msg[3] != ' ' || msg[6] != ' ' || + msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') { + time(&now); + timestamp = ctime(&now) + 4; + timestamp[15] = '\0'; + } else { + timestamp = msg; + timestamp[15] = '\0'; + msg += 16; + } + + /* todo: supress duplicates */ + + /* now spew out the message to wherever it is supposed to go */ + message("%s %s %s %s\n", timestamp, LocalHostName, res, msg); } static void quit_signal(int sig) { - logMessage(LOG_SYSLOG|LOG_INFO, "System log daemon exiting."); - unlink( _PATH_LOG); - exit( TRUE); + logMessage(LOG_SYSLOG | LOG_INFO, "System log daemon exiting."); + unlink(_PATH_LOG); + exit(TRUE); } static void restart_signal(int sig) { - /* pretend to restart */ - logMessage(LOG_SYSLOG|LOG_INFO, "syslogd restarting"); + /* pretend to restart */ + logMessage(LOG_SYSLOG | LOG_INFO, "syslogd restarting"); } static void domark(int sig) { - if (MarkInterval > 0) { - logMessage(LOG_SYSLOG|LOG_INFO, "-- MARK --"); - alarm(MarkInterval); - } + if (MarkInterval > 0) { + logMessage(LOG_SYSLOG | LOG_INFO, "-- MARK --"); + alarm(MarkInterval); + } } static void doSyslogd(void) { - struct sockaddr_un sunx; - int fd, conn; - size_t addrLength; - char buf[1024]; - char *q, *p = buf; - int readSize; - - /* Set up sig handlers */ - signal(SIGINT, quit_signal); - signal(SIGTERM, quit_signal); - signal(SIGQUIT, quit_signal); - signal(SIGHUP, restart_signal); - signal(SIGALRM, domark); - alarm(MarkInterval); - - /* Remove any preexisting socket/file */ - unlink(_PATH_LOG); - - memset(&sunx, 0, sizeof(sunx)); - sunx.sun_family = AF_UNIX; /* Unix domain socket */ - strncpy(sunx.sun_path, _PATH_LOG, sizeof(sunx.sun_path)); - if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0 ) { - perror("Couldn't obtain descriptor for socket " _PATH_LOG); - exit( FALSE); - } - - addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path); - if ( (bind(fd, (struct sockaddr *) &sunx, addrLength)) || - (listen(fd, 5)) ) - { - perror("Could not connect to socket " _PATH_LOG); - exit( FALSE); - } - - umask(0); - if (chmod(_PATH_LOG, 0666) < 0) { - perror("Could not set permission on " _PATH_LOG); - exit (FALSE); - } - - logMessage(LOG_SYSLOG|LOG_INFO, "syslogd started: " - "BusyBox v" BB_VER " (" BB_BT ")"); - - - while ((conn = accept(fd, (struct sockaddr *) &sunx, - &addrLength)) >= 0) - { - while ((readSize=read(conn, buf, sizeof(buf))) > 0) - { - char line[1025]; - unsigned char c; - int pri = (LOG_USER|LOG_NOTICE); - - memset (line, 0, sizeof(line)); - p = buf; - q = line; - while ( p && (c = *p) && q < &line[sizeof(line) - 1]) { - if (c == '<') { - /* Parse the magic priority number */ - pri = 0; - while (isdigit(*(++p))) { - pri = 10 * pri + (*p - '0'); - } - if (pri &~ (LOG_FACMASK|LOG_PRIMASK)) - pri = (LOG_USER|LOG_NOTICE); - } else if (c == '\n') { - *q++ = ' '; - } else if (iscntrl(c)&&(c<0177)) { - *q++ = '^'; - *q++ = c ^ 0100; - } else { - *q++ = c; - } - p++; - } - *q = '\0'; + struct sockaddr_un sunx; + int fd, conn; + size_t addrLength; + char buf[1024]; + char *q, *p = buf; + int readSize; + + /* Set up sig handlers */ + signal(SIGINT, quit_signal); + signal(SIGTERM, quit_signal); + signal(SIGQUIT, quit_signal); + signal(SIGHUP, restart_signal); + signal(SIGALRM, domark); + alarm(MarkInterval); + + /* Remove any preexisting socket/file */ + unlink(_PATH_LOG); + + memset(&sunx, 0, sizeof(sunx)); + sunx.sun_family = AF_UNIX; /* Unix domain socket */ + strncpy(sunx.sun_path, _PATH_LOG, sizeof(sunx.sun_path)); + if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { + perror("Couldn't obtain descriptor for socket " _PATH_LOG); + exit(FALSE); + } - /* Now log it */ - logMessage( pri, line); + addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path); + if ((bind(fd, (struct sockaddr *) &sunx, addrLength)) || + (listen(fd, 5))) { + perror("Could not connect to socket " _PATH_LOG); + exit(FALSE); } - close(conn); - } - close(fd); + umask(0); + if (chmod(_PATH_LOG, 0666) < 0) { + perror("Could not set permission on " _PATH_LOG); + exit(FALSE); + } + + logMessage(LOG_SYSLOG | LOG_INFO, "syslogd started: " + "BusyBox v" BB_VER " (" BB_BT ")"); + + + while ((conn = accept(fd, (struct sockaddr *) &sunx, + &addrLength)) >= 0) { + while ((readSize = read(conn, buf, sizeof(buf))) > 0) { + char line[1025]; + unsigned char c; + int pri = (LOG_USER | LOG_NOTICE); + + memset(line, 0, sizeof(line)); + p = buf; + q = line; + while (p && (c = *p) && q < &line[sizeof(line) - 1]) { + if (c == '<') { + /* Parse the magic priority number */ + pri = 0; + while (isdigit(*(++p))) { + pri = 10 * pri + (*p - '0'); + } + if (pri & ~(LOG_FACMASK | LOG_PRIMASK)) + pri = (LOG_USER | LOG_NOTICE); + } else if (c == '\n') { + *q++ = ' '; + } else if (iscntrl(c) && (c < 0177)) { + *q++ = '^'; + *q++ = c ^ 0100; + } else { + *q++ = c; + } + p++; + } + *q = '\0'; + + /* Now log it */ + logMessage(pri, line); + } + close(conn); + } + + close(fd); } #ifdef BB_KLOGD static void klogd_signal(int sig) { - ksyslog(7, NULL, 0); - ksyslog(0, 0, 0); - logMessage(LOG_SYSLOG|LOG_INFO, "Kernel log daemon exiting."); - exit( TRUE); + ksyslog(7, NULL, 0); + ksyslog(0, 0, 0); + logMessage(LOG_SYSLOG | LOG_INFO, "Kernel log daemon exiting."); + exit(TRUE); } static void doKlogd(void) { - int priority=LOG_INFO; - char log_buffer[4096]; - char *logp; - - /* Set up sig handlers */ - signal(SIGINT, klogd_signal); - signal(SIGKILL, klogd_signal); - signal(SIGTERM, klogd_signal); - signal(SIGHUP, klogd_signal); - logMessage(LOG_SYSLOG|LOG_INFO, "klogd started: " - "BusyBox v" BB_VER " (" BB_BT ")"); - - ksyslog(1, NULL, 0); - - while (1) { - /* Use kernel syscalls */ - memset(log_buffer, '\0', sizeof(log_buffer)); - if ( ksyslog(2, log_buffer, sizeof(log_buffer)) < 0 ) { - char message[80]; - if ( errno == EINTR ) - continue; - snprintf(message, 79, "klogd: Error return from sys_sycall: " \ - "%d - %s.\n", errno, strerror(errno)); - logMessage(LOG_SYSLOG|LOG_ERR, message); - exit(1); + int priority = LOG_INFO; + char log_buffer[4096]; + char *logp; + + /* Set up sig handlers */ + signal(SIGINT, klogd_signal); + signal(SIGKILL, klogd_signal); + signal(SIGTERM, klogd_signal); + signal(SIGHUP, klogd_signal); + logMessage(LOG_SYSLOG | LOG_INFO, "klogd started: " + "BusyBox v" BB_VER " (" BB_BT ")"); + + ksyslog(1, NULL, 0); + + while (1) { + /* Use kernel syscalls */ + memset(log_buffer, '\0', sizeof(log_buffer)); + if (ksyslog(2, log_buffer, sizeof(log_buffer)) < 0) { + char message[80]; + + if (errno == EINTR) + continue; + snprintf(message, 79, "klogd: Error return from sys_sycall: " \ + "%d - %s.\n", errno, strerror(errno)); + logMessage(LOG_SYSLOG | LOG_ERR, message); + exit(1); + } + logp = log_buffer; + if (*log_buffer == '<') { + switch (*(log_buffer + 1)) { + case '0': + priority = LOG_EMERG; + break; + case '1': + priority = LOG_ALERT; + break; + case '2': + priority = LOG_CRIT; + break; + case '3': + priority = LOG_ERR; + break; + case '4': + priority = LOG_WARNING; + break; + case '5': + priority = LOG_NOTICE; + break; + case '6': + priority = LOG_INFO; + break; + case '7': + default: + priority = LOG_DEBUG; + } + logp += 3; + } + logMessage(LOG_KERN | priority, logp); } - logp=log_buffer; - if ( *log_buffer == '<' ) - { - switch ( *(log_buffer+1) ) - { - case '0': - priority = LOG_EMERG; - break; - case '1': - priority = LOG_ALERT; - break; - case '2': - priority = LOG_CRIT; - break; - case '3': - priority = LOG_ERR; - break; - case '4': - priority = LOG_WARNING; - break; - case '5': - priority = LOG_NOTICE; - break; - case '6': - priority = LOG_INFO; - break; - case '7': - default: - priority = LOG_DEBUG; - } - logp+=3; - } - logMessage(LOG_KERN|priority, logp); - } } @@ -316,76 +323,75 @@ static void doKlogd(void) extern int syslogd_main(int argc, char **argv) { - int pid, klogd_pid; - int doFork = TRUE; + int pid, klogd_pid; + int doFork = TRUE; + #ifdef BB_KLOGD - int startKlogd = TRUE; + int startKlogd = TRUE; #endif - int stopDoingThat = FALSE; - char *p; - char **argv1=argv; - - while (--argc > 0 && **(++argv1) == '-') { - stopDoingThat = FALSE; - while (stopDoingThat == FALSE && *(++(*argv1))) { - switch (**argv1) { - case 'm': - if (--argc == 0) { - usage(syslogd_usage); - } - MarkInterval = atoi(*(++argv1))*60; - break; - case 'n': - doFork = FALSE; - break; + int stopDoingThat = FALSE; + char *p; + char **argv1 = argv; + + while (--argc > 0 && **(++argv1) == '-') { + stopDoingThat = FALSE; + while (stopDoingThat == FALSE && *(++(*argv1))) { + switch (**argv1) { + case 'm': + if (--argc == 0) { + usage(syslogd_usage); + } + MarkInterval = atoi(*(++argv1)) * 60; + break; + case 'n': + doFork = FALSE; + break; #ifdef BB_KLOGD - case 'K': - startKlogd = FALSE; - break; + case 'K': + startKlogd = FALSE; + break; #endif - case 'O': - if (--argc == 0) { - usage(syslogd_usage); + case 'O': + if (--argc == 0) { + usage(syslogd_usage); + } + logFilePath = *(++argv1); + stopDoingThat = TRUE; + break; + default: + usage(syslogd_usage); + } } - logFilePath = *(++argv1); - stopDoingThat = TRUE; - break; - default: - usage(syslogd_usage); - } } - } - - /* Store away localhost's name before the fork */ - gethostname(LocalHostName, sizeof(LocalHostName)); - if ( (p = strchr(LocalHostName, '.')) ) { - *p++ = '\0'; - } - - if (doFork == TRUE) { - pid = fork(); - if ( pid < 0 ) - exit( pid); - else if ( pid == 0 ) { - strncpy(argv[0], "syslogd",strlen(argv[0])); - doSyslogd(); + + /* Store away localhost's name before the fork */ + gethostname(LocalHostName, sizeof(LocalHostName)); + if ((p = strchr(LocalHostName, '.'))) { + *p++ = '\0'; + } + + if (doFork == TRUE) { + pid = fork(); + if (pid < 0) + exit(pid); + else if (pid == 0) { + strncpy(argv[0], "syslogd", strlen(argv[0])); + doSyslogd(); + } + } else { + doSyslogd(); } - } else { - doSyslogd(); - } #ifdef BB_KLOGD - /* Start up the klogd process */ - if (startKlogd == TRUE) { - klogd_pid = fork(); - if (klogd_pid == 0 ) { - strncpy(argv[0], "klogd", strlen(argv[0])); - doKlogd(); + /* Start up the klogd process */ + if (startKlogd == TRUE) { + klogd_pid = fork(); + if (klogd_pid == 0) { + strncpy(argv[0], "klogd", strlen(argv[0])); + doKlogd(); + } } - } #endif - exit( TRUE); + exit(TRUE); } - - @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini syslogd implementation for busybox * @@ -49,266 +50,272 @@ extern int ksyslog(int type, char *buf, int len); #define __LOG_FILE "/var/log/messages" -static char* logFilePath = __LOG_FILE; +static char *logFilePath = __LOG_FILE; + /* interval between marks in seconds */ -static int MarkInterval = 20*60; +static int MarkInterval = 20 * 60; + /* localhost's name */ static char LocalHostName[32]; static const char syslogd_usage[] = - "syslogd [OPTION]...\n\n" - "Linux system and kernel (provides klogd) logging utility.\n" - "Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n" - "Options:\n" - "\t-m\tChange the mark timestamp interval. default=20min. 0=off\n" - "\t-n\tDo not fork into the background (for when run by init)\n" + "syslogd [OPTION]...\n\n" + "Linux system and kernel (provides klogd) logging utility.\n" + "Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n" + "Options:\n" + "\t-m\tChange the mark timestamp interval. default=20min. 0=off\n" + "\t-n\tDo not fork into the background (for when run by init)\n" #ifdef BB_KLOGD - "\t-K\tDo not start up the klogd process (by default syslogd spawns klogd).\n" + "\t-K\tDo not start up the klogd process (by default syslogd spawns klogd).\n" #endif - "\t-O\tSpecify an alternate log file. default=/var/log/messages\n"; + "\t-O\tSpecify an alternate log file. default=/var/log/messages\n"; /* print a message to the log file */ static void message(char *fmt, ...) { - int fd; - va_list arguments; - - if ((fd = device_open(logFilePath, O_WRONLY|O_CREAT|O_NOCTTY|O_APPEND|O_NONBLOCK)) >= 0) { - va_start(arguments, fmt); - vdprintf(fd, fmt, arguments); - va_end(arguments); - close(fd); - } else { - /* Always send console messages to /dev/console so people will see them. */ - if ((fd = device_open(_PATH_CONSOLE, O_WRONLY|O_NOCTTY|O_NONBLOCK)) >= 0) { - va_start(arguments, fmt); - vdprintf(fd, fmt, arguments); - va_end(arguments); - close(fd); + int fd; + va_list arguments; + + if ( + (fd = + device_open(logFilePath, + O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND | + O_NONBLOCK)) >= 0) { + va_start(arguments, fmt); + vdprintf(fd, fmt, arguments); + va_end(arguments); + close(fd); } else { - fprintf(stderr, "Bummer, can't print: "); - va_start(arguments, fmt); - vfprintf(stderr, fmt, arguments); - fflush(stderr); - va_end(arguments); + /* Always send console messages to /dev/console so people will see them. */ + if ( + (fd = + device_open(_PATH_CONSOLE, + O_WRONLY | O_NOCTTY | O_NONBLOCK)) >= 0) { + va_start(arguments, fmt); + vdprintf(fd, fmt, arguments); + va_end(arguments); + close(fd); + } else { + fprintf(stderr, "Bummer, can't print: "); + va_start(arguments, fmt); + vfprintf(stderr, fmt, arguments); + fflush(stderr); + va_end(arguments); + } } - } } -static void logMessage( int pri, char* msg) +static void logMessage(int pri, char *msg) { - time_t now; - char *timestamp; - static char res[20]; - CODE *c_pri, *c_fac; - - for (c_fac=facilitynames; c_fac->c_name && !(c_fac->c_val==LOG_FAC(pri)<<3); c_fac++); - for (c_pri=prioritynames; c_pri->c_name && !(c_pri->c_val==LOG_PRI(pri)); c_pri++); - if (*c_fac->c_name=='\0' || *c_pri->c_name=='\0') - snprintf (res, sizeof(res), "<%d>", pri); - else - snprintf (res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name); - - if (strlen(msg) < 16 || msg[3] != ' ' || msg[6] != ' ' || - msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') - { - time(&now); - timestamp = ctime(&now) + 4; - timestamp[15] = '\0'; - } else { - timestamp = msg; - timestamp[15] = '\0'; - msg += 16; - } - - /* todo: supress duplicates */ - - /* now spew out the message to wherever it is supposed to go */ - message( "%s %s %s %s\n", timestamp, LocalHostName, res, msg); + time_t now; + char *timestamp; + static char res[20]; + CODE *c_pri, *c_fac; + + for (c_fac = facilitynames; + c_fac->c_name && !(c_fac->c_val == LOG_FAC(pri) << 3); c_fac++); + for (c_pri = prioritynames; + c_pri->c_name && !(c_pri->c_val == LOG_PRI(pri)); c_pri++); + if (*c_fac->c_name == '\0' || *c_pri->c_name == '\0') + snprintf(res, sizeof(res), "<%d>", pri); + else + snprintf(res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name); + + if (strlen(msg) < 16 || msg[3] != ' ' || msg[6] != ' ' || + msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') { + time(&now); + timestamp = ctime(&now) + 4; + timestamp[15] = '\0'; + } else { + timestamp = msg; + timestamp[15] = '\0'; + msg += 16; + } + + /* todo: supress duplicates */ + + /* now spew out the message to wherever it is supposed to go */ + message("%s %s %s %s\n", timestamp, LocalHostName, res, msg); } static void quit_signal(int sig) { - logMessage(LOG_SYSLOG|LOG_INFO, "System log daemon exiting."); - unlink( _PATH_LOG); - exit( TRUE); + logMessage(LOG_SYSLOG | LOG_INFO, "System log daemon exiting."); + unlink(_PATH_LOG); + exit(TRUE); } static void restart_signal(int sig) { - /* pretend to restart */ - logMessage(LOG_SYSLOG|LOG_INFO, "syslogd restarting"); + /* pretend to restart */ + logMessage(LOG_SYSLOG | LOG_INFO, "syslogd restarting"); } static void domark(int sig) { - if (MarkInterval > 0) { - logMessage(LOG_SYSLOG|LOG_INFO, "-- MARK --"); - alarm(MarkInterval); - } + if (MarkInterval > 0) { + logMessage(LOG_SYSLOG | LOG_INFO, "-- MARK --"); + alarm(MarkInterval); + } } static void doSyslogd(void) { - struct sockaddr_un sunx; - int fd, conn; - size_t addrLength; - char buf[1024]; - char *q, *p = buf; - int readSize; - - /* Set up sig handlers */ - signal(SIGINT, quit_signal); - signal(SIGTERM, quit_signal); - signal(SIGQUIT, quit_signal); - signal(SIGHUP, restart_signal); - signal(SIGALRM, domark); - alarm(MarkInterval); - - /* Remove any preexisting socket/file */ - unlink(_PATH_LOG); - - memset(&sunx, 0, sizeof(sunx)); - sunx.sun_family = AF_UNIX; /* Unix domain socket */ - strncpy(sunx.sun_path, _PATH_LOG, sizeof(sunx.sun_path)); - if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0 ) { - perror("Couldn't obtain descriptor for socket " _PATH_LOG); - exit( FALSE); - } - - addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path); - if ( (bind(fd, (struct sockaddr *) &sunx, addrLength)) || - (listen(fd, 5)) ) - { - perror("Could not connect to socket " _PATH_LOG); - exit( FALSE); - } - - umask(0); - if (chmod(_PATH_LOG, 0666) < 0) { - perror("Could not set permission on " _PATH_LOG); - exit (FALSE); - } - - logMessage(LOG_SYSLOG|LOG_INFO, "syslogd started: " - "BusyBox v" BB_VER " (" BB_BT ")"); - - - while ((conn = accept(fd, (struct sockaddr *) &sunx, - &addrLength)) >= 0) - { - while ((readSize=read(conn, buf, sizeof(buf))) > 0) - { - char line[1025]; - unsigned char c; - int pri = (LOG_USER|LOG_NOTICE); - - memset (line, 0, sizeof(line)); - p = buf; - q = line; - while ( p && (c = *p) && q < &line[sizeof(line) - 1]) { - if (c == '<') { - /* Parse the magic priority number */ - pri = 0; - while (isdigit(*(++p))) { - pri = 10 * pri + (*p - '0'); - } - if (pri &~ (LOG_FACMASK|LOG_PRIMASK)) - pri = (LOG_USER|LOG_NOTICE); - } else if (c == '\n') { - *q++ = ' '; - } else if (iscntrl(c)&&(c<0177)) { - *q++ = '^'; - *q++ = c ^ 0100; - } else { - *q++ = c; - } - p++; - } - *q = '\0'; + struct sockaddr_un sunx; + int fd, conn; + size_t addrLength; + char buf[1024]; + char *q, *p = buf; + int readSize; + + /* Set up sig handlers */ + signal(SIGINT, quit_signal); + signal(SIGTERM, quit_signal); + signal(SIGQUIT, quit_signal); + signal(SIGHUP, restart_signal); + signal(SIGALRM, domark); + alarm(MarkInterval); + + /* Remove any preexisting socket/file */ + unlink(_PATH_LOG); + + memset(&sunx, 0, sizeof(sunx)); + sunx.sun_family = AF_UNIX; /* Unix domain socket */ + strncpy(sunx.sun_path, _PATH_LOG, sizeof(sunx.sun_path)); + if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { + perror("Couldn't obtain descriptor for socket " _PATH_LOG); + exit(FALSE); + } - /* Now log it */ - logMessage( pri, line); + addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path); + if ((bind(fd, (struct sockaddr *) &sunx, addrLength)) || + (listen(fd, 5))) { + perror("Could not connect to socket " _PATH_LOG); + exit(FALSE); } - close(conn); - } - close(fd); + umask(0); + if (chmod(_PATH_LOG, 0666) < 0) { + perror("Could not set permission on " _PATH_LOG); + exit(FALSE); + } + + logMessage(LOG_SYSLOG | LOG_INFO, "syslogd started: " + "BusyBox v" BB_VER " (" BB_BT ")"); + + + while ((conn = accept(fd, (struct sockaddr *) &sunx, + &addrLength)) >= 0) { + while ((readSize = read(conn, buf, sizeof(buf))) > 0) { + char line[1025]; + unsigned char c; + int pri = (LOG_USER | LOG_NOTICE); + + memset(line, 0, sizeof(line)); + p = buf; + q = line; + while (p && (c = *p) && q < &line[sizeof(line) - 1]) { + if (c == '<') { + /* Parse the magic priority number */ + pri = 0; + while (isdigit(*(++p))) { + pri = 10 * pri + (*p - '0'); + } + if (pri & ~(LOG_FACMASK | LOG_PRIMASK)) + pri = (LOG_USER | LOG_NOTICE); + } else if (c == '\n') { + *q++ = ' '; + } else if (iscntrl(c) && (c < 0177)) { + *q++ = '^'; + *q++ = c ^ 0100; + } else { + *q++ = c; + } + p++; + } + *q = '\0'; + + /* Now log it */ + logMessage(pri, line); + } + close(conn); + } + + close(fd); } #ifdef BB_KLOGD static void klogd_signal(int sig) { - ksyslog(7, NULL, 0); - ksyslog(0, 0, 0); - logMessage(LOG_SYSLOG|LOG_INFO, "Kernel log daemon exiting."); - exit( TRUE); + ksyslog(7, NULL, 0); + ksyslog(0, 0, 0); + logMessage(LOG_SYSLOG | LOG_INFO, "Kernel log daemon exiting."); + exit(TRUE); } static void doKlogd(void) { - int priority=LOG_INFO; - char log_buffer[4096]; - char *logp; - - /* Set up sig handlers */ - signal(SIGINT, klogd_signal); - signal(SIGKILL, klogd_signal); - signal(SIGTERM, klogd_signal); - signal(SIGHUP, klogd_signal); - logMessage(LOG_SYSLOG|LOG_INFO, "klogd started: " - "BusyBox v" BB_VER " (" BB_BT ")"); - - ksyslog(1, NULL, 0); - - while (1) { - /* Use kernel syscalls */ - memset(log_buffer, '\0', sizeof(log_buffer)); - if ( ksyslog(2, log_buffer, sizeof(log_buffer)) < 0 ) { - char message[80]; - if ( errno == EINTR ) - continue; - snprintf(message, 79, "klogd: Error return from sys_sycall: " \ - "%d - %s.\n", errno, strerror(errno)); - logMessage(LOG_SYSLOG|LOG_ERR, message); - exit(1); + int priority = LOG_INFO; + char log_buffer[4096]; + char *logp; + + /* Set up sig handlers */ + signal(SIGINT, klogd_signal); + signal(SIGKILL, klogd_signal); + signal(SIGTERM, klogd_signal); + signal(SIGHUP, klogd_signal); + logMessage(LOG_SYSLOG | LOG_INFO, "klogd started: " + "BusyBox v" BB_VER " (" BB_BT ")"); + + ksyslog(1, NULL, 0); + + while (1) { + /* Use kernel syscalls */ + memset(log_buffer, '\0', sizeof(log_buffer)); + if (ksyslog(2, log_buffer, sizeof(log_buffer)) < 0) { + char message[80]; + + if (errno == EINTR) + continue; + snprintf(message, 79, "klogd: Error return from sys_sycall: " \ + "%d - %s.\n", errno, strerror(errno)); + logMessage(LOG_SYSLOG | LOG_ERR, message); + exit(1); + } + logp = log_buffer; + if (*log_buffer == '<') { + switch (*(log_buffer + 1)) { + case '0': + priority = LOG_EMERG; + break; + case '1': + priority = LOG_ALERT; + break; + case '2': + priority = LOG_CRIT; + break; + case '3': + priority = LOG_ERR; + break; + case '4': + priority = LOG_WARNING; + break; + case '5': + priority = LOG_NOTICE; + break; + case '6': + priority = LOG_INFO; + break; + case '7': + default: + priority = LOG_DEBUG; + } + logp += 3; + } + logMessage(LOG_KERN | priority, logp); } - logp=log_buffer; - if ( *log_buffer == '<' ) - { - switch ( *(log_buffer+1) ) - { - case '0': - priority = LOG_EMERG; - break; - case '1': - priority = LOG_ALERT; - break; - case '2': - priority = LOG_CRIT; - break; - case '3': - priority = LOG_ERR; - break; - case '4': - priority = LOG_WARNING; - break; - case '5': - priority = LOG_NOTICE; - break; - case '6': - priority = LOG_INFO; - break; - case '7': - default: - priority = LOG_DEBUG; - } - logp+=3; - } - logMessage(LOG_KERN|priority, logp); - } } @@ -316,76 +323,75 @@ static void doKlogd(void) extern int syslogd_main(int argc, char **argv) { - int pid, klogd_pid; - int doFork = TRUE; + int pid, klogd_pid; + int doFork = TRUE; + #ifdef BB_KLOGD - int startKlogd = TRUE; + int startKlogd = TRUE; #endif - int stopDoingThat = FALSE; - char *p; - char **argv1=argv; - - while (--argc > 0 && **(++argv1) == '-') { - stopDoingThat = FALSE; - while (stopDoingThat == FALSE && *(++(*argv1))) { - switch (**argv1) { - case 'm': - if (--argc == 0) { - usage(syslogd_usage); - } - MarkInterval = atoi(*(++argv1))*60; - break; - case 'n': - doFork = FALSE; - break; + int stopDoingThat = FALSE; + char *p; + char **argv1 = argv; + + while (--argc > 0 && **(++argv1) == '-') { + stopDoingThat = FALSE; + while (stopDoingThat == FALSE && *(++(*argv1))) { + switch (**argv1) { + case 'm': + if (--argc == 0) { + usage(syslogd_usage); + } + MarkInterval = atoi(*(++argv1)) * 60; + break; + case 'n': + doFork = FALSE; + break; #ifdef BB_KLOGD - case 'K': - startKlogd = FALSE; - break; + case 'K': + startKlogd = FALSE; + break; #endif - case 'O': - if (--argc == 0) { - usage(syslogd_usage); + case 'O': + if (--argc == 0) { + usage(syslogd_usage); + } + logFilePath = *(++argv1); + stopDoingThat = TRUE; + break; + default: + usage(syslogd_usage); + } } - logFilePath = *(++argv1); - stopDoingThat = TRUE; - break; - default: - usage(syslogd_usage); - } } - } - - /* Store away localhost's name before the fork */ - gethostname(LocalHostName, sizeof(LocalHostName)); - if ( (p = strchr(LocalHostName, '.')) ) { - *p++ = '\0'; - } - - if (doFork == TRUE) { - pid = fork(); - if ( pid < 0 ) - exit( pid); - else if ( pid == 0 ) { - strncpy(argv[0], "syslogd",strlen(argv[0])); - doSyslogd(); + + /* Store away localhost's name before the fork */ + gethostname(LocalHostName, sizeof(LocalHostName)); + if ((p = strchr(LocalHostName, '.'))) { + *p++ = '\0'; + } + + if (doFork == TRUE) { + pid = fork(); + if (pid < 0) + exit(pid); + else if (pid == 0) { + strncpy(argv[0], "syslogd", strlen(argv[0])); + doSyslogd(); + } + } else { + doSyslogd(); } - } else { - doSyslogd(); - } #ifdef BB_KLOGD - /* Start up the klogd process */ - if (startKlogd == TRUE) { - klogd_pid = fork(); - if (klogd_pid == 0 ) { - strncpy(argv[0], "klogd", strlen(argv[0])); - doKlogd(); + /* Start up the klogd process */ + if (startKlogd == TRUE) { + klogd_pid = fork(); + if (klogd_pid == 0) { + strncpy(argv[0], "klogd", strlen(argv[0])); + doKlogd(); + } } - } #endif - exit( TRUE); + exit(TRUE); } - - @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ #include "internal.h" /* This file contains _two_ implementations of tail. One is * a bit more full featured, but costs 6k. The other (i.e. the @@ -68,22 +69,23 @@ static int forever; static int print_headers; const char tail_usage[] = - "tail [OPTION] [FILE]...\n\n" - "Print last 10 lines of each FILE to standard output.\n" - "With more than one FILE, precede each with a header giving the\n" - "file name. With no FILE, or when FILE is -, read standard input.\n\n" - "Options:\n" - "\t-n NUM\t\tPrint last NUM lines instead of first 10\n" - "\t-f\t\tOutput data as the file grows. This version\n" - "\t\t\tof 'tail -f' supports only one file at a time.\n"; + "tail [OPTION] [FILE]...\n\n" + "Print last 10 lines of each FILE to standard output.\n" + "With more than one FILE, precede each with a header giving the\n" + "file name. With no FILE, or when FILE is -, read standard input.\n\n" + "Options:\n" + "\t-n NUM\t\tPrint last NUM lines instead of first 10\n" + + "\t-f\t\tOutput data as the file grows. This version\n" + "\t\t\tof 'tail -f' supports only one file at a time.\n"; static void write_header(const char *filename) { - static int first_file = 1; + static int first_file = 1; - printf("%s==> %s <==\n", (first_file ? "" : "\n"), filename); - first_file = 0; + printf("%s==> %s <==\n", (first_file ? "" : "\n"), filename); + first_file = 0; } /* Print the last N_LINES lines from the end of file FD. @@ -97,57 +99,57 @@ static void write_header(const char *filename) static int file_lines(const char *filename, int fd, long int n_lines, off_t pos) { - char buffer[BUFSIZ]; - int bytes_read; - int i; /* Index into `buffer' for scanning. */ - - if (n_lines == 0) - return 0; + char buffer[BUFSIZ]; + int bytes_read; + int i; /* Index into `buffer' for scanning. */ - /* Set `bytes_read' to the size of the last, probably partial, buffer; - 0 < `bytes_read' <= `BUFSIZ'. */ - bytes_read = pos % BUFSIZ; - if (bytes_read == 0) - bytes_read = BUFSIZ; - /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all - reads will be on block boundaries, which might increase efficiency. */ - pos -= bytes_read; - lseek(fd, pos, SEEK_SET); - bytes_read = fullRead(fd, buffer, bytes_read); - if (bytes_read == -1) - error("read error"); - - /* Count the incomplete line on files that don't end with a newline. */ - if (bytes_read && buffer[bytes_read - 1] != '\n') - --n_lines; - - do { - /* Scan backward, counting the newlines in this bufferfull. */ - for (i = bytes_read - 1; i >= 0; i--) { - /* Have we counted the requested number of newlines yet? */ - if (buffer[i] == '\n' && n_lines-- == 0) { - /* If this newline wasn't the last character in the buffer, - print the text after it. */ - if (i != bytes_read - 1) - XWRITE(STDOUT_FILENO, &buffer[i + 1], - bytes_read - (i + 1)); + if (n_lines == 0) return 0; - } - } - /* Not enough newlines in that bufferfull. */ - if (pos == 0) { - /* Not enough lines in the file; print the entire file. */ - lseek(fd, (off_t) 0, SEEK_SET); - return 0; - } - pos -= BUFSIZ; + + /* Set `bytes_read' to the size of the last, probably partial, buffer; + 0 < `bytes_read' <= `BUFSIZ'. */ + bytes_read = pos % BUFSIZ; + if (bytes_read == 0) + bytes_read = BUFSIZ; + /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all + reads will be on block boundaries, which might increase efficiency. */ + pos -= bytes_read; lseek(fd, pos, SEEK_SET); - } - while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0); - if (bytes_read == -1) - error("read error"); + bytes_read = fullRead(fd, buffer, bytes_read); + if (bytes_read == -1) + error("read error"); + + /* Count the incomplete line on files that don't end with a newline. */ + if (bytes_read && buffer[bytes_read - 1] != '\n') + --n_lines; + + do { + /* Scan backward, counting the newlines in this bufferfull. */ + for (i = bytes_read - 1; i >= 0; i--) { + /* Have we counted the requested number of newlines yet? */ + if (buffer[i] == '\n' && n_lines-- == 0) { + /* If this newline wasn't the last character in the buffer, + print the text after it. */ + if (i != bytes_read - 1) + XWRITE(STDOUT_FILENO, &buffer[i + 1], + bytes_read - (i + 1)); + return 0; + } + } + /* Not enough newlines in that bufferfull. */ + if (pos == 0) { + /* Not enough lines in the file; print the entire file. */ + lseek(fd, (off_t) 0, SEEK_SET); + return 0; + } + pos -= BUFSIZ; + lseek(fd, pos, SEEK_SET); + } + while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0); + if (bytes_read == -1) + error("read error"); - return 0; + return 0; } /* Print the last N_LINES lines from the end of the standard input, @@ -157,100 +159,100 @@ file_lines(const char *filename, int fd, long int n_lines, off_t pos) static int pipe_lines(const char *filename, int fd, long int n_lines) { - struct linebuffer { - int nbytes, nlines; - char buffer[BUFSIZ]; - struct linebuffer *next; - }; - typedef struct linebuffer LBUFFER; - LBUFFER *first, *last, *tmp; - int i; /* Index into buffers. */ - int total_lines = 0; /* Total number of newlines in all buffers. */ - int errors = 0; - - first = last = (LBUFFER *) xmalloc(sizeof(LBUFFER)); - first->nbytes = first->nlines = 0; - first->next = NULL; - tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); - - /* Input is always read into a fresh buffer. */ - while ((tmp->nbytes = fullRead(fd, tmp->buffer, BUFSIZ)) > 0) { - tmp->nlines = 0; - tmp->next = NULL; - - /* Count the number of newlines just read. */ - for (i = 0; i < tmp->nbytes; i++) - if (tmp->buffer[i] == '\n') - ++tmp->nlines; - total_lines += tmp->nlines; - - /* If there is enough room in the last buffer read, just append the new - one to it. This is because when reading from a pipe, `nbytes' can - often be very small. */ - if (tmp->nbytes + last->nbytes < BUFSIZ) { - memcpy(&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); - last->nbytes += tmp->nbytes; - last->nlines += tmp->nlines; - } else { - /* If there's not enough room, link the new buffer onto the end of - the list, then either free up the oldest buffer for the next - read if that would leave enough lines, or else malloc a new one. - Some compaction mechanism is possible but probably not - worthwhile. */ - last = last->next = tmp; - if (total_lines - first->nlines > n_lines) { - tmp = first; - total_lines -= first->nlines; - first = first->next; - } else - tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + struct linebuffer { + int nbytes, nlines; + char buffer[BUFSIZ]; + struct linebuffer *next; + }; + typedef struct linebuffer LBUFFER; + LBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_lines = 0; /* Total number of newlines in all buffers. */ + int errors = 0; + + first = last = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + first->nbytes = first->nlines = 0; + first->next = NULL; + tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = fullRead(fd, tmp->buffer, BUFSIZ)) > 0) { + tmp->nlines = 0; + tmp->next = NULL; + + /* Count the number of newlines just read. */ + for (i = 0; i < tmp->nbytes; i++) + if (tmp->buffer[i] == '\n') + ++tmp->nlines; + total_lines += tmp->nlines; + + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) { + memcpy(&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + last->nlines += tmp->nlines; + } else { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough lines, or else malloc a new one. + Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_lines - first->nlines > n_lines) { + tmp = first; + total_lines -= first->nlines; + first = first->next; + } else + tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + } } - } - if (tmp->nbytes == -1) - error("read error"); - - free((char *) tmp); - - /* This prevents a core dump when the pipe contains no newlines. */ - if (n_lines == 0) - goto free_lbuffers; - - /* Count the incomplete line on files that don't end with a newline. */ - if (last->buffer[last->nbytes - 1] != '\n') { - ++last->nlines; - ++total_lines; - } - - /* Run through the list, printing lines. First, skip over unneeded - buffers. */ - for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) - total_lines -= tmp->nlines; - - /* Find the correct beginning, then print the rest of the file. */ - if (total_lines > n_lines) { - char *cp; - - /* Skip `total_lines' - `n_lines' newlines. We made sure that - `total_lines' - `n_lines' <= `tmp->nlines'. */ - cp = tmp->buffer; - for (i = total_lines - n_lines; i; --i) - while (*cp++ != '\n') - /* Do nothing. */ ; - i = cp - tmp->buffer; - } else - i = 0; - XWRITE(STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); - - for (tmp = tmp->next; tmp; tmp = tmp->next) - XWRITE(STDOUT_FILENO, tmp->buffer, tmp->nbytes); + if (tmp->nbytes == -1) + error("read error"); + + free((char *) tmp); + + /* This prevents a core dump when the pipe contains no newlines. */ + if (n_lines == 0) + goto free_lbuffers; + + /* Count the incomplete line on files that don't end with a newline. */ + if (last->buffer[last->nbytes - 1] != '\n') { + ++last->nlines; + ++total_lines; + } + + /* Run through the list, printing lines. First, skip over unneeded + buffers. */ + for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) + total_lines -= tmp->nlines; + + /* Find the correct beginning, then print the rest of the file. */ + if (total_lines > n_lines) { + char *cp; + + /* Skip `total_lines' - `n_lines' newlines. We made sure that + `total_lines' - `n_lines' <= `tmp->nlines'. */ + cp = tmp->buffer; + for (i = total_lines - n_lines; i; --i) + while (*cp++ != '\n') + /* Do nothing. */ ; + i = cp - tmp->buffer; + } else + i = 0; + XWRITE(STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE(STDOUT_FILENO, tmp->buffer, tmp->nbytes); free_lbuffers: - while (first) { - tmp = first->next; - free((char *) first); - first = tmp; - } - return errors; + while (first) { + tmp = first->next; + free((char *) first); + first = tmp; + } + return errors; } /* Display file FILENAME from the current position in FD to the end. @@ -259,25 +261,25 @@ static int pipe_lines(const char *filename, int fd, long int n_lines) static long dump_remainder(const char *filename, int fd) { - char buffer[BUFSIZ]; - int bytes_read; - long total; + char buffer[BUFSIZ]; + int bytes_read; + long total; - total = 0; + total = 0; output: - while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) { - XWRITE(STDOUT_FILENO, buffer, bytes_read); - total += bytes_read; - } - if (bytes_read == -1) - error("read error"); - if (forever) { - fflush(stdout); - sleep(1); - goto output; - } - - return total; + while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) { + XWRITE(STDOUT_FILENO, buffer, bytes_read); + total += bytes_read; + } + if (bytes_read == -1) + error("read error"); + if (forever) { + fflush(stdout); + sleep(1); + goto output; + } + + return total; } /* Output the last N_LINES lines of file FILENAME open for reading in FD. @@ -285,31 +287,31 @@ static long dump_remainder(const char *filename, int fd) static int tail_lines(const char *filename, int fd, long int n_lines) { - struct stat stats; - off_t length; - - if (print_headers) - write_header(filename); - - if (fstat(fd, &stats)) - error("fstat error"); - - /* Use file_lines only if FD refers to a regular file with - its file pointer positioned at beginning of file. */ - /* FIXME: adding the lseek conjunct is a kludge. - Once there's a reasonable test suite, fix the true culprit: - file_lines. file_lines shouldn't presume that the input - file pointer is initially positioned to beginning of file. */ - if (S_ISREG(stats.st_mode) - && lseek(fd, (off_t) 0, SEEK_CUR) == (off_t) 0) { - length = lseek(fd, (off_t) 0, SEEK_END); - if (length != 0 && file_lines(filename, fd, n_lines, length)) - return 1; - dump_remainder(filename, fd); - } else - return pipe_lines(filename, fd, n_lines); - - return 0; + struct stat stats; + off_t length; + + if (print_headers) + write_header(filename); + + if (fstat(fd, &stats)) + error("fstat error"); + + /* Use file_lines only if FD refers to a regular file with + its file pointer positioned at beginning of file. */ + /* FIXME: adding the lseek conjunct is a kludge. + Once there's a reasonable test suite, fix the true culprit: + file_lines. file_lines shouldn't presume that the input + file pointer is initially positioned to beginning of file. */ + if (S_ISREG(stats.st_mode) + && lseek(fd, (off_t) 0, SEEK_CUR) == (off_t) 0) { + length = lseek(fd, (off_t) 0, SEEK_END); + if (length != 0 && file_lines(filename, fd, n_lines, length)) + return 1; + dump_remainder(filename, fd); + } else + return pipe_lines(filename, fd, n_lines); + + return 0; } /* Display the last N_UNITS lines of file FILENAME. @@ -318,78 +320,78 @@ static int tail_lines(const char *filename, int fd, long int n_lines) static int tail_file(const char *filename, off_t n_units) { - int fd, errors; - - if (!strcmp(filename, "-")) { - filename = "standard input"; - errors = tail_lines(filename, 0, (long) n_units); - } else { - /* Not standard input. */ - fd = open(filename, O_RDONLY); - if (fd == -1) - error("open error"); - - errors = tail_lines(filename, fd, (long) n_units); - close(fd); - } - - return errors; + int fd, errors; + + if (!strcmp(filename, "-")) { + filename = "standard input"; + errors = tail_lines(filename, 0, (long) n_units); + } else { + /* Not standard input. */ + fd = open(filename, O_RDONLY); + if (fd == -1) + error("open error"); + + errors = tail_lines(filename, fd, (long) n_units); + close(fd); + } + + return errors; } extern int tail_main(int argc, char **argv) { - int exit_status = 0; - int n_units = DEFAULT_N_LINES; - int n_tmp, i; - char opt; - - forever = print_headers = 0; - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'f': - forever = 1; - break; - case 'n': - n_tmp = 0; - if (++i < argc) - n_tmp = atoi(argv[i]); - if (n_tmp < 1) - usage(tail_usage); - n_units = n_tmp; - break; - case '-': - case 'h': - usage(tail_usage); - default: - fprintf(stderr, "tail: invalid option -- %c\n", opt); - usage(tail_usage); - } - } else { - break; + int exit_status = 0; + int n_units = DEFAULT_N_LINES; + int n_tmp, i; + char opt; + + forever = print_headers = 0; + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 'f': + forever = 1; + break; + case 'n': + n_tmp = 0; + if (++i < argc) + n_tmp = atoi(argv[i]); + if (n_tmp < 1) + usage(tail_usage); + n_units = n_tmp; + break; + case '-': + case 'h': + usage(tail_usage); + default: + fprintf(stderr, "tail: invalid option -- %c\n", opt); + usage(tail_usage); + } + } else { + break; + } } - } - if (i + 1 < argc) { - if (forever) { - fprintf(stderr, - "tail: option -f is invalid with multiple files\n"); - usage(tail_usage); + if (i + 1 < argc) { + if (forever) { + fprintf(stderr, + "tail: option -f is invalid with multiple files\n"); + usage(tail_usage); + } + print_headers = 1; } - print_headers = 1; - } - if (i >= argc) { - exit_status |= tail_file("-", n_units); - } else { - for (; i < argc; i++) - exit_status |= tail_file(argv[i], n_units); - } + if (i >= argc) { + exit_status |= tail_file("-", n_units); + } else { + for (; i < argc; i++) + exit_status |= tail_file(argv[i], n_units); + } - exit(exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); + exit(exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); } @@ -441,15 +443,15 @@ extern int tail_main(int argc, char **argv) #define NDEBUG 1 -static void detailed_error(int i, int errnum, char* fmt, ...) +static void detailed_error(int i, int errnum, char *fmt, ...) { - va_list arguments; + va_list arguments; - va_start(arguments, fmt); - vfprintf(stderr, fmt, arguments); - fprintf(stderr, "\n%s\n", strerror( errnum)); - va_end(arguments); - exit(i); + va_start(arguments, fmt); + vfprintf(stderr, fmt, arguments); + fprintf(stderr, "\n%s\n", strerror(errnum)); + va_end(arguments); + exit(i); } @@ -494,9 +496,8 @@ static int from_start; static int print_headers; /* When to print the filename banners. */ -enum header_mode -{ - multiple_files, always, never +enum header_mode { + multiple_files, always, never }; /* The name this program was run with. */ @@ -506,8 +507,7 @@ char *program_name; static int have_read_stdin; -static const char tail_usage[] = -"tail [OPTION]... [FILE]...\n\ +static const char tail_usage[] = "tail [OPTION]... [FILE]...\n\ \n\ Print last 10 lines of each FILE to standard output.\n\ With more than one FILE, precede each with a header giving the file name.\n\ @@ -524,15 +524,13 @@ If the first character of N (bytes or lines) is a `+', output begins with \n\ the Nth item from the start of each file, otherwise, print the last N items\n\ in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2).\n\n"; -static void -write_header (const char *filename, const char *comment) +static void write_header(const char *filename, const char *comment) { - static int first_file = 1; + static int first_file = 1; - printf ("%s==> %s%s%s <==\n", (first_file ? "" : "\n"), filename, - (comment ? ": " : ""), - (comment ? comment : "")); - first_file = 0; + printf("%s==> %s%s%s <==\n", (first_file ? "" : "\n"), filename, + (comment ? ": " : ""), (comment ? comment : "")); + first_file = 0; } /* Print the last N_LINES lines from the end of file FD. @@ -544,67 +542,62 @@ write_header (const char *filename, const char *comment) Return 0 if successful, 1 if an error occurred. */ static int -file_lines (const char *filename, int fd, long int n_lines, off_t pos) +file_lines(const char *filename, int fd, long int n_lines, off_t pos) { - char buffer[BUFSIZ]; - int bytes_read; - int i; /* Index into `buffer' for scanning. */ - - if (n_lines == 0) - return 0; - - /* Set `bytes_read' to the size of the last, probably partial, buffer; - 0 < `bytes_read' <= `BUFSIZ'. */ - bytes_read = pos % BUFSIZ; - if (bytes_read == 0) - bytes_read = BUFSIZ; - /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all - reads will be on block boundaries, which might increase efficiency. */ - pos -= bytes_read; - lseek (fd, pos, SEEK_SET); - bytes_read = fullRead (fd, buffer, bytes_read); - if (bytes_read == -1) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - - /* Count the incomplete line on files that don't end with a newline. */ - if (bytes_read && buffer[bytes_read - 1] != '\n') - --n_lines; - - do - { - /* Scan backward, counting the newlines in this bufferfull. */ - for (i = bytes_read - 1; i >= 0; i--) - { - /* Have we counted the requested number of newlines yet? */ - if (buffer[i] == '\n' && n_lines-- == 0) - { - /* If this newline wasn't the last character in the buffer, - print the text after it. */ - if (i != bytes_read - 1) - XWRITE (STDOUT_FILENO, &buffer[i + 1], bytes_read - (i + 1)); - return 0; - } + char buffer[BUFSIZ]; + int bytes_read; + int i; /* Index into `buffer' for scanning. */ + + if (n_lines == 0) + return 0; + + /* Set `bytes_read' to the size of the last, probably partial, buffer; + 0 < `bytes_read' <= `BUFSIZ'. */ + bytes_read = pos % BUFSIZ; + if (bytes_read == 0) + bytes_read = BUFSIZ; + /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all + reads will be on block boundaries, which might increase efficiency. */ + pos -= bytes_read; + lseek(fd, pos, SEEK_SET); + bytes_read = fullRead(fd, buffer, bytes_read); + if (bytes_read == -1) { + detailed_error(0, errno, "%s", filename); + return 1; + } + + /* Count the incomplete line on files that don't end with a newline. */ + if (bytes_read && buffer[bytes_read - 1] != '\n') + --n_lines; + + do { + /* Scan backward, counting the newlines in this bufferfull. */ + for (i = bytes_read - 1; i >= 0; i--) { + /* Have we counted the requested number of newlines yet? */ + if (buffer[i] == '\n' && n_lines-- == 0) { + /* If this newline wasn't the last character in the buffer, + print the text after it. */ + if (i != bytes_read - 1) + XWRITE(STDOUT_FILENO, &buffer[i + 1], + bytes_read - (i + 1)); + return 0; + } + } + /* Not enough newlines in that bufferfull. */ + if (pos == 0) { + /* Not enough lines in the file; print the entire file. */ + lseek(fd, (off_t) 0, SEEK_SET); + return 0; + } + pos -= BUFSIZ; + lseek(fd, pos, SEEK_SET); } - /* Not enough newlines in that bufferfull. */ - if (pos == 0) - { - /* Not enough lines in the file; print the entire file. */ - lseek (fd, (off_t) 0, SEEK_SET); - return 0; + while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0); + if (bytes_read == -1) { + detailed_error(0, errno, "%s", filename); + return 1; } - pos -= BUFSIZ; - lseek (fd, pos, SEEK_SET); - } - while ((bytes_read = fullRead (fd, buffer, BUFSIZ)) > 0); - if (bytes_read == -1) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - return 0; + return 0; } /* Print the last N_LINES lines from the end of the standard input, @@ -612,301 +605,264 @@ file_lines (const char *filename, int fd, long int n_lines, off_t pos) Buffer the text as a linked list of LBUFFERs, adding them as needed. Return 0 if successful, 1 if an error occured. */ -static int -pipe_lines (const char *filename, int fd, long int n_lines) +static int pipe_lines(const char *filename, int fd, long int n_lines) { - struct linebuffer - { - int nbytes, nlines; - char buffer[BUFSIZ]; - struct linebuffer *next; - }; - typedef struct linebuffer LBUFFER; - LBUFFER *first, *last, *tmp; - int i; /* Index into buffers. */ - int total_lines = 0; /* Total number of newlines in all buffers. */ - int errors = 0; - - first = last = (LBUFFER *) xmalloc (sizeof (LBUFFER)); - first->nbytes = first->nlines = 0; - first->next = NULL; - tmp = (LBUFFER *) xmalloc (sizeof (LBUFFER)); - - /* Input is always read into a fresh buffer. */ - while ((tmp->nbytes = fullRead (fd, tmp->buffer, BUFSIZ)) > 0) - { - tmp->nlines = 0; - tmp->next = NULL; - - /* Count the number of newlines just read. */ - for (i = 0; i < tmp->nbytes; i++) - if (tmp->buffer[i] == '\n') - ++tmp->nlines; - total_lines += tmp->nlines; - - /* If there is enough room in the last buffer read, just append the new - one to it. This is because when reading from a pipe, `nbytes' can - often be very small. */ - if (tmp->nbytes + last->nbytes < BUFSIZ) - { - memcpy (&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); - last->nbytes += tmp->nbytes; - last->nlines += tmp->nlines; + struct linebuffer { + int nbytes, nlines; + char buffer[BUFSIZ]; + struct linebuffer *next; + }; + typedef struct linebuffer LBUFFER; + LBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_lines = 0; /* Total number of newlines in all buffers. */ + int errors = 0; + + first = last = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + first->nbytes = first->nlines = 0; + first->next = NULL; + tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = fullRead(fd, tmp->buffer, BUFSIZ)) > 0) { + tmp->nlines = 0; + tmp->next = NULL; + + /* Count the number of newlines just read. */ + for (i = 0; i < tmp->nbytes; i++) + if (tmp->buffer[i] == '\n') + ++tmp->nlines; + total_lines += tmp->nlines; + + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) { + memcpy(&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + last->nlines += tmp->nlines; + } else { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough lines, or else malloc a new one. + Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_lines - first->nlines > n_lines) { + tmp = first; + total_lines -= first->nlines; + first = first->next; + } else + tmp = (LBUFFER *) xmalloc(sizeof(LBUFFER)); + } + } + if (tmp->nbytes == -1) { + detailed_error(0, errno, "%s", filename); + errors = 1; + free((char *) tmp); + goto free_lbuffers; } - else - { - /* If there's not enough room, link the new buffer onto the end of - the list, then either free up the oldest buffer for the next - read if that would leave enough lines, or else malloc a new one. - Some compaction mechanism is possible but probably not - worthwhile. */ - last = last->next = tmp; - if (total_lines - first->nlines > n_lines) - { - tmp = first; - total_lines -= first->nlines; - first = first->next; - } - else - tmp = (LBUFFER *) xmalloc (sizeof (LBUFFER)); + + free((char *) tmp); + + /* This prevents a core dump when the pipe contains no newlines. */ + if (n_lines == 0) + goto free_lbuffers; + + /* Count the incomplete line on files that don't end with a newline. */ + if (last->buffer[last->nbytes - 1] != '\n') { + ++last->nlines; + ++total_lines; + } + + /* Run through the list, printing lines. First, skip over unneeded + buffers. */ + for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) + total_lines -= tmp->nlines; + + /* Find the correct beginning, then print the rest of the file. */ + if (total_lines > n_lines) { + char *cp; + + /* Skip `total_lines' - `n_lines' newlines. We made sure that + `total_lines' - `n_lines' <= `tmp->nlines'. */ + cp = tmp->buffer; + for (i = total_lines - n_lines; i; --i) + while (*cp++ != '\n') + /* Do nothing. */ ; + i = cp - tmp->buffer; + } else + i = 0; + XWRITE(STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE(STDOUT_FILENO, tmp->buffer, tmp->nbytes); + + free_lbuffers: + while (first) { + tmp = first->next; + free((char *) first); + first = tmp; } - } - if (tmp->nbytes == -1) - { - detailed_error (0, errno, "%s", filename); - errors = 1; - free ((char *) tmp); - goto free_lbuffers; - } - - free ((char *) tmp); - - /* This prevents a core dump when the pipe contains no newlines. */ - if (n_lines == 0) - goto free_lbuffers; - - /* Count the incomplete line on files that don't end with a newline. */ - if (last->buffer[last->nbytes - 1] != '\n') - { - ++last->nlines; - ++total_lines; - } - - /* Run through the list, printing lines. First, skip over unneeded - buffers. */ - for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) - total_lines -= tmp->nlines; - - /* Find the correct beginning, then print the rest of the file. */ - if (total_lines > n_lines) - { - char *cp; - - /* Skip `total_lines' - `n_lines' newlines. We made sure that - `total_lines' - `n_lines' <= `tmp->nlines'. */ - cp = tmp->buffer; - for (i = total_lines - n_lines; i; --i) - while (*cp++ != '\n') - /* Do nothing. */ ; - i = cp - tmp->buffer; - } - else - i = 0; - XWRITE (STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); - - for (tmp = tmp->next; tmp; tmp = tmp->next) - XWRITE (STDOUT_FILENO, tmp->buffer, tmp->nbytes); - -free_lbuffers: - while (first) - { - tmp = first->next; - free ((char *) first); - first = tmp; - } - return errors; + return errors; } /* Print the last N_BYTES characters from the end of pipe FD. This is a stripped down version of pipe_lines. Return 0 if successful, 1 if an error occurred. */ -static int -pipe_bytes (const char *filename, int fd, off_t n_bytes) +static int pipe_bytes(const char *filename, int fd, off_t n_bytes) { - struct charbuffer - { - int nbytes; - char buffer[BUFSIZ]; - struct charbuffer *next; - }; - typedef struct charbuffer CBUFFER; - CBUFFER *first, *last, *tmp; - int i; /* Index into buffers. */ - int total_bytes = 0; /* Total characters in all buffers. */ - int errors = 0; - - first = last = (CBUFFER *) xmalloc (sizeof (CBUFFER)); - first->nbytes = 0; - first->next = NULL; - tmp = (CBUFFER *) xmalloc (sizeof (CBUFFER)); - - /* Input is always read into a fresh buffer. */ - while ((tmp->nbytes = fullRead (fd, tmp->buffer, BUFSIZ)) > 0) - { - tmp->next = NULL; - - total_bytes += tmp->nbytes; - /* If there is enough room in the last buffer read, just append the new - one to it. This is because when reading from a pipe, `nbytes' can - often be very small. */ - if (tmp->nbytes + last->nbytes < BUFSIZ) - { - memcpy (&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); - last->nbytes += tmp->nbytes; + struct charbuffer { + int nbytes; + char buffer[BUFSIZ]; + struct charbuffer *next; + }; + typedef struct charbuffer CBUFFER; + CBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_bytes = 0; /* Total characters in all buffers. */ + int errors = 0; + + first = last = (CBUFFER *) xmalloc(sizeof(CBUFFER)); + first->nbytes = 0; + first->next = NULL; + tmp = (CBUFFER *) xmalloc(sizeof(CBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = fullRead(fd, tmp->buffer, BUFSIZ)) > 0) { + tmp->next = NULL; + + total_bytes += tmp->nbytes; + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) { + memcpy(&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + } else { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough characters, or else malloc a new + one. Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_bytes - first->nbytes > n_bytes) { + tmp = first; + total_bytes -= first->nbytes; + first = first->next; + } else { + tmp = (CBUFFER *) xmalloc(sizeof(CBUFFER)); + } + } } - else - { - /* If there's not enough room, link the new buffer onto the end of - the list, then either free up the oldest buffer for the next - read if that would leave enough characters, or else malloc a new - one. Some compaction mechanism is possible but probably not - worthwhile. */ - last = last->next = tmp; - if (total_bytes - first->nbytes > n_bytes) - { - tmp = first; - total_bytes -= first->nbytes; - first = first->next; - } - else - { - tmp = (CBUFFER *) xmalloc (sizeof (CBUFFER)); - } + if (tmp->nbytes == -1) { + detailed_error(0, errno, "%s", filename); + errors = 1; + free((char *) tmp); + goto free_cbuffers; + } + + free((char *) tmp); + + /* Run through the list, printing characters. First, skip over unneeded + buffers. */ + for (tmp = first; total_bytes - tmp->nbytes > n_bytes; tmp = tmp->next) + total_bytes -= tmp->nbytes; + + /* Find the correct beginning, then print the rest of the file. + We made sure that `total_bytes' - `n_bytes' <= `tmp->nbytes'. */ + if (total_bytes > n_bytes) + i = total_bytes - n_bytes; + else + i = 0; + XWRITE(STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE(STDOUT_FILENO, tmp->buffer, tmp->nbytes); + + free_cbuffers: + while (first) { + tmp = first->next; + free((char *) first); + first = tmp; } - } - if (tmp->nbytes == -1) - { - detailed_error (0, errno, "%s", filename); - errors = 1; - free ((char *) tmp); - goto free_cbuffers; - } - - free ((char *) tmp); - - /* Run through the list, printing characters. First, skip over unneeded - buffers. */ - for (tmp = first; total_bytes - tmp->nbytes > n_bytes; tmp = tmp->next) - total_bytes -= tmp->nbytes; - - /* Find the correct beginning, then print the rest of the file. - We made sure that `total_bytes' - `n_bytes' <= `tmp->nbytes'. */ - if (total_bytes > n_bytes) - i = total_bytes - n_bytes; - else - i = 0; - XWRITE (STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); - - for (tmp = tmp->next; tmp; tmp = tmp->next) - XWRITE (STDOUT_FILENO, tmp->buffer, tmp->nbytes); - -free_cbuffers: - while (first) - { - tmp = first->next; - free ((char *) first); - first = tmp; - } - return errors; + return errors; } /* Skip N_BYTES characters from the start of pipe FD, and print any extra characters that were read beyond that. Return 1 on error, 0 if ok. */ -static int -start_bytes (const char *filename, int fd, off_t n_bytes) +static int start_bytes(const char *filename, int fd, off_t n_bytes) { - char buffer[BUFSIZ]; - int bytes_read = 0; - - while (n_bytes > 0 && (bytes_read = fullRead (fd, buffer, BUFSIZ)) > 0) - n_bytes -= bytes_read; - if (bytes_read == -1) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - else if (n_bytes < 0) - XWRITE (STDOUT_FILENO, &buffer[bytes_read + n_bytes], -n_bytes); - return 0; + char buffer[BUFSIZ]; + int bytes_read = 0; + + while (n_bytes > 0 && (bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) + n_bytes -= bytes_read; + if (bytes_read == -1) { + detailed_error(0, errno, "%s", filename); + return 1; + } else if (n_bytes < 0) + XWRITE(STDOUT_FILENO, &buffer[bytes_read + n_bytes], -n_bytes); + return 0; } /* Skip N_LINES lines at the start of file or pipe FD, and print any extra characters that were read beyond that. Return 1 on error, 0 if ok. */ -static int -start_lines (const char *filename, int fd, long int n_lines) +static int start_lines(const char *filename, int fd, long int n_lines) { - char buffer[BUFSIZ]; - int bytes_read = 0; - int bytes_to_skip = 0; - - while (n_lines && (bytes_read = fullRead (fd, buffer, BUFSIZ)) > 0) - { - bytes_to_skip = 0; - while (bytes_to_skip < bytes_read) - if (buffer[bytes_to_skip++] == '\n' && --n_lines == 0) - break; - } - if (bytes_read == -1) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - else if (bytes_to_skip < bytes_read) - { - XWRITE (STDOUT_FILENO, &buffer[bytes_to_skip], - bytes_read - bytes_to_skip); - } - return 0; + char buffer[BUFSIZ]; + int bytes_read = 0; + int bytes_to_skip = 0; + + while (n_lines && (bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) { + bytes_to_skip = 0; + while (bytes_to_skip < bytes_read) + if (buffer[bytes_to_skip++] == '\n' && --n_lines == 0) + break; + } + if (bytes_read == -1) { + detailed_error(0, errno, "%s", filename); + return 1; + } else if (bytes_to_skip < bytes_read) { + XWRITE(STDOUT_FILENO, &buffer[bytes_to_skip], + bytes_read - bytes_to_skip); + } + return 0; } /* Display file FILENAME from the current position in FD to the end. If `forever' is nonzero, keep reading from the end of the file until killed. Return the number of bytes read from the file. */ -static long -dump_remainder (const char *filename, int fd) +static long dump_remainder(const char *filename, int fd) { - char buffer[BUFSIZ]; - int bytes_read; - long total; - - total = 0; -output: - while ((bytes_read = fullRead (fd, buffer, BUFSIZ)) > 0) - { - XWRITE (STDOUT_FILENO, buffer, bytes_read); - total += bytes_read; - } - if (bytes_read == -1) - detailed_error (EXIT_FAILURE, errno, "%s", filename); - if (forever) - { - fflush (stdout); - sleep (1); - goto output; - } - else - { - if (forever_multiple) - fflush (stdout); - } - - return total; + char buffer[BUFSIZ]; + int bytes_read; + long total; + + total = 0; + output: + while ((bytes_read = fullRead(fd, buffer, BUFSIZ)) > 0) { + XWRITE(STDOUT_FILENO, buffer, bytes_read); + total += bytes_read; + } + if (bytes_read == -1) + detailed_error(EXIT_FAILURE, errno, "%s", filename); + if (forever) { + fflush(stdout); + sleep(1); + goto output; + } else { + if (forever_multiple) + fflush(stdout); + } + + return total; } /* Tail NFILES (>1) files forever until killed. The file names are in @@ -916,186 +872,161 @@ output: none of them have changed size in one iteration, we sleep for a second and try again. We do this until the user interrupts us. */ -static void -tail_forever (char **names, int nfiles) +static void tail_forever(char **names, int nfiles) { - int last; - - last = -1; - - while (1) - { - int i; - int changed; - - changed = 0; - for (i = 0; i < nfiles; i++) - { - struct stat stats; - - if (file_descs[i] < 0) - continue; - if (fstat (file_descs[i], &stats) < 0) - { - detailed_error (0, errno, "%s", names[i]); - file_descs[i] = -1; - continue; - } - if (stats.st_size == file_sizes[i]) - continue; - - /* This file has changed size. Print out what we can, and - then keep looping. */ - - changed = 1; - - if (stats.st_size < file_sizes[i]) - { - write_header (names[i], "file truncated"); - last = i; - lseek (file_descs[i], stats.st_size, SEEK_SET); - file_sizes[i] = stats.st_size; - continue; - } - - if (i != last) - { - if (print_headers) - write_header (names[i], NULL); - last = i; - } - file_sizes[i] += dump_remainder (names[i], file_descs[i]); - } + int last; + + last = -1; + + while (1) { + int i; + int changed; + + changed = 0; + for (i = 0; i < nfiles; i++) { + struct stat stats; + + if (file_descs[i] < 0) + continue; + if (fstat(file_descs[i], &stats) < 0) { + detailed_error(0, errno, "%s", names[i]); + file_descs[i] = -1; + continue; + } + if (stats.st_size == file_sizes[i]) + continue; + + /* This file has changed size. Print out what we can, and + then keep looping. */ + + changed = 1; + + if (stats.st_size < file_sizes[i]) { + write_header(names[i], "file truncated"); + last = i; + lseek(file_descs[i], stats.st_size, SEEK_SET); + file_sizes[i] = stats.st_size; + continue; + } + + if (i != last) { + if (print_headers) + write_header(names[i], NULL); + last = i; + } + file_sizes[i] += dump_remainder(names[i], file_descs[i]); + } - /* If none of the files changed size, sleep. */ - if (! changed) - sleep (1); - } + /* If none of the files changed size, sleep. */ + if (!changed) + sleep(1); + } } /* Output the last N_BYTES bytes of file FILENAME open for reading in FD. Return 0 if successful, 1 if an error occurred. */ -static int -tail_bytes (const char *filename, int fd, off_t n_bytes) +static int tail_bytes(const char *filename, int fd, off_t n_bytes) { - struct stat stats; - - /* FIXME: resolve this like in dd.c. */ - /* Use fstat instead of checking for errno == ESPIPE because - lseek doesn't work on some special files but doesn't return an - error, either. */ - if (fstat (fd, &stats)) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - - if (from_start) - { - if (S_ISREG (stats.st_mode)) - lseek (fd, n_bytes, SEEK_CUR); - else if (start_bytes (filename, fd, n_bytes)) - return 1; - dump_remainder (filename, fd); - } - else - { - if (S_ISREG (stats.st_mode)) - { - off_t current_pos, end_pos; - size_t bytes_remaining; - - if ((current_pos = lseek (fd, (off_t) 0, SEEK_CUR)) != -1 - && (end_pos = lseek (fd, (off_t) 0, SEEK_END)) != -1) - { - off_t diff; - /* Be careful here. The current position may actually be - beyond the end of the file. */ - bytes_remaining = (diff = end_pos - current_pos) < 0 ? 0 : diff; - } - else - { - detailed_error (0, errno, "%s", filename); - return 1; - } - - if (bytes_remaining <= n_bytes) - { - /* From the current position to end of file, there are no - more bytes than have been requested. So reposition the - file pointer to the incoming current position and print - everything after that. */ - lseek (fd, current_pos, SEEK_SET); - } - else - { - /* There are more bytes remaining than were requested. - Back up. */ - lseek (fd, -n_bytes, SEEK_END); - } - dump_remainder (filename, fd); + struct stat stats; + + /* FIXME: resolve this like in dd.c. */ + /* Use fstat instead of checking for errno == ESPIPE because + lseek doesn't work on some special files but doesn't return an + error, either. */ + if (fstat(fd, &stats)) { + detailed_error(0, errno, "%s", filename); + return 1; + } + + if (from_start) { + if (S_ISREG(stats.st_mode)) + lseek(fd, n_bytes, SEEK_CUR); + else if (start_bytes(filename, fd, n_bytes)) + return 1; + dump_remainder(filename, fd); + } else { + if (S_ISREG(stats.st_mode)) { + off_t current_pos, end_pos; + size_t bytes_remaining; + + if ((current_pos = lseek(fd, (off_t) 0, SEEK_CUR)) != -1 + && (end_pos = lseek(fd, (off_t) 0, SEEK_END)) != -1) { + off_t diff; + + /* Be careful here. The current position may actually be + beyond the end of the file. */ + bytes_remaining = (diff = + end_pos - current_pos) < 0 ? 0 : diff; + } else { + detailed_error(0, errno, "%s", filename); + return 1; + } + + if (bytes_remaining <= n_bytes) { + /* From the current position to end of file, there are no + more bytes than have been requested. So reposition the + file pointer to the incoming current position and print + everything after that. */ + lseek(fd, current_pos, SEEK_SET); + } else { + /* There are more bytes remaining than were requested. + Back up. */ + lseek(fd, -n_bytes, SEEK_END); + } + dump_remainder(filename, fd); + } else + return pipe_bytes(filename, fd, n_bytes); } - else - return pipe_bytes (filename, fd, n_bytes); - } - return 0; + return 0; } /* Output the last N_LINES lines of file FILENAME open for reading in FD. Return 0 if successful, 1 if an error occurred. */ -static int -tail_lines (const char *filename, int fd, long int n_lines) +static int tail_lines(const char *filename, int fd, long int n_lines) { - struct stat stats; - off_t length; - - if (fstat (fd, &stats)) - { - detailed_error (0, errno, "%s", filename); - return 1; - } - - if (from_start) - { - if (start_lines (filename, fd, n_lines)) - return 1; - dump_remainder (filename, fd); - } - else - { - /* Use file_lines only if FD refers to a regular file with - its file pointer positioned at beginning of file. */ - /* FIXME: adding the lseek conjunct is a kludge. - Once there's a reasonable test suite, fix the true culprit: - file_lines. file_lines shouldn't presume that the input - file pointer is initially positioned to beginning of file. */ - if (S_ISREG (stats.st_mode) - && lseek (fd, (off_t) 0, SEEK_CUR) == (off_t) 0) - { - length = lseek (fd, (off_t) 0, SEEK_END); - if (length != 0 && file_lines (filename, fd, n_lines, length)) - return 1; - dump_remainder (filename, fd); + struct stat stats; + off_t length; + + if (fstat(fd, &stats)) { + detailed_error(0, errno, "%s", filename); + return 1; + } + + if (from_start) { + if (start_lines(filename, fd, n_lines)) + return 1; + dump_remainder(filename, fd); + } else { + /* Use file_lines only if FD refers to a regular file with + its file pointer positioned at beginning of file. */ + /* FIXME: adding the lseek conjunct is a kludge. + Once there's a reasonable test suite, fix the true culprit: + file_lines. file_lines shouldn't presume that the input + file pointer is initially positioned to beginning of file. */ + if (S_ISREG(stats.st_mode) + && lseek(fd, (off_t) 0, SEEK_CUR) == (off_t) 0) { + length = lseek(fd, (off_t) 0, SEEK_END); + if (length != 0 && file_lines(filename, fd, n_lines, length)) + return 1; + dump_remainder(filename, fd); + } else + return pipe_lines(filename, fd, n_lines); } - else - return pipe_lines (filename, fd, n_lines); - } - return 0; + return 0; } /* Display the last N_UNITS units of file FILENAME, open for reading in FD. Return 0 if successful, 1 if an error occurred. */ -static int -tail (const char *filename, int fd, off_t n_units) +static int tail(const char *filename, int fd, off_t n_units) { - if (count_lines) - return tail_lines (filename, fd, (long) n_units); - else - return tail_bytes (filename, fd, n_units); + if (count_lines) + return tail_lines(filename, fd, (long) n_units); + else + return tail_bytes(filename, fd, n_units); } /* Display the last N_UNITS units of file FILENAME. @@ -1103,207 +1034,183 @@ tail (const char *filename, int fd, off_t n_units) FILENUM is this file's index in the list of files the user gave. Return 0 if successful, 1 if an error occurred. */ -static int -tail_file (const char *filename, off_t n_units, int filenum) +static int tail_file(const char *filename, off_t n_units, int filenum) { - int fd, errors; - struct stat stats; - - if (!strcmp (filename, "-")) - { - have_read_stdin = 1; - filename = "standard input"; - if (print_headers) - write_header (filename, NULL); - errors = tail (filename, 0, n_units); - if (forever_multiple) - { - if (fstat (0, &stats) < 0) - { - detailed_error (0, errno, "standard input"); - errors = 1; - } - else if (!S_ISREG (stats.st_mode)) - { - detailed_error (0, 0, - "standard input: cannot follow end of non-regular file"); - errors = 1; - } - if (errors) - file_descs[filenum] = -1; - else - { - file_descs[filenum] = 0; - file_sizes[filenum] = stats.st_size; - } - } - } - else - { - /* Not standard input. */ - fd = open (filename, O_RDONLY); - if (fd == -1) - { - if (forever_multiple) - file_descs[filenum] = -1; - detailed_error (0, errno, "%s", filename); - errors = 1; - } - else - { - if (print_headers) - write_header (filename, NULL); - errors = tail (filename, fd, n_units); - if (forever_multiple) - { - if (fstat (fd, &stats) < 0) - { - detailed_error (0, errno, "%s", filename); - errors = 1; - } - else if (!S_ISREG (stats.st_mode)) - { - detailed_error (0, 0, "%s: cannot follow end of non-regular file", - filename); - errors = 1; - } - if (errors) - { - close (fd); - file_descs[filenum] = -1; - } - else - { - file_descs[filenum] = fd; - file_sizes[filenum] = stats.st_size; + int fd, errors; + struct stat stats; + + if (!strcmp(filename, "-")) { + have_read_stdin = 1; + filename = "standard input"; + if (print_headers) + write_header(filename, NULL); + errors = tail(filename, 0, n_units); + if (forever_multiple) { + if (fstat(0, &stats) < 0) { + detailed_error(0, errno, "standard input"); + errors = 1; + } else if (!S_ISREG(stats.st_mode)) { + detailed_error(0, 0, + "standard input: cannot follow end of non-regular file"); + errors = 1; + } + if (errors) + file_descs[filenum] = -1; + else { + file_descs[filenum] = 0; + file_sizes[filenum] = stats.st_size; + } } - } - else - { - if (close (fd)) - { - detailed_error (0, errno, "%s", filename); - errors = 1; + } else { + /* Not standard input. */ + fd = open(filename, O_RDONLY); + if (fd == -1) { + if (forever_multiple) + file_descs[filenum] = -1; + detailed_error(0, errno, "%s", filename); + errors = 1; + } else { + if (print_headers) + write_header(filename, NULL); + errors = tail(filename, fd, n_units); + if (forever_multiple) { + if (fstat(fd, &stats) < 0) { + detailed_error(0, errno, "%s", filename); + errors = 1; + } else if (!S_ISREG(stats.st_mode)) { + detailed_error(0, 0, + "%s: cannot follow end of non-regular file", + filename); + errors = 1; + } + if (errors) { + close(fd); + file_descs[filenum] = -1; + } else { + file_descs[filenum] = fd; + file_sizes[filenum] = stats.st_size; + } + } else { + if (close(fd)) { + detailed_error(0, errno, "%s", filename); + errors = 1; + } + } } - } } - } - return errors; + return errors; } -extern int -tail_main (int argc, char **argv) +extern int tail_main(int argc, char **argv) { - int stopit = 0; - enum header_mode header_mode = multiple_files; - int exit_status = 0; - /* If from_start, the number of items to skip before printing; otherwise, - the number of items at the end of the file to print. Initially, -1 - means the value has not been set. */ - off_t n_units = -1; - int n_files; - char **file; - - program_name = argv[0]; - have_read_stdin = 0; - count_lines = 1; - forever = forever_multiple = from_start = print_headers = 0; - - /* Parse any options */ - //fprintf(stderr, "argc=%d, argv=%s\n", argc, *argv); - while (--argc > 0 && ( **(++argv) == '-' || **argv == '+' )) { - if (**argv == '+') { - from_start = 1; + int stopit = 0; + enum header_mode header_mode = multiple_files; + int exit_status = 0; + + /* If from_start, the number of items to skip before printing; otherwise, + the number of items at the end of the file to print. Initially, -1 + means the value has not been set. */ + off_t n_units = -1; + int n_files; + char **file; + + program_name = argv[0]; + have_read_stdin = 0; + count_lines = 1; + forever = forever_multiple = from_start = print_headers = 0; + + /* Parse any options */ + //fprintf(stderr, "argc=%d, argv=%s\n", argc, *argv); + while (--argc > 0 && (**(++argv) == '-' || **argv == '+')) { + if (**argv == '+') { + from_start = 1; + } + stopit = 0; + while (stopit == 0 && *(++(*argv))) { + switch (**argv) { + case 'c': + count_lines = 0; + + if (--argc < 1) { + usage(tail_usage); + } + n_units = getNum(*(++argv)); + stopit = 1; + break; + + case 'f': + forever = 1; + break; + + case 'n': + count_lines = 1; + + if (--argc < 1) { + usage(tail_usage); + } + n_units = atol(*(++argv)); + stopit = 1; + break; + + case 'q': + header_mode = never; + break; + + case 'v': + header_mode = always; + break; + + default: + usage(tail_usage); + } + } + } + + + if (n_units == -1) + n_units = DEFAULT_N_LINES; + + /* To start printing with item N_UNITS from the start of the file, skip + N_UNITS - 1 items. `tail +0' is actually meaningless, but for Unix + compatibility it's treated the same as `tail +1'. */ + if (from_start) { + if (n_units) + --n_units; } - stopit = 0; - while (stopit == 0 && *(++(*argv))) { - switch (**argv) { - case 'c': - count_lines = 0; - - if (--argc < 1) { - usage(tail_usage); - } - n_units = getNum(*(++argv)); - stopit = 1; - break; - - case 'f': - forever = 1; - break; - - case 'n': - count_lines = 1; - - if (--argc < 1) { - usage(tail_usage); - } - n_units = atol(*(++argv)); - stopit = 1; - break; - - case 'q': - header_mode = never; - break; - - case 'v': - header_mode = always; - break; - - default: - usage (tail_usage); - } + + n_files = argc; + file = argv; + + if (n_files > 1 && forever) { + forever_multiple = 1; + forever = 0; + file_descs = (int *) xmalloc(n_files * sizeof(int)); + + file_sizes = (off_t *) xmalloc(n_files * sizeof(off_t)); } - } - - - if (n_units == -1) - n_units = DEFAULT_N_LINES; - - /* To start printing with item N_UNITS from the start of the file, skip - N_UNITS - 1 items. `tail +0' is actually meaningless, but for Unix - compatibility it's treated the same as `tail +1'. */ - if (from_start) - { - if (n_units) - --n_units; - } - - n_files = argc; - file = argv; - - if (n_files > 1 && forever) - { - forever_multiple = 1; - forever = 0; - file_descs = (int *) xmalloc (n_files * sizeof (int)); - file_sizes = (off_t *) xmalloc (n_files * sizeof (off_t)); - } - - if (header_mode == always - || (header_mode == multiple_files && n_files > 1)) - print_headers = 1; - - if (n_files == 0) - { - exit_status |= tail_file ("-", n_units, 0); - } - else - { - int i; - for (i = 0; i < n_files; i++) - exit_status |= tail_file (file[i], n_units, i); - - if (forever_multiple) - tail_forever (file, n_files); - } - - if (have_read_stdin && close (0) < 0) - detailed_error (EXIT_FAILURE, errno, "-"); - if (fclose (stdout) == EOF) - detailed_error (EXIT_FAILURE, errno, "write error"); - exit (exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); + + if (header_mode == always + || (header_mode == multiple_files && n_files > 1)) + print_headers = 1; + + if (n_files == 0) { + exit_status |= tail_file("-", n_units, 0); + } else { + int i; + + for (i = 0; i < n_files; i++) + exit_status |= tail_file(file[i], n_units, i); + + if (forever_multiple) + tail_forever(file, n_files); + } + + if (have_read_stdin && close(0) < 0) + detailed_error(EXIT_FAILURE, errno, "-"); + if (fclose(stdout) == EOF) + detailed_error(EXIT_FAILURE, errno, "write error"); + exit(exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini tar implementation for busybox based on code taken from sash. * @@ -40,27 +41,29 @@ #include <utime.h> #include <sys/types.h> #include <sys/sysmacros.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ #ifdef BB_FEATURE_TAR_CREATE static const char tar_usage[] = -"tar -[cxtvOf] [tarFileName] [FILE] ...\n\n" -"Create, extract, or list files from a tar file.\n\n" -"Options:\n" -"\tc=create, x=extract, t=list contents, v=verbose,\n" -"\tO=extract to stdout, f=tarfile or \"-\" for stdin\n"; + "tar -[cxtvOf] [tarFileName] [FILE] ...\n\n" + "Create, extract, or list files from a tar file.\n\n" + "Options:\n" + + "\tc=create, x=extract, t=list contents, v=verbose,\n" + "\tO=extract to stdout, f=tarfile or \"-\" for stdin\n"; #else static const char tar_usage[] = -"tar -[xtvOf] [tarFileName] [FILE] ...\n\n" -"Extract, or list files stored in a tar file. This\n" -"version of tar does not support creation of tar files.\n\n" -"Options:\n" -"\tx=extract, t=list contents, v=verbose,\n" -"\tO=extract to stdout, f=tarfile or \"-\" for stdin\n"; + "tar -[xtvOf] [tarFileName] [FILE] ...\n\n" + "Extract, or list files stored in a tar file. This\n" + "version of tar does not support creation of tar files.\n\n" + "Options:\n" + + "\tx=extract, t=list contents, v=verbose,\n" + "\tO=extract to stdout, f=tarfile or \"-\" for stdin\n"; #endif @@ -78,22 +81,22 @@ static const char tar_usage[] = * with zero padding. We only process this information minimally. */ typedef struct { - char name[TAR_NAME_SIZE]; - char mode[8]; - char uid[8]; - char gid[8]; - char size[12]; - char mtime[12]; - char checkSum[8]; - char typeFlag; - char linkName[TAR_NAME_SIZE]; - char magic[6]; - char version[2]; - char uname[32]; - char gname[32]; - char devMajor[8]; - char devMinor[8]; - char prefix[155]; + char name[TAR_NAME_SIZE]; + char mode[8]; + char uid[8]; + char gid[8]; + char size[12]; + char mtime[12]; + char checkSum[8]; + char typeFlag; + char linkName[TAR_NAME_SIZE]; + char magic[6]; + char version[2]; + char uname[32]; + char gname[32]; + char devMajor[8]; + char devMinor[8]; + char prefix[155]; } TarHeader; #define TAR_MAGIC "ustar" @@ -113,7 +116,7 @@ static int createFlag; static int verboseFlag; static int tostdoutFlag; -static int inHeader; // <- check me +static int inHeader; // <- check me static int badHeader; static int errorFlag; static int skipFileFlag; @@ -140,141 +143,145 @@ static ino_t tarInode; /* * Local procedures to restore files from a tar file. */ -static void readTarFile (int fileCount, char **fileTable); -static void readData (const char *cp, int count); -static long getOctal (const char *cp, int len); +static void readTarFile(int fileCount, char **fileTable); +static void readData(const char *cp, int count); +static long getOctal(const char *cp, int len); + +static void readHeader(const TarHeader * hp, -static void readHeader (const TarHeader * hp, - int fileCount, char **fileTable); + int fileCount, char **fileTable); -static int wantFileName (const char *fileName, - int fileCount, char **fileTable); +static int wantFileName(const char *fileName, + + int fileCount, char **fileTable); #ifdef BB_FEATURE_TAR_CREATE /* * Local procedures to save files into a tar file. */ -static void saveFile (const char *fileName, int seeLinks); +static void saveFile(const char *fileName, int seeLinks); + +static void saveRegularFile(const char *fileName, -static void saveRegularFile (const char *fileName, - const struct stat *statbuf); + const struct stat *statbuf); -static void saveDirectory (const char *fileName, - const struct stat *statbuf); +static void saveDirectory(const char *fileName, -static void writeHeader (const char *fileName, const struct stat *statbuf); + const struct stat *statbuf); -static void writeTarFile (int fileCount, char **fileTable); -static void writeTarBlock (const char *buf, int len); -static int putOctal (char *cp, int len, long value); +static void writeHeader(const char *fileName, const struct stat *statbuf); + +static void writeTarFile(int fileCount, char **fileTable); +static void writeTarBlock(const char *buf, int len); +static int putOctal(char *cp, int len, long value); #endif -extern int tar_main (int argc, char **argv) +extern int tar_main(int argc, char **argv) { - const char *options; - - argc--; - argv++; - - if (argc < 1) - usage( tar_usage); - - - errorFlag = FALSE; - extractFlag = FALSE; - createFlag = FALSE; - listFlag = FALSE; - verboseFlag = FALSE; - tostdoutFlag = FALSE; - tarName = NULL; - tarDev = 0; - tarInode = 0; - tarFd = -1; - - /* - * Parse the options. - */ - if (**argv == '-') - options = (*argv++) + 1; - else - options = (*argv++); - argc--; - - for (; *options; options++) { - switch (*options) { - case 'f': - if (tarName != NULL) { - fprintf (stderr, "Only one 'f' option allowed\n"); - - exit (FALSE); - } - - tarName = *argv++; - argc--; - - break; - - case 't': - if (extractFlag == TRUE || createFlag == TRUE ) - goto flagError; - listFlag = TRUE; - break; - - case 'x': - if (listFlag == TRUE || createFlag == TRUE ) - goto flagError; - extractFlag = TRUE; - break; - case 'c': - if (extractFlag == TRUE || listFlag == TRUE) - goto flagError; - createFlag = TRUE; - break; - - case 'v': - verboseFlag = TRUE; - break; - - case 'O': - tostdoutFlag = TRUE; - break; - - case '-': - usage( tar_usage); - break; - - default: - fprintf (stderr, "Unknown tar flag '%c'\n" - "Try `tar --help' for more information\n", - *options); - exit (FALSE); + const char *options; + + argc--; + argv++; + + if (argc < 1) + usage(tar_usage); + + + errorFlag = FALSE; + extractFlag = FALSE; + createFlag = FALSE; + listFlag = FALSE; + verboseFlag = FALSE; + tostdoutFlag = FALSE; + tarName = NULL; + tarDev = 0; + tarInode = 0; + tarFd = -1; + + /* + * Parse the options. + */ + if (**argv == '-') + options = (*argv++) + 1; + else + options = (*argv++); + argc--; + + for (; *options; options++) { + switch (*options) { + case 'f': + if (tarName != NULL) { + fprintf(stderr, "Only one 'f' option allowed\n"); + + exit(FALSE); + } + + tarName = *argv++; + argc--; + + break; + + case 't': + if (extractFlag == TRUE || createFlag == TRUE) + goto flagError; + listFlag = TRUE; + break; + + case 'x': + if (listFlag == TRUE || createFlag == TRUE) + goto flagError; + extractFlag = TRUE; + break; + case 'c': + if (extractFlag == TRUE || listFlag == TRUE) + goto flagError; + createFlag = TRUE; + break; + + case 'v': + verboseFlag = TRUE; + break; + + case 'O': + tostdoutFlag = TRUE; + break; + + case '-': + usage(tar_usage); + break; + + default: + fprintf(stderr, "Unknown tar flag '%c'\n" + "Try `tar --help' for more information\n", *options); + exit(FALSE); + } } - } - /* - * Do the correct type of action supplying the rest of the - * command line arguments as the list of files to process. - */ - if (createFlag==TRUE) { + /* + * Do the correct type of action supplying the rest of the + * command line arguments as the list of files to process. + */ + if (createFlag == TRUE) { #ifndef BB_FEATURE_TAR_CREATE - fprintf (stderr, "This version of tar was not compiled with tar creation support.\n" ); - exit (FALSE); + fprintf(stderr, + "This version of tar was not compiled with tar creation support.\n"); + exit(FALSE); #else - writeTarFile (argc, argv); -#endif - } else { - readTarFile (argc, argv); - } - if (errorFlag==TRUE) { - fprintf (stderr, "\n"); - } - exit (!errorFlag); - -flagError: - fprintf (stderr, "Exactly one of 'c', 'x' or 't' must be specified\n"); - exit (FALSE); + writeTarFile(argc, argv); +#endif + } else { + readTarFile(argc, argv); + } + if (errorFlag == TRUE) { + fprintf(stderr, "\n"); + } + exit(!errorFlag); + + flagError: + fprintf(stderr, "Exactly one of 'c', 'x' or 't' must be specified\n"); + exit(FALSE); } @@ -282,120 +289,120 @@ flagError: * Read a tar file and extract or list the specified files within it. * If the list is empty than all files are extracted or listed. */ -static void readTarFile (int fileCount, char **fileTable) +static void readTarFile(int fileCount, char **fileTable) { - const char *cp; - int cc; - int inCc; - int blockSize; - char buf[BUF_SIZE]; - - skipFileFlag = FALSE; - badHeader = FALSE; - warnedRoot = FALSE; - eofFlag = FALSE; - inHeader = TRUE; - inCc = 0; - dataCc = 0; - outFd = -1; - blockSize = sizeof (buf); - cp = buf; - - /* - * Open the tar file for reading. - */ - if ((tarName == NULL) || !strcmp (tarName, "-")) { - tarFd = fileno(stdin); - } else - tarFd = open (tarName, O_RDONLY); - - if (tarFd < 0) { - perror (tarName); - errorFlag = TRUE; - return; - } - - /* - * Read blocks from the file until an end of file header block - * has been seen. (A real end of file from a read is an error.) - */ - while (eofFlag==FALSE) { + const char *cp; + int cc; + int inCc; + int blockSize; + char buf[BUF_SIZE]; + + skipFileFlag = FALSE; + badHeader = FALSE; + warnedRoot = FALSE; + eofFlag = FALSE; + inHeader = TRUE; + inCc = 0; + dataCc = 0; + outFd = -1; + blockSize = sizeof(buf); + cp = buf; + /* - * Read the next block of data if necessary. - * This will be a large block if possible, which we will - * then process in the small tar blocks. + * Open the tar file for reading. */ - if (inCc <= 0) { - cp = buf; - inCc = fullRead (tarFd, buf, blockSize); - - if (inCc < 0) { - perror (tarName); - errorFlag = TRUE; - goto done; - } + if ((tarName == NULL) || !strcmp(tarName, "-")) { + tarFd = fileno(stdin); + } else + tarFd = open(tarName, O_RDONLY); - if (inCc == 0) { - fprintf (stderr, - "Unexpected end of file from \"%s\"", tarName); + if (tarFd < 0) { + perror(tarName); errorFlag = TRUE; - goto done; - } + return; } /* - * If we are expecting a header block then examine it. + * Read blocks from the file until an end of file header block + * has been seen. (A real end of file from a read is an error.) */ - if (inHeader==TRUE) { - readHeader ((const TarHeader *) cp, fileCount, fileTable); - - cp += TAR_BLOCK_SIZE; - inCc -= TAR_BLOCK_SIZE; - - continue; + while (eofFlag == FALSE) { + /* + * Read the next block of data if necessary. + * This will be a large block if possible, which we will + * then process in the small tar blocks. + */ + if (inCc <= 0) { + cp = buf; + inCc = fullRead(tarFd, buf, blockSize); + + if (inCc < 0) { + perror(tarName); + errorFlag = TRUE; + goto done; + } + + if (inCc == 0) { + fprintf(stderr, + "Unexpected end of file from \"%s\"", tarName); + errorFlag = TRUE; + goto done; + } + } + + /* + * If we are expecting a header block then examine it. + */ + if (inHeader == TRUE) { + readHeader((const TarHeader *) cp, fileCount, fileTable); + + cp += TAR_BLOCK_SIZE; + inCc -= TAR_BLOCK_SIZE; + + continue; + } + + /* + * We are currently handling the data for a file. + * Process the minimum of the amount of data we have available + * and the amount left to be processed for the file. + */ + cc = inCc; + + if (cc > dataCc) + cc = dataCc; + + readData(cp, cc); + + /* + * If the amount left isn't an exact multiple of the tar block + * size then round it up to the next block boundary since there + * is padding at the end of the file. + */ + if (cc % TAR_BLOCK_SIZE) + cc += TAR_BLOCK_SIZE - (cc % TAR_BLOCK_SIZE); + + cp += cc; + inCc -= cc; } + done: /* - * We are currently handling the data for a file. - * Process the minimum of the amount of data we have available - * and the amount left to be processed for the file. + * Close the tar file if needed. */ - cc = inCc; - - if (cc > dataCc) - cc = dataCc; - - readData (cp, cc); + if ((tarFd >= 0) && (close(tarFd) < 0)) + perror(tarName); /* - * If the amount left isn't an exact multiple of the tar block - * size then round it up to the next block boundary since there - * is padding at the end of the file. + * Close the output file if needed. + * This is only done here on a previous error and so no + * message is required on errors. */ - if (cc % TAR_BLOCK_SIZE) - cc += TAR_BLOCK_SIZE - (cc % TAR_BLOCK_SIZE); - - cp += cc; - inCc -= cc; - } - - done: - /* - * Close the tar file if needed. - */ - if ((tarFd >= 0) && (close (tarFd) < 0)) - perror (tarName); - - /* - * Close the output file if needed. - * This is only done here on a previous error and so no - * message is required on errors. - */ - if (tostdoutFlag == FALSE) { - if (outFd >= 0) { - close (outFd); + if (tostdoutFlag == FALSE) { + if (outFd >= 0) { + close(outFd); + } } - } } @@ -405,304 +412,305 @@ static void readTarFile (int fileCount, char **fileTable) * the end of the tar file. */ static void -readHeader (const TarHeader * hp, int fileCount, char **fileTable) +readHeader(const TarHeader * hp, int fileCount, char **fileTable) { - int checkSum; - int cc; - int hardLink; - int softLink; - int devFileFlag; - unsigned int major; - unsigned int minor; - long size; - struct utimbuf utb; - - /* - * If the block is completely empty, then this is the end of the - * archive file. If the name is null, then just skip this header. - */ - outName = hp->name; - - if (*outName == '\0') { - for (cc = TAR_BLOCK_SIZE; cc > 0; cc--) { - if (*outName++) + int checkSum; + int cc; + int hardLink; + int softLink; + int devFileFlag; + unsigned int major; + unsigned int minor; + long size; + struct utimbuf utb; + + /* + * If the block is completely empty, then this is the end of the + * archive file. If the name is null, then just skip this header. + */ + outName = hp->name; + + if (*outName == '\0') { + for (cc = TAR_BLOCK_SIZE; cc > 0; cc--) { + if (*outName++) + return; + } + + eofFlag = TRUE; + return; } - eofFlag = TRUE; - - return; - } - - /* - * There is another file in the archive to examine. - * Extract the encoded information and check it. - */ - mode = getOctal (hp->mode, sizeof (hp->mode)); - uid = getOctal (hp->uid, sizeof (hp->uid)); - gid = getOctal (hp->gid, sizeof (hp->gid)); - size = getOctal (hp->size, sizeof (hp->size)); - mtime = getOctal (hp->mtime, sizeof (hp->mtime)); - checkSum = getOctal (hp->checkSum, sizeof (hp->checkSum)); - major = getOctal (hp->devMajor, sizeof (hp->devMajor)); - minor = getOctal (hp->devMinor, sizeof (hp->devMinor)); - - if ((mode < 0) || (uid < 0) || (gid < 0) || (size < 0)) { - if (badHeader==FALSE) - fprintf (stderr, "Bad tar header, skipping\n"); - - badHeader = TRUE; - - return; - } - - badHeader = FALSE; - skipFileFlag = FALSE; - devFileFlag = FALSE; - - /* - * Check for the file modes. - */ - hardLink = ((hp->typeFlag == TAR_TYPE_HARD_LINK) || - (hp->typeFlag == TAR_TYPE_HARD_LINK - '0')); - - softLink = ((hp->typeFlag == TAR_TYPE_SOFT_LINK) || - (hp->typeFlag == TAR_TYPE_SOFT_LINK - '0')); - - /* - * Check for a directory. - */ - if (outName[strlen (outName) - 1] == '/') - mode |= S_IFDIR; - - /* - * Check for absolute paths in the file. - * If we find any, then warn the user and make them relative. - */ - if (*outName == '/') { - while (*outName == '/') - outName++; - - if (warnedRoot==FALSE) { - fprintf (stderr, - "Absolute path detected, removing leading slashes\n"); - } + /* + * There is another file in the archive to examine. + * Extract the encoded information and check it. + */ + mode = getOctal(hp->mode, sizeof(hp->mode)); + uid = getOctal(hp->uid, sizeof(hp->uid)); + gid = getOctal(hp->gid, sizeof(hp->gid)); + size = getOctal(hp->size, sizeof(hp->size)); + mtime = getOctal(hp->mtime, sizeof(hp->mtime)); + checkSum = getOctal(hp->checkSum, sizeof(hp->checkSum)); + major = getOctal(hp->devMajor, sizeof(hp->devMajor)); + minor = getOctal(hp->devMinor, sizeof(hp->devMinor)); - warnedRoot = TRUE; - } - - /* - * See if we want this file to be restored. - * If not, then set up to skip it. - */ - if (wantFileName (outName, fileCount, fileTable) == FALSE) { - if ( !hardLink && !softLink && (S_ISREG (mode) || S_ISCHR (mode) - || S_ISBLK (mode) || S_ISSOCK(mode) || S_ISFIFO(mode) ) ) { - inHeader = (size == 0)? TRUE : FALSE; - dataCc = size; - } + if ((mode < 0) || (uid < 0) || (gid < 0) || (size < 0)) { + if (badHeader == FALSE) + fprintf(stderr, "Bad tar header, skipping\n"); - skipFileFlag = TRUE; - - return; - } - - /* - * This file is to be handled. - * If we aren't extracting then just list information about the file. - */ - if (extractFlag==FALSE) { - if (verboseFlag==TRUE) { - printf ("%s %3d/%-d ", modeString (mode), uid, gid); - if( S_ISCHR (mode) || S_ISBLK (mode) ) - printf ("%4d,%4d %s ", major,minor, timeString (mtime)); - else - printf ("%9ld %s ", size, timeString (mtime)); - } - printf ("%s", outName); - - if (hardLink) - printf (" (link to \"%s\")", hp->linkName); - else if (softLink) - printf (" (symlink to \"%s\")", hp->linkName); - else if (S_ISREG (mode) || S_ISCHR (mode) || S_ISBLK (mode) || - S_ISSOCK(mode) || S_ISFIFO(mode) ) { - inHeader = (size == 0)? TRUE : FALSE; - dataCc = size; + badHeader = TRUE; + + return; } - printf ("\n"); + badHeader = FALSE; + skipFileFlag = FALSE; + devFileFlag = FALSE; - return; - } + /* + * Check for the file modes. + */ + hardLink = ((hp->typeFlag == TAR_TYPE_HARD_LINK) || + (hp->typeFlag == TAR_TYPE_HARD_LINK - '0')); + + softLink = ((hp->typeFlag == TAR_TYPE_SOFT_LINK) || + (hp->typeFlag == TAR_TYPE_SOFT_LINK - '0')); + + /* + * Check for a directory. + */ + if (outName[strlen(outName) - 1] == '/') + mode |= S_IFDIR; + + /* + * Check for absolute paths in the file. + * If we find any, then warn the user and make them relative. + */ + if (*outName == '/') { + while (*outName == '/') + outName++; - /* - * We really want to extract the file. - */ - if (verboseFlag==TRUE) - printf ("x %s\n", outName); + if (warnedRoot == FALSE) { + fprintf(stderr, + "Absolute path detected, removing leading slashes\n"); + } - if (hardLink) { - if (link (hp->linkName, outName) < 0) { - perror (outName); - return; + warnedRoot = TRUE; } - /* Set the file time */ - utb.actime = mtime; - utb.modtime = mtime; - utime (outName, &utb); - /* Set the file permissions */ - chown(outName, uid, gid); - chmod(outName, mode); - return; - } - - if (softLink) { -#ifdef S_ISLNK - if (symlink (hp->linkName, outName) < 0) { - perror (outName); - return; + + /* + * See if we want this file to be restored. + * If not, then set up to skip it. + */ + if (wantFileName(outName, fileCount, fileTable) == FALSE) { + if (!hardLink && !softLink && (S_ISREG(mode) || S_ISCHR(mode) + || S_ISBLK(mode) || S_ISSOCK(mode) + || S_ISFIFO(mode))) { + inHeader = (size == 0) ? TRUE : FALSE; + dataCc = size; + } + + skipFileFlag = TRUE; + + return; } - /* Try to change ownership of the symlink. - * If libs doesn't support that, don't bother. - * Changing the pointed-to file is the Wrong Thing(tm). + + /* + * This file is to be handled. + * If we aren't extracting then just list information about the file. */ + if (extractFlag == FALSE) { + if (verboseFlag == TRUE) { + printf("%s %3d/%-d ", modeString(mode), uid, gid); + if (S_ISCHR(mode) || S_ISBLK(mode)) + printf("%4d,%4d %s ", major, minor, timeString(mtime)); + else + printf("%9ld %s ", size, timeString(mtime)); + } + printf("%s", outName); + + if (hardLink) + printf(" (link to \"%s\")", hp->linkName); + else if (softLink) + printf(" (symlink to \"%s\")", hp->linkName); + else if (S_ISREG(mode) || S_ISCHR(mode) || S_ISBLK(mode) || + S_ISSOCK(mode) || S_ISFIFO(mode)) { + inHeader = (size == 0) ? TRUE : FALSE; + dataCc = size; + } + + printf("\n"); + + return; + } + + /* + * We really want to extract the file. + */ + if (verboseFlag == TRUE) + printf("x %s\n", outName); + + if (hardLink) { + if (link(hp->linkName, outName) < 0) { + perror(outName); + return; + } + /* Set the file time */ + utb.actime = mtime; + utb.modtime = mtime; + utime(outName, &utb); + /* Set the file permissions */ + chown(outName, uid, gid); + chmod(outName, mode); + return; + } + + if (softLink) { +#ifdef S_ISLNK + if (symlink(hp->linkName, outName) < 0) { + perror(outName); + return; + } + /* Try to change ownership of the symlink. + * If libs doesn't support that, don't bother. + * Changing the pointed-to file is the Wrong Thing(tm). + */ #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - lchown(outName, uid, gid); + lchown(outName, uid, gid); #endif - /* Do not change permissions or date on symlink, - * since it changes the pointed to file instead. duh. */ + /* Do not change permissions or date on symlink, + * since it changes the pointed to file instead. duh. */ #else - fprintf (stderr, "Cannot create symbolic links\n"); + fprintf(stderr, "Cannot create symbolic links\n"); #endif - return; - } - - /* Set the umask for this process so it doesn't - * screw things up. */ - umask(0); - - /* - * If the file is a directory, then just create the path. - */ - if (S_ISDIR (mode)) { - if (createPath (outName, mode)==TRUE) { - /* Set the file time */ - utb.actime = mtime; - utb.modtime = mtime; - utime (outName, &utb); - /* Set the file permissions */ - chown(outName, uid, gid); - chmod(outName, mode); - return; + return; } - return; - } - - /* - * There is a file to write. - * First create the path to it if necessary with default permissions. - */ - createPath (outName, 0777); - - inHeader = (size == 0)? TRUE : FALSE; - dataCc = size; - - /* - * Start the output file. - */ - if (tostdoutFlag == TRUE) - outFd = fileno(stdout); - else { - if ( S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) ) { - devFileFlag = TRUE; - outFd = mknod (outName, mode, makedev(major, minor) ); + + /* Set the umask for this process so it doesn't + * screw things up. */ + umask(0); + + /* + * If the file is a directory, then just create the path. + */ + if (S_ISDIR(mode)) { + if (createPath(outName, mode) == TRUE) { + /* Set the file time */ + utb.actime = mtime; + utb.modtime = mtime; + utime(outName, &utb); + /* Set the file permissions */ + chown(outName, uid, gid); + chmod(outName, mode); + return; + } + return; } - else if (S_ISFIFO(mode) ) { - devFileFlag = TRUE; - outFd = mkfifo(outName, mode); - } else { - outFd = open (outName, O_WRONLY | O_CREAT | O_TRUNC, mode); + + /* + * There is a file to write. + * First create the path to it if necessary with default permissions. + */ + createPath(outName, 0777); + + inHeader = (size == 0) ? TRUE : FALSE; + dataCc = size; + + /* + * Start the output file. + */ + if (tostdoutFlag == TRUE) + outFd = fileno(stdout); + else { + if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode)) { + devFileFlag = TRUE; + outFd = mknod(outName, mode, makedev(major, minor)); + } else if (S_ISFIFO(mode)) { + devFileFlag = TRUE; + outFd = mkfifo(outName, mode); + } else { + outFd = open(outName, O_WRONLY | O_CREAT | O_TRUNC, mode); + } + if (outFd < 0) { + perror(outName); + skipFileFlag = TRUE; + return; + } + /* Set the file time */ + utb.actime = mtime; + utb.modtime = mtime; + utime(outName, &utb); + /* Set the file permissions */ + chown(outName, uid, gid); + chmod(outName, mode); } - if (outFd < 0) { - perror (outName); - skipFileFlag = TRUE; - return; + + + /* + * If the file is empty, then that's all we need to do. + */ + if (size == 0 && (tostdoutFlag == FALSE) && (devFileFlag == FALSE)) { + close(outFd); + outFd = -1; } - /* Set the file time */ - utb.actime = mtime; - utb.modtime = mtime; - utime (outName, &utb); - /* Set the file permissions */ - chown(outName, uid, gid); - chmod(outName, mode); - } - - - /* - * If the file is empty, then that's all we need to do. - */ - if (size == 0 && (tostdoutFlag == FALSE) && (devFileFlag == FALSE)) { - close (outFd); - outFd = -1; - } } /* * Handle a data block of some specified size that was read. */ -static void readData (const char *cp, int count) +static void readData(const char *cp, int count) { - /* - * Reduce the amount of data left in this file. - * If there is no more data left, then we need to read - * the header again. - */ - dataCc -= count; - - if (dataCc <= 0) - inHeader = TRUE; + /* + * Reduce the amount of data left in this file. + * If there is no more data left, then we need to read + * the header again. + */ + dataCc -= count; - /* - * If we aren't extracting files or this file is being - * skipped then do nothing more. - */ - if (extractFlag==FALSE || skipFileFlag==TRUE) - return; - - /* - * Write the data to the output file. - */ - if (fullWrite (outFd, cp, count) < 0) { - perror (outName); - if (tostdoutFlag == FALSE) { - close (outFd); - outFd = -1; + if (dataCc <= 0) + inHeader = TRUE; + + /* + * If we aren't extracting files or this file is being + * skipped then do nothing more. + */ + if (extractFlag == FALSE || skipFileFlag == TRUE) + return; + + /* + * Write the data to the output file. + */ + if (fullWrite(outFd, cp, count) < 0) { + perror(outName); + if (tostdoutFlag == FALSE) { + close(outFd); + outFd = -1; + } + skipFileFlag = TRUE; + return; } - skipFileFlag = TRUE; - return; - } - - /* - * Check if we are done writing to the file now. - */ - if (dataCc <= 0 && tostdoutFlag == FALSE) { - struct utimbuf utb; - if (close (outFd)) - perror (outName); - /* Set the file time */ - utb.actime = mtime; - utb.modtime = mtime; - utime (outName, &utb); - /* Set the file permissions */ - chown(outName, uid, gid); - chmod(outName, mode); + /* + * Check if we are done writing to the file now. + */ + if (dataCc <= 0 && tostdoutFlag == FALSE) { + struct utimbuf utb; + + if (close(outFd)) + perror(outName); - outFd = -1; - } + /* Set the file time */ + utb.actime = mtime; + utb.modtime = mtime; + utime(outName, &utb); + /* Set the file permissions */ + chown(outName, uid, gid); + chmod(outName, mode); + + outFd = -1; + } } @@ -712,40 +720,40 @@ static void readData (const char *cp, int count) * Returns TRUE if the file is selected. */ static int -wantFileName (const char *fileName, int fileCount, char **fileTable) +wantFileName(const char *fileName, int fileCount, char **fileTable) { - const char *pathName; - int fileLength; - int pathLength; - - /* - * If there are no files in the list, then the file is wanted. - */ - if (fileCount == 0) - return TRUE; + const char *pathName; + int fileLength; + int pathLength; + + /* + * If there are no files in the list, then the file is wanted. + */ + if (fileCount == 0) + return TRUE; - fileLength = strlen (fileName); + fileLength = strlen(fileName); - /* - * Check each of the test paths. - */ - while (fileCount-- > 0) { - pathName = *fileTable++; + /* + * Check each of the test paths. + */ + while (fileCount-- > 0) { + pathName = *fileTable++; - pathLength = strlen (pathName); + pathLength = strlen(pathName); - if (fileLength < pathLength) - continue; + if (fileLength < pathLength) + continue; - if (memcmp (fileName, pathName, pathLength) != 0) - continue; + if (memcmp(fileName, pathName, pathLength) != 0) + continue; - if ((fileLength == pathLength) || (fileName[pathLength] == '/')) { - return TRUE; + if ((fileLength == pathLength) || (fileName[pathLength] == '/')) { + return TRUE; + } } - } - return FALSE; + return FALSE; } /* @@ -753,34 +761,34 @@ wantFileName (const char *fileName, int fileCount, char **fileTable) * spaces on both sides of the number and with an optional null character * at the end. Returns -1 on an illegal format. */ -static long getOctal (const char *cp, int len) +static long getOctal(const char *cp, int len) { - long val; + long val; - while ((len > 0) && (*cp == ' ')) { - cp++; - len--; - } + while ((len > 0) && (*cp == ' ')) { + cp++; + len--; + } - if ((len == 0) || !isOctal (*cp)) - return -1; + if ((len == 0) || !isOctal(*cp)) + return -1; - val = 0; + val = 0; - while ((len > 0) && isOctal (*cp)) { - val = val * 8 + *cp++ - '0'; - len--; - } + while ((len > 0) && isOctal(*cp)) { + val = val * 8 + *cp++ - '0'; + len--; + } - while ((len > 0) && (*cp == ' ')) { - cp++; - len--; - } + while ((len > 0) && (*cp == ' ')) { + cp++; + len--; + } - if ((len > 0) && *cp) - return -1; + if ((len > 0) && *cp) + return -1; - return val; + return val; } @@ -795,65 +803,65 @@ static long getOctal (const char *cp, int len) /* * Write a tar file containing the specified files. */ -static void writeTarFile (int fileCount, char **fileTable) +static void writeTarFile(int fileCount, char **fileTable) { - struct stat statbuf; - - /* - * Make sure there is at least one file specified. - */ - if (fileCount <= 0) { - fprintf (stderr, "No files specified to be saved\n"); - errorFlag = TRUE; - } - - /* - * Create the tar file for writing. - */ - if ((tarName == NULL) || !strcmp (tarName, "-")) { - tostdoutFlag = TRUE; - tarFd = fileno(stdout); - } else - tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0666); - - if (tarFd < 0) { - perror (tarName); - errorFlag = TRUE; - return; - } - - /* - * Get the device and inode of the tar file for checking later. - */ - if (fstat (tarFd, &statbuf) < 0) { - perror (tarName); - errorFlag = TRUE; - goto done; - } - - tarDev = statbuf.st_dev; - tarInode = statbuf.st_ino; - - /* - * Append each file name into the archive file. - * Follow symbolic links for these top level file names. - */ - while (errorFlag==FALSE && (fileCount-- > 0)) { - saveFile (*fileTable++, FALSE); - } - - /* - * Now write an empty block of zeroes to end the archive. - */ - writeTarBlock ("", 1); + struct stat statbuf; + + /* + * Make sure there is at least one file specified. + */ + if (fileCount <= 0) { + fprintf(stderr, "No files specified to be saved\n"); + errorFlag = TRUE; + } + + /* + * Create the tar file for writing. + */ + if ((tarName == NULL) || !strcmp(tarName, "-")) { + tostdoutFlag = TRUE; + tarFd = fileno(stdout); + } else + tarFd = open(tarName, O_WRONLY | O_CREAT | O_TRUNC, 0666); + + if (tarFd < 0) { + perror(tarName); + errorFlag = TRUE; + return; + } + + /* + * Get the device and inode of the tar file for checking later. + */ + if (fstat(tarFd, &statbuf) < 0) { + perror(tarName); + errorFlag = TRUE; + goto done; + } + + tarDev = statbuf.st_dev; + tarInode = statbuf.st_ino; + + /* + * Append each file name into the archive file. + * Follow symbolic links for these top level file names. + */ + while (errorFlag == FALSE && (fileCount-- > 0)) { + saveFile(*fileTable++, FALSE); + } + + /* + * Now write an empty block of zeroes to end the archive. + */ + writeTarBlock("", 1); done: - /* - * Close the tar file and check for errors if it was opened. - */ - if ((tostdoutFlag == FALSE) && (tarFd >= 0) && (close (tarFd) < 0)) - perror (tarName); + /* + * Close the tar file and check for errors if it was opened. + */ + if ((tostdoutFlag == FALSE) && (tarFd >= 0) && (close(tarFd) < 0)) + perror(tarName); } /* @@ -863,73 +871,73 @@ static void writeTarFile (int fileCount, char **fileTable) * flag indicates whether or not we want to see symbolic links as * they really are, instead of blindly following them. */ -static void saveFile (const char *fileName, int seeLinks) +static void saveFile(const char *fileName, int seeLinks) { - int status; - struct stat statbuf; + int status; + struct stat statbuf; - if (verboseFlag==TRUE) - printf ("a %s\n", fileName); + if (verboseFlag == TRUE) + printf("a %s\n", fileName); - /* - * Check that the file name will fit in the header. - */ - if (strlen (fileName) >= TAR_NAME_SIZE) { - fprintf (stderr, "%s: File name is too long\n", fileName); + /* + * Check that the file name will fit in the header. + */ + if (strlen(fileName) >= TAR_NAME_SIZE) { + fprintf(stderr, "%s: File name is too long\n", fileName); - return; - } + return; + } - /* - * Find out about the file. - */ + /* + * Find out about the file. + */ #ifdef S_ISLNK - if (seeLinks==TRUE) - status = lstat (fileName, &statbuf); - else + if (seeLinks == TRUE) + status = lstat(fileName, &statbuf); + else #endif - status = stat (fileName, &statbuf); + status = stat(fileName, &statbuf); - if (status < 0) { - perror (fileName); + if (status < 0) { + perror(fileName); + + return; + } - return; - } + /* + * Make sure we aren't trying to save our file into itself. + */ + if ((statbuf.st_dev == tarDev) && (statbuf.st_ino == tarInode)) { + fprintf(stderr, "Skipping saving of archive file itself\n"); - /* - * Make sure we aren't trying to save our file into itself. - */ - if ((statbuf.st_dev == tarDev) && (statbuf.st_ino == tarInode)) { - fprintf (stderr, "Skipping saving of archive file itself\n"); + return; + } - return; - } + /* + * Check the type of file. + */ + mode = statbuf.st_mode; - /* - * Check the type of file. - */ - mode = statbuf.st_mode; + if (S_ISDIR(mode)) { + saveDirectory(fileName, &statbuf); - if (S_ISDIR (mode)) { - saveDirectory (fileName, &statbuf); + return; + } + if (S_ISREG(mode)) { + saveRegularFile(fileName, &statbuf); - return; - } - if (S_ISREG (mode)) { - saveRegularFile (fileName, &statbuf); + return; + } - return; - } - - /* Some day add support for tarring these up... but not today. :) */ + /* Some day add support for tarring these up... but not today. :) */ // if (S_ISLNK(mode) || S_ISFIFO(mode) || S_ISBLK(mode) || S_ISCHR (mode) ) { -// fprintf (stderr, "%s: This version of tar can't store this type of file\n", fileName); +// fprintf (stderr, "%s: This version of tar can't store this type of file\n", fileName); // } - /* - * The file is a strange type of file, ignore it. - */ - fprintf (stderr, "%s: not a directory or regular file\n", fileName); + /* + * The file is a strange type of file, ignore it. + */ + fprintf(stderr, "%s: not a directory or regular file\n", fileName); } @@ -937,173 +945,172 @@ static void saveFile (const char *fileName, int seeLinks) * Save a regular file to the tar file. */ static void -saveRegularFile (const char *fileName, const struct stat *statbuf) +saveRegularFile(const char *fileName, const struct stat *statbuf) { - int sawEof; - int fileFd; - int cc; - int dataCount; - long fullDataCount; - char data[TAR_BLOCK_SIZE * 16]; - - /* - * Open the file for reading. - */ - fileFd = open (fileName, O_RDONLY); - - if (fileFd < 0) { - perror (fileName); - - return; - } - - /* - * Write out the header for the file. - */ - writeHeader (fileName, statbuf); - - /* - * Write the data blocks of the file. - * We must be careful to write the amount of data that the stat - * buffer indicated, even if the file has changed size. Otherwise - * the tar file will be incorrect. - */ - fullDataCount = statbuf->st_size; - sawEof = FALSE; - - while (fullDataCount > 0) { - /* - * Get the amount to write this iteration which is - * the minumum of the amount left to write and the - * buffer size. - */ - dataCount = sizeof (data); - - if (dataCount > fullDataCount) - dataCount = (int) fullDataCount; + int sawEof; + int fileFd; + int cc; + int dataCount; + long fullDataCount; + char data[TAR_BLOCK_SIZE * 16]; /* - * Read the data from the file if we haven't seen the - * end of file yet. + * Open the file for reading. */ - cc = 0; - - if (sawEof==FALSE) { - cc = fullRead (fileFd, data, dataCount); + fileFd = open(fileName, O_RDONLY); - if (cc < 0) { - perror (fileName); - - (void) close (fileFd); - errorFlag = TRUE; + if (fileFd < 0) { + perror(fileName); return; - } - - /* - * If the file ended too soon, complain and set - * a flag so we will zero fill the rest of it. - */ - if (cc < dataCount) { - fprintf (stderr, - "%s: Short read - zero filling", fileName); - - sawEof = TRUE; - } } /* - * Zero fill the rest of the data if necessary. + * Write out the header for the file. */ - if (cc < dataCount) - memset (data + cc, 0, dataCount - cc); + writeHeader(fileName, statbuf); /* - * Write the buffer to the TAR file. + * Write the data blocks of the file. + * We must be careful to write the amount of data that the stat + * buffer indicated, even if the file has changed size. Otherwise + * the tar file will be incorrect. */ - writeTarBlock (data, dataCount); - - fullDataCount -= dataCount; - } + fullDataCount = statbuf->st_size; + sawEof = FALSE; + + while (fullDataCount > 0) { + /* + * Get the amount to write this iteration which is + * the minumum of the amount left to write and the + * buffer size. + */ + dataCount = sizeof(data); + + if (dataCount > fullDataCount) + dataCount = (int) fullDataCount; + + /* + * Read the data from the file if we haven't seen the + * end of file yet. + */ + cc = 0; + + if (sawEof == FALSE) { + cc = fullRead(fileFd, data, dataCount); + + if (cc < 0) { + perror(fileName); + + (void) close(fileFd); + errorFlag = TRUE; + + return; + } + + /* + * If the file ended too soon, complain and set + * a flag so we will zero fill the rest of it. + */ + if (cc < dataCount) { + fprintf(stderr, "%s: Short read - zero filling", fileName); + + sawEof = TRUE; + } + } + + /* + * Zero fill the rest of the data if necessary. + */ + if (cc < dataCount) + memset(data + cc, 0, dataCount - cc); + + /* + * Write the buffer to the TAR file. + */ + writeTarBlock(data, dataCount); + + fullDataCount -= dataCount; + } - /* - * Close the file. - */ - if ((tostdoutFlag == FALSE) && close (fileFd) < 0) - fprintf (stderr, "%s: close: %s\n", fileName, strerror (errno)); + /* + * Close the file. + */ + if ((tostdoutFlag == FALSE) && close(fileFd) < 0) + fprintf(stderr, "%s: close: %s\n", fileName, strerror(errno)); } /* * Save a directory and all of its files to the tar file. */ -static void saveDirectory (const char *dirName, const struct stat *statbuf) +static void saveDirectory(const char *dirName, const struct stat *statbuf) { - DIR *dir; - struct dirent *entry; - int needSlash; - char fullName[PATH_MAX + 1]; - - /* - * Construct the directory name as used in the tar file by appending - * a slash character to it. - */ - strcpy (fullName, dirName); - strcat (fullName, "/"); - - /* - * Write out the header for the directory entry. - */ - writeHeader (fullName, statbuf); - - /* - * Open the directory. - */ - dir = opendir (dirName); - - if (dir == NULL) { - fprintf (stderr, "Cannot read directory \"%s\": %s\n", - dirName, strerror (errno)); - - return; - } - - /* - * See if a slash is needed. - */ - needSlash = (*dirName && (dirName[strlen (dirName) - 1] != '/')); - - /* - * Read all of the directory entries and check them, - * except for the current and parent directory entries. - */ - while (errorFlag==FALSE && ((entry = readdir (dir)) != NULL)) { - if ((strcmp (entry->d_name, ".") == 0) || - (strcmp (entry->d_name, "..") == 0)) { - continue; - } + DIR *dir; + struct dirent *entry; + int needSlash; + char fullName[PATH_MAX + 1]; + + /* + * Construct the directory name as used in the tar file by appending + * a slash character to it. + */ + strcpy(fullName, dirName); + strcat(fullName, "/"); + + /* + * Write out the header for the directory entry. + */ + writeHeader(fullName, statbuf); /* - * Build the full path name to the file. + * Open the directory. */ - strcpy (fullName, dirName); + dir = opendir(dirName); + + if (dir == NULL) { + fprintf(stderr, "Cannot read directory \"%s\": %s\n", + dirName, strerror(errno)); - if (needSlash) - strcat (fullName, "/"); + return; + } - strcat (fullName, entry->d_name); + /* + * See if a slash is needed. + */ + needSlash = (*dirName && (dirName[strlen(dirName) - 1] != '/')); /* - * Write this file to the tar file, noticing whether or not - * the file is a symbolic link. + * Read all of the directory entries and check them, + * except for the current and parent directory entries. */ - saveFile (fullName, TRUE); - } + while (errorFlag == FALSE && ((entry = readdir(dir)) != NULL)) { + if ((strcmp(entry->d_name, ".") == 0) || + (strcmp(entry->d_name, "..") == 0)) { + continue; + } + + /* + * Build the full path name to the file. + */ + strcpy(fullName, dirName); + + if (needSlash) + strcat(fullName, "/"); + + strcat(fullName, entry->d_name); + + /* + * Write this file to the tar file, noticing whether or not + * the file is a symbolic link. + */ + saveFile(fullName, TRUE); + } - /* - * All done, close the directory. - */ - closedir (dir); + /* + * All done, close the directory. + */ + closedir(dir); } @@ -1111,54 +1118,54 @@ static void saveDirectory (const char *dirName, const struct stat *statbuf) * Write a tar header for the specified file name and status. * It is assumed that the file name fits. */ -static void writeHeader (const char *fileName, const struct stat *statbuf) +static void writeHeader(const char *fileName, const struct stat *statbuf) { - long checkSum; - const unsigned char *cp; - int len; - TarHeader header; - - /* - * Zero the header block in preparation for filling it in. - */ - memset ((char *) &header, 0, sizeof (header)); - - /* - * Fill in the header. - */ - strcpy (header.name, fileName); - - strncpy (header.magic, TAR_MAGIC, sizeof (header.magic)); - strncpy (header.version, TAR_VERSION, sizeof (header.version)); - - putOctal (header.mode, sizeof (header.mode), statbuf->st_mode & 0777); - putOctal (header.uid, sizeof (header.uid), statbuf->st_uid); - putOctal (header.gid, sizeof (header.gid), statbuf->st_gid); - putOctal (header.size, sizeof (header.size), statbuf->st_size); - putOctal (header.mtime, sizeof (header.mtime), statbuf->st_mtime); - - header.typeFlag = TAR_TYPE_REGULAR; - - /* - * Calculate and store the checksum. - * This is the sum of all of the bytes of the header, - * with the checksum field itself treated as blanks. - */ - memset (header.checkSum, ' ', sizeof (header.checkSum)); - - cp = (const unsigned char *) &header; - len = sizeof (header); - checkSum = 0; - - while (len-- > 0) - checkSum += *cp++; - - putOctal (header.checkSum, sizeof (header.checkSum), checkSum); - - /* - * Write the tar header. - */ - writeTarBlock ((const char *) &header, sizeof (header)); + long checkSum; + const unsigned char *cp; + int len; + TarHeader header; + + /* + * Zero the header block in preparation for filling it in. + */ + memset((char *) &header, 0, sizeof(header)); + + /* + * Fill in the header. + */ + strcpy(header.name, fileName); + + strncpy(header.magic, TAR_MAGIC, sizeof(header.magic)); + strncpy(header.version, TAR_VERSION, sizeof(header.version)); + + putOctal(header.mode, sizeof(header.mode), statbuf->st_mode & 0777); + putOctal(header.uid, sizeof(header.uid), statbuf->st_uid); + putOctal(header.gid, sizeof(header.gid), statbuf->st_gid); + putOctal(header.size, sizeof(header.size), statbuf->st_size); + putOctal(header.mtime, sizeof(header.mtime), statbuf->st_mtime); + + header.typeFlag = TAR_TYPE_REGULAR; + + /* + * Calculate and store the checksum. + * This is the sum of all of the bytes of the header, + * with the checksum field itself treated as blanks. + */ + memset(header.checkSum, ' ', sizeof(header.checkSum)); + + cp = (const unsigned char *) &header; + len = sizeof(header); + checkSum = 0; + + while (len-- > 0) + checkSum += *cp++; + + putOctal(header.checkSum, sizeof(header.checkSum), checkSum); + + /* + * Write the tar header. + */ + writeTarBlock((const char *) &header, sizeof(header)); } @@ -1167,56 +1174,56 @@ static void writeHeader (const char *fileName, const struct stat *statbuf) * The data is always padded out to a multiple of TAR_BLOCK_SIZE. * The errorFlag static variable is set on an error. */ -static void writeTarBlock (const char *buf, int len) +static void writeTarBlock(const char *buf, int len) { - int partialLength; - int completeLength; - char fullBlock[TAR_BLOCK_SIZE]; - - /* - * If we had a write error before, then do nothing more. - */ - if (errorFlag==TRUE) - return; - - /* - * Get the amount of complete and partial blocks. - */ - partialLength = len % TAR_BLOCK_SIZE; - completeLength = len - partialLength; - - /* - * Write all of the complete blocks. - */ - if ((completeLength > 0) && !fullWrite (tarFd, buf, completeLength)) { - perror (tarName); - - errorFlag = TRUE; - - return; - } - - /* - * If there are no partial blocks left, we are done. - */ - if (partialLength == 0) - return; - - /* - * Copy the partial data into a complete block, and pad the rest - * of it with zeroes. - */ - memcpy (fullBlock, buf + completeLength, partialLength); - memset (fullBlock + partialLength, 0, TAR_BLOCK_SIZE - partialLength); - - /* - * Write the last complete block. - */ - if (!fullWrite (tarFd, fullBlock, TAR_BLOCK_SIZE)) { - perror (tarName); - - errorFlag = TRUE; - } + int partialLength; + int completeLength; + char fullBlock[TAR_BLOCK_SIZE]; + + /* + * If we had a write error before, then do nothing more. + */ + if (errorFlag == TRUE) + return; + + /* + * Get the amount of complete and partial blocks. + */ + partialLength = len % TAR_BLOCK_SIZE; + completeLength = len - partialLength; + + /* + * Write all of the complete blocks. + */ + if ((completeLength > 0) && !fullWrite(tarFd, buf, completeLength)) { + perror(tarName); + + errorFlag = TRUE; + + return; + } + + /* + * If there are no partial blocks left, we are done. + */ + if (partialLength == 0) + return; + + /* + * Copy the partial data into a complete block, and pad the rest + * of it with zeroes. + */ + memcpy(fullBlock, buf + completeLength, partialLength); + memset(fullBlock + partialLength, 0, TAR_BLOCK_SIZE - partialLength); + + /* + * Write the last complete block. + */ + if (!fullWrite(tarFd, fullBlock, TAR_BLOCK_SIZE)) { + perror(tarName); + + errorFlag = TRUE; + } } @@ -1225,48 +1232,48 @@ static void writeTarBlock (const char *buf, int len) * The number is zero and space padded and possibly null padded. * Returns TRUE if successful. */ -static int putOctal (char *cp, int len, long value) +static int putOctal(char *cp, int len, long value) { - int tempLength; - char *tempString; - char tempBuffer[32]; - - /* - * Create a string of the specified length with an initial space, - * leading zeroes and the octal number, and a trailing null. - */ - tempString = tempBuffer; - - sprintf (tempString, " %0*lo", len - 2, value); - - tempLength = strlen (tempString) + 1; - - /* - * If the string is too large, suppress the leading space. - */ - if (tempLength > len) { - tempLength--; - tempString++; - } - - /* - * If the string is still too large, suppress the trailing null. - */ - if (tempLength > len) - tempLength--; - - /* - * If the string is still too large, fail. - */ - if (tempLength > len) - return FALSE; + int tempLength; + char *tempString; + char tempBuffer[32]; - /* - * Copy the string to the field. - */ - memcpy (cp, tempString, len); + /* + * Create a string of the specified length with an initial space, + * leading zeroes and the octal number, and a trailing null. + */ + tempString = tempBuffer; - return TRUE; + sprintf(tempString, " %0*lo", len - 2, value); + + tempLength = strlen(tempString) + 1; + + /* + * If the string is too large, suppress the leading space. + */ + if (tempLength > len) { + tempLength--; + tempString++; + } + + /* + * If the string is still too large, suppress the trailing null. + */ + if (tempLength > len) + tempLength--; + + /* + * If the string is still too large, fail. + */ + if (tempLength > len) + return FALSE; + + /* + * Copy the string to the field. + */ + memcpy(cp, tempString, len); + + return TRUE; } #endif @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini tee implementation for busybox * @@ -25,102 +26,100 @@ #include <stdio.h> static const char tee_usage[] = - "tee [OPTION]... [FILE]...\n\n" - "Copy standard input to each FILE, and also to standard output.\n\n" - "Options:\n" - "\t-a\tappend to the given FILEs, do not overwrite\n" + "tee [OPTION]... [FILE]...\n\n" + "Copy standard input to each FILE, and also to standard output.\n\n" + "Options:\n" "\t-a\tappend to the given FILEs, do not overwrite\n" #if 0 - "\t-i\tignore interrupt signals\n" + "\t-i\tignore interrupt signals\n" #endif - ; +; /* FileList _______________________________________________________________ */ #define FL_MAX 1024 static FILE *FileList[FL_MAX]; -static int FL_end; +static int FL_end; + +typedef void (FL_Function) (FILE * file, char c); -typedef void (FL_Function)(FILE *file, char c); - /* apply a function to everything in FileList */ -static void -FL_apply(FL_Function *f, char c) +static void FL_apply(FL_Function * f, char c) { - int i; - for (i = 0; i <= FL_end; i++) { - f(FileList[i], c); - } + int i; + + for (i = 0; i <= FL_end; i++) { + f(FileList[i], c); + } } /* FL_Function for writing to files*/ -static void -tee_fwrite(FILE *file, char c) +static void tee_fwrite(FILE * file, char c) { - fputc(c, file); + fputc(c, file); } /* FL_Function for closing files */ -static void -tee_fclose(FILE *file, char c) +static void tee_fclose(FILE * file, char c) { - fclose(file); + fclose(file); } /* ________________________________________________________________________ */ /* BusyBoxed tee(1) */ -int -tee_main(int argc, char **argv) +int tee_main(int argc, char **argv) { - int i; - char c; - char opt; - char opt_fopen[2] = "w"; - FILE *file; - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'a': - opt_fopen[0] = 'a'; - break; + int i; + char c; + char opt; + char opt_fopen[2] = "w"; + FILE *file; + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case 'a': + opt_fopen[0] = 'a'; + break; #if 0 - case 'i': - fprintf(stderr, "ignore interrupt not implemented\n"); - break; + case 'i': + fprintf(stderr, "ignore interrupt not implemented\n"); + break; #endif - default: - usage(tee_usage); - } - } else { - break; + default: + usage(tee_usage); + } + } else { + break; + } } - } - - /* init FILE pointers */ - FL_end = 0; - FileList[0] = stdout; - for ( ; i < argc; i++) { - /* add a file to FileList */ - file = fopen(argv[i], opt_fopen); - if (!file) { continue; } - if (FL_end < FL_MAX) { - FileList[++FL_end] = file; + + /* init FILE pointers */ + FL_end = 0; + FileList[0] = stdout; + for (; i < argc; i++) { + /* add a file to FileList */ + file = fopen(argv[i], opt_fopen); + if (!file) { + continue; + } + if (FL_end < FL_MAX) { + FileList[++FL_end] = file; + } } - } - /* read and redirect */ - while ((c = (char) getchar()) && (!feof(stdin))) { - FL_apply(tee_fwrite, c); - } + /* read and redirect */ + while ((c = (char) getchar()) && (!feof(stdin))) { + FL_apply(tee_fwrite, c); + } - /* clean up */ - FL_apply(tee_fclose, 0); - exit(0); + /* clean up */ + FL_apply(tee_fclose, 0); + exit(0); } -/* $Id: tee.c,v 1.5 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: tee.c,v 1.6 2000/02/08 19:58:47 erik Exp $ */ @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini touch implementation for busybox * @@ -31,56 +32,50 @@ static const char touch_usage[] = "touch [-c] file [file ...]\n\n" -"Update the last-modified date on the given file[s].\n"; + "Update the last-modified date on the given file[s].\n"; -extern int -touch_main(int argc, char **argv) -{ - int fd; - int create=TRUE; - if (argc < 2) { - usage( touch_usage); - } - argc--; - argv++; +extern int touch_main(int argc, char **argv) +{ + int fd; + int create = TRUE; - /* Parse options */ - while (**argv == '-') { - while (*++(*argv)) switch (**argv) { - case 'c': - create = FALSE; - break; - default: - usage( touch_usage); - exit( FALSE); + if (argc < 2) { + usage(touch_usage); } argc--; argv++; - } - fd = open (*argv, (create==FALSE)? O_RDWR : O_RDWR | O_CREAT, 0644); - if (fd < 0 ) { - if (create==FALSE && errno == ENOENT) - exit( TRUE); - else { - perror("touch"); - exit( FALSE); + /* Parse options */ + while (**argv == '-') { + while (*++(*argv)) + switch (**argv) { + case 'c': + create = FALSE; + break; + default: + usage(touch_usage); + exit(FALSE); + } + argc--; + argv++; } - } - close( fd); - if (utime (*argv, NULL)) { - perror("touch"); - exit( FALSE); - } - else - exit( TRUE); -} - - - - - + fd = open(*argv, (create == FALSE) ? O_RDWR : O_RDWR | O_CREAT, 0644); + if (fd < 0) { + if (create == FALSE && errno == ENOENT) + exit(TRUE); + else { + perror("touch"); + exit(FALSE); + } + } + close(fd); + if (utime(*argv, NULL)) { + perror("touch"); + exit(FALSE); + } else + exit(TRUE); +} diff --git a/true_false.c b/true_false.c index eb9466b7b..7829673e0 100644 --- a/true_false.c +++ b/true_false.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini true/false implementation for busybox * @@ -24,15 +25,12 @@ #include "internal.h" -extern int -true_main(int argc, char** argv) +extern int true_main(int argc, char **argv) { - exit( TRUE); + exit(TRUE); } -extern int -false_main(int argc, char** argv) +extern int false_main(int argc, char **argv) { - exit( FALSE); + exit(FALSE); } - @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini tty implementation for busybox * @@ -24,19 +25,23 @@ #include <sys/types.h> static const char tty_usage[] = "tty\n\n" -"Print the file name of the terminal connected to standard input.\n" -"\t-s\tprint nothing, only return an exit status\n"; + "Print the file name of the terminal connected to standard input.\n" -extern int tty_main(int argc, char **argv) { + "\t-s\tprint nothing, only return an exit status\n"; + +extern int tty_main(int argc, char **argv) +{ char *tty; if (argc > 1) { - if (argv[1][0] != '-' || argv[1][1] != 's') usage (tty_usage); - } - else { - tty = ttyname (0); - if (tty) puts (tty); - else puts ("not a tty"); + if (argv[1][0] != '-' || argv[1][1] != 's') + usage(tty_usage); + } else { + tty = ttyname(0); + if (tty) + puts(tty); + else + puts("not a tty"); } - exit (isatty (0) ? TRUE : FALSE); + exit(isatty(0) ? TRUE : FALSE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini umount implementation for busybox * @@ -28,24 +29,23 @@ #include <fstab.h> #include <errno.h> -static const char umount_usage[] = -"umount [flags] filesystem|directory\n\n" -"Flags:\n" -"\t-a:\tUnmount all file systems" +static const char umount_usage[] = + "umount [flags] filesystem|directory\n\n" + "Flags:\n" "\t-a:\tUnmount all file systems" #ifdef BB_MTAB -" in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n" + " in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n" #else -"\n" + "\n" #endif #ifdef BB_FEATURE_REMOUNT -"\t-r:\tTry to remount devices as read-only if mount is busy\n" + "\t-r:\tTry to remount devices as read-only if mount is busy\n" #endif ; struct _mtab_entry_t { - char *device; - char *mountpt; - struct _mtab_entry_t *next; + char *device; + char *mountpt; + struct _mtab_entry_t *next; }; static struct _mtab_entry_t *mtab_cache = NULL; @@ -55,113 +55,112 @@ static struct _mtab_entry_t *mtab_cache = NULL; static int useMtab = TRUE; static int umountAll = FALSE; static int doRemount = FALSE; -extern const char mtab_file[]; /* Defined in utility.c */ +extern const char mtab_file[]; /* Defined in utility.c */ #define MIN(x,y) (x > y ? x : y) -static int -do_umount(const char* name, int useMtab) +static int do_umount(const char *name, int useMtab) { - int status; - char *blockDevice = mtab_getinfo(name, MTAB_GETDEVICE); + int status; + char *blockDevice = mtab_getinfo(name, MTAB_GETDEVICE); - if (blockDevice && strcmp(blockDevice, name) == 0) - name = mtab_getinfo(blockDevice, MTAB_GETMOUNTPT); + if (blockDevice && strcmp(blockDevice, name) == 0) + name = mtab_getinfo(blockDevice, MTAB_GETMOUNTPT); - status = umount(name); + status = umount(name); #if defined BB_FEATURE_MOUNT_LOOP - if (blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9)) - /* this was a loop device, delete it */ - del_loop(blockDevice); + if (blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9)) + /* this was a loop device, delete it */ + del_loop(blockDevice); #endif #if defined BB_FEATURE_REMOUNT - if ( status != 0 && doRemount == TRUE && errno == EBUSY ) { - status = mount(blockDevice, name, NULL, - MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL); - if (status == 0) { - fprintf(stderr, "umount: %s busy - remounted read-only\n", - blockDevice); - /* TODO: update mtab if BB_MTAB is defined */ - } else { - fprintf(stderr, "umount: Cannot remount %s read-only\n", - blockDevice); + if (status != 0 && doRemount == TRUE && errno == EBUSY) { + status = mount(blockDevice, name, NULL, + MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL); + if (status == 0) { + fprintf(stderr, "umount: %s busy - remounted read-only\n", + blockDevice); + /* TODO: update mtab if BB_MTAB is defined */ + } else { + fprintf(stderr, "umount: Cannot remount %s read-only\n", + blockDevice); + } } - } #endif - if ( status == 0 ) { + if (status == 0) { #if defined BB_MTAB - if ( useMtab==TRUE ) - erase_mtab(name); + if (useMtab == TRUE) + erase_mtab(name); #endif - return( TRUE); - } - return(FALSE); + return (TRUE); + } + return (FALSE); } -static int -umount_all(int useMtab) +static int umount_all(int useMtab) { int status = TRUE; char *mountpt; void *iter; for (mountpt = mtab_first(&iter); mountpt; mountpt = mtab_next(&iter)) { - status=do_umount (mountpt, useMtab); - if (status != 0) { - /* Don't bother retrying the umount on busy devices */ - if (errno == EBUSY) { - perror(mountpt); - continue; - } - status = do_umount (mountpt, useMtab); + status = do_umount(mountpt, useMtab); if (status != 0) { - printf ("Couldn't umount %s on %s: %s\n", - mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE), strerror(errno)); + /* Don't bother retrying the umount on busy devices */ + if (errno == EBUSY) { + perror(mountpt); + continue; + } + status = do_umount(mountpt, useMtab); + if (status != 0) { + printf("Couldn't umount %s on %s: %s\n", + mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE), + strerror(errno)); + } } - } - } - return (status); + } + return (status); } -extern int -umount_main(int argc, char** argv) +extern int umount_main(int argc, char **argv) { - if (argc < 2) { - usage( umount_usage); - } - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - while (*++(*argv)) switch (**argv) { - case 'a': - umountAll = TRUE; - break; + if (argc < 2) { + usage(umount_usage); + } + + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + while (*++(*argv)) + switch (**argv) { + case 'a': + umountAll = TRUE; + break; #ifdef BB_MTAB - case 'n': - useMtab = FALSE; - break; + case 'n': + useMtab = FALSE; + break; #endif #ifdef BB_FEATURE_REMOUNT - case 'r': - doRemount = TRUE; - break; + case 'r': + doRemount = TRUE; + break; #endif - default: - usage( umount_usage); + default: + usage(umount_usage); + } + } + + mtab_read(); + if (umountAll == TRUE) { + exit(umount_all(useMtab)); + } + if (do_umount(*argv, useMtab) == 0) + exit(TRUE); + else { + perror("umount"); + exit(FALSE); } - } - - mtab_read(); - if (umountAll==TRUE) { - exit(umount_all(useMtab)); - } - if ( do_umount(*argv,useMtab) == 0 ) - exit (TRUE); - else { - perror("umount"); - exit(FALSE); - } } @@ -172,79 +171,89 @@ umount_main(int argc, char** argv) */ void mtab_read(void) { - struct _mtab_entry_t *entry = NULL; - struct mntent *e; - FILE *fp; - - if (mtab_cache != NULL) return; - - if ((fp = setmntent(mtab_file, "r")) == NULL) { - fprintf(stderr, "Cannot open %s\n", mtab_file); - return; - } - while ((e = getmntent(fp))) { - entry = malloc(sizeof(struct _mtab_entry_t)); - entry->device = strdup(e->mnt_fsname); - entry->mountpt = strdup(e->mnt_dir); - entry->next = mtab_cache; - mtab_cache = entry; - } - endmntent(fp); + struct _mtab_entry_t *entry = NULL; + struct mntent *e; + FILE *fp; + + if (mtab_cache != NULL) + return; + + if ((fp = setmntent(mtab_file, "r")) == NULL) { + fprintf(stderr, "Cannot open %s\n", mtab_file); + return; + } + while ((e = getmntent(fp))) { + entry = malloc(sizeof(struct _mtab_entry_t)); + + entry->device = strdup(e->mnt_fsname); + entry->mountpt = strdup(e->mnt_dir); + entry->next = mtab_cache; + mtab_cache = entry; + } + endmntent(fp); } char *mtab_getinfo(const char *match, const char which) { - struct _mtab_entry_t *cur = mtab_cache; - while (cur) { - if (strcmp(cur->mountpt, match) == 0 || - strcmp(cur->device, match) == 0) { - if (which == MTAB_GETMOUNTPT) { - return cur->mountpt; - } else { + struct _mtab_entry_t *cur = mtab_cache; + + while (cur) { + if (strcmp(cur->mountpt, match) == 0 || + strcmp(cur->device, match) == 0) { + if (which == MTAB_GETMOUNTPT) { + return cur->mountpt; + } else { #if !defined BB_MTAB - if (strcmp(cur->device, "/dev/root") == 0) { - struct fstab* fstabItem; - fstabItem = getfsfile ("/"); - if (fstabItem != NULL) return fstabItem->fs_spec; - } + if (strcmp(cur->device, "/dev/root") == 0) { + struct fstab *fstabItem; + + fstabItem = getfsfile("/"); + if (fstabItem != NULL) + return fstabItem->fs_spec; + } #endif - return cur->device; - } + return cur->device; + } + } + cur = cur->next; } - cur = cur->next; - } - return NULL; + return NULL; } char *mtab_first(void **iter) { - struct _mtab_entry_t *mtab_iter; - if (!iter) return NULL; - mtab_iter = mtab_cache; - *iter = (void *)mtab_iter; - return mtab_next(iter); + struct _mtab_entry_t *mtab_iter; + + if (!iter) + return NULL; + mtab_iter = mtab_cache; + *iter = (void *) mtab_iter; + return mtab_next(iter); } char *mtab_next(void **iter) { - char *mp; - if (iter == NULL || *iter == NULL) return NULL; - mp = ((struct _mtab_entry_t *)(*iter))->mountpt; - *iter = (void *)((struct _mtab_entry_t *)(*iter))->next; - return mp; + char *mp; + + if (iter == NULL || *iter == NULL) + return NULL; + mp = ((struct _mtab_entry_t *) (*iter))->mountpt; + *iter = (void *) ((struct _mtab_entry_t *) (*iter))->next; + return mp; } void mtab_free(void) { - struct _mtab_entry_t *this, *next; - - this = mtab_cache; - while (this) { - next = this->next; - if (this->device) free(this->device); - if (this->mountpt) free(this->mountpt); - free(this); - this = next; - } -} + struct _mtab_entry_t *this, *next; + this = mtab_cache; + while (this) { + next = this->next; + if (this->device) + free(this->device); + if (this->mountpt) + free(this->mountpt); + free(this); + this = next; + } +} @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* uname -- print system information Copyright (C) 1989-1999 Free Software Foundation, Inc. @@ -41,16 +42,17 @@ static const char uname_usage[] = - "uname [OPTION]...\n\n" - "Print certain system information. With no OPTION, same as -s.\n\n" - "Options:\n" - "\t-a\tprint all information\n" - "\t-m\tthe machine (hardware) type\n" - "\t-n\tprint the machine's network node hostname\n" - "\t-r\tprint the operating system release\n" - "\t-s\tprint the operating system name\n" - "\t-p\tprint the host processor type\n" - "\t-v\tprint the operating system version\n"; + "uname [OPTION]...\n\n" + "Print certain system information. With no OPTION, same as -s.\n\n" + "Options:\n" + "\t-a\tprint all information\n" + "\t-m\tthe machine (hardware) type\n" + "\t-n\tprint the machine's network node hostname\n" + "\t-r\tprint the operating system release\n" + "\t-s\tprint the operating system name\n" + + "\t-p\tprint the host processor type\n" + "\t-v\tprint the operating system version\n"; static void print_element(unsigned int mask, char *element); @@ -80,77 +82,78 @@ static unsigned char toprint; int uname_main(int argc, char **argv) { - struct utsname name; - char processor[256]; + struct utsname name; + char processor[256]; + #if defined(__sparc__) && defined(__linux__) - char *fake_sparc = getenv("FAKE_SPARC"); + char *fake_sparc = getenv("FAKE_SPARC"); #endif - toprint = 0; - - /* Parse any options */ - //fprintf(stderr, "argc=%d, argv=%s\n", argc, *argv); - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 's': - toprint |= PRINT_SYSNAME; - break; - case 'n': - toprint |= PRINT_NODENAME; - break; - case 'r': - toprint |= PRINT_RELEASE; - break; - case 'v': - toprint |= PRINT_VERSION; - break; - case 'm': - toprint |= PRINT_MACHINE; - break; - case 'p': - toprint |= PRINT_PROCESSOR; - break; - case 'a': - toprint = (PRINT_SYSNAME | PRINT_NODENAME | PRINT_RELEASE | - PRINT_PROCESSOR | PRINT_VERSION | - PRINT_MACHINE); - break; - default: - usage(uname_usage); - } + toprint = 0; + + /* Parse any options */ + //fprintf(stderr, "argc=%d, argv=%s\n", argc, *argv); + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 's': + toprint |= PRINT_SYSNAME; + break; + case 'n': + toprint |= PRINT_NODENAME; + break; + case 'r': + toprint |= PRINT_RELEASE; + break; + case 'v': + toprint |= PRINT_VERSION; + break; + case 'm': + toprint |= PRINT_MACHINE; + break; + case 'p': + toprint |= PRINT_PROCESSOR; + break; + case 'a': + toprint = (PRINT_SYSNAME | PRINT_NODENAME | PRINT_RELEASE | + PRINT_PROCESSOR | PRINT_VERSION | + PRINT_MACHINE); + break; + default: + usage(uname_usage); + } + } } - } - if (toprint == 0) - toprint = PRINT_SYSNAME; + if (toprint == 0) + toprint = PRINT_SYSNAME; - if (uname(&name) == -1) - perror("cannot get system name"); + if (uname(&name) == -1) + perror("cannot get system name"); #if defined (HAVE_SYSINFO) && defined (SI_ARCHITECTURE) - if (sysinfo(SI_ARCHITECTURE, processor, sizeof(processor)) == -1) - perror("cannot get processor type"); + if (sysinfo(SI_ARCHITECTURE, processor, sizeof(processor)) == -1) + perror("cannot get processor type"); } #else - strcpy(processor, "unknown"); + strcpy(processor, "unknown"); #endif #if defined(__sparc__) && defined(__linux__) - if (fake_sparc != NULL - && (fake_sparc[0] == 'y' - || fake_sparc[0] == 'Y')) strcpy(name.machine, "sparc"); + if (fake_sparc != NULL + && (fake_sparc[0] == 'y' + || fake_sparc[0] == 'Y')) strcpy(name.machine, "sparc"); #endif - print_element(PRINT_SYSNAME, name.sysname); - print_element(PRINT_NODENAME, name.nodename); - print_element(PRINT_RELEASE, name.release); - print_element(PRINT_VERSION, name.version); - print_element(PRINT_MACHINE, name.machine); - print_element(PRINT_PROCESSOR, processor); + print_element(PRINT_SYSNAME, name.sysname); + print_element(PRINT_NODENAME, name.nodename); + print_element(PRINT_RELEASE, name.release); + print_element(PRINT_VERSION, name.version); + print_element(PRINT_MACHINE, name.machine); + print_element(PRINT_PROCESSOR, processor); - exit(TRUE); + exit(TRUE); } /* If the name element set in MASK is selected for printing in `toprint', @@ -159,8 +162,8 @@ int uname_main(int argc, char **argv) static void print_element(unsigned int mask, char *element) { - if (toprint & mask) { - toprint &= ~mask; - printf("%s%c", element, toprint ? ' ' : '\n'); - } + if (toprint & mask) { + toprint &= ~mask; + printf("%s%c", element, toprint ? ' ' : '\n'); + } } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini uniq implementation for busybox * @@ -27,119 +28,116 @@ #include <errno.h> static const char uniq_usage[] = -"uniq [OPTION]... [INPUT [OUTPUT]]\n" -"Discard all but one of successive identical lines from INPUT (or\n" -"standard input), writing to OUTPUT (or standard output).\n" -"\n" -"\t-h\tdisplay this help and exit\n" -"\n" -"A field is a run of whitespace, then non-whitespace characters.\n" -"Fields are skipped before chars.\n" -; + "uniq [OPTION]... [INPUT [OUTPUT]]\n" + "Discard all but one of successive identical lines from INPUT (or\n" + "standard input), writing to OUTPUT (or standard output).\n" + "\n" + "\t-h\tdisplay this help and exit\n" + + "\n" + "A field is a run of whitespace, then non-whitespace characters.\n" + "Fields are skipped before chars.\n"; /* max chars in line */ #define UNIQ_MAX 4096 -typedef void (Print)(FILE *, const char *); +typedef void (Print) (FILE *, const char *); -typedef int (Decide)(const char *, const char *); +typedef int (Decide) (const char *, const char *); /* container for two lines to be compared */ typedef struct { - char *a; - char *b; - int recurrence; - FILE *in; - FILE *out; - void *func; + char *a; + char *b; + int recurrence; + FILE *in; + FILE *out; + void *func; } Subject; /* set up all the variables of a uniq operation */ -static Subject * -subject_init(Subject *self, FILE *in, FILE *out, void *func) +static Subject *subject_init(Subject * self, FILE * in, FILE * out, + void *func) { - self->a = NULL; - self->b = NULL; - self->in = in; - self->out = out; - self->func = func; - self->recurrence = 0; - return self; + self->a = NULL; + self->b = NULL; + self->in = in; + self->out = out; + self->func = func; + self->recurrence = 0; + return self; } /* point a and b to the appropriate lines; * count the recurrences (if any) of a string; */ -static Subject * -subject_next(Subject *self) +static Subject *subject_next(Subject * self) { - /* tmp line holders */ - static char line[2][UNIQ_MAX]; - static int alternator = 0; - - if (fgets(line[alternator], UNIQ_MAX, self->in)) { - self->a = self->b; - self->b = line[alternator]; - alternator ^= 1; - return self; - } + /* tmp line holders */ + static char line[2][UNIQ_MAX]; + static int alternator = 0; + + if (fgets(line[alternator], UNIQ_MAX, self->in)) { + self->a = self->b; + self->b = line[alternator]; + alternator ^= 1; + return self; + } - return NULL; + return NULL; } -static Subject * -subject_last(Subject *self) +static Subject *subject_last(Subject * self) { - self->a = self->b; - self->b = NULL; - return self; + self->a = self->b; + self->b = NULL; + return self; } -static Subject * -subject_study(Subject *self) +static Subject *subject_study(Subject * self) { - if (self->a == NULL) { - return self; - } - if (self->b == NULL) { - fprintf(self->out, "%s", self->a); + if (self->a == NULL) { + return self; + } + if (self->b == NULL) { + fprintf(self->out, "%s", self->a); + return self; + } + if (strcmp(self->a, self->b) == 0) { + self->recurrence++; + } else { + fprintf(self->out, "%s", self->a); + self->recurrence = 0; + } return self; - } - if (strcmp(self->a, self->b) == 0) { - self->recurrence++; - } else { - fprintf(self->out, "%s", self->a); - self->recurrence = 0; - } - return self; } static int -set_file_pointers(int schema, FILE **in, FILE **out, char **argv) +set_file_pointers(int schema, FILE ** in, FILE ** out, char **argv) { - switch (schema) { + switch (schema) { case 0: - *in = stdin; - *out = stdout; - break; + *in = stdin; + *out = stdout; + break; case 1: - *in = fopen(argv[0], "r"); - *out = stdout; - break; + *in = fopen(argv[0], "r"); + *out = stdout; + break; case 2: - *in = fopen(argv[0], "r"); - *out = fopen(argv[1], "w"); - break; - } - if (*in == NULL) { - fprintf(stderr, "uniq: %s: %s\n", argv[0], strerror(errno)); - return errno; - } - if (*out == NULL) { - fprintf(stderr, "uniq: %s: %s\n", argv[1], strerror(errno)); - return errno; - } - return 0; + *in = fopen(argv[0], "r"); + *out = fopen(argv[1], "w"); + break; + } + if (*in == NULL) { + fprintf(stderr, "uniq: %s: %s\n", argv[0], strerror(errno)); + return errno; + } + if (*out == NULL) { + fprintf(stderr, "uniq: %s: %s\n", argv[1], strerror(errno)); + return errno; + } + return 0; } @@ -152,45 +150,44 @@ set_file_pointers(int schema, FILE **in, FILE **out, char **argv) /* it seems like GNU/uniq only takes one or two files as an option */ /* ________________________________________________________________________ */ -int -uniq_main(int argc, char **argv) +int uniq_main(int argc, char **argv) { - int i; - char opt; - FILE *in, *out; - Subject s; - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case '-': - case 'h': - usage(uniq_usage); - default: - usage(uniq_usage); - } - } else { - break; + int i; + char opt; + FILE *in, *out; + Subject s; + + /* parse argv[] */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + opt = argv[i][1]; + switch (opt) { + case '-': + case 'h': + usage(uniq_usage); + default: + usage(uniq_usage); + } + } else { + break; + } } - } - /* 0 src: stdin; dst: stdout */ - /* 1 src: file; dst: stdout */ - /* 2 src: file; dst: file */ - if (set_file_pointers((argc - 1), &in, &out, &argv[i])) { - exit(1); - } + /* 0 src: stdin; dst: stdout */ + /* 1 src: file; dst: stdout */ + /* 2 src: file; dst: file */ + if (set_file_pointers((argc - 1), &in, &out, &argv[i])) { + exit(1); + } - subject_init(&s, in, out, NULL); - while (subject_next(&s)) { + subject_init(&s, in, out, NULL); + while (subject_next(&s)) { + subject_study(&s); + } + subject_last(&s); subject_study(&s); - } - subject_last(&s); - subject_study(&s); - exit(0); + exit(0); } -/* $Id: uniq.c,v 1.6 2000/02/07 05:29:42 erik Exp $ */ +/* $Id: uniq.c,v 1.7 2000/02/08 19:58:47 erik Exp $ */ @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini update implementation for busybox * @@ -27,20 +28,19 @@ #include <sys/kdaemon.h> #else _syscall2(int, bdflush, int, func, int, data); -#endif /* __GLIBC__ */ +#endif /* __GLIBC__ */ -extern int -update_main(int argc, char** argv) +extern int update_main(int argc, char **argv) { /* * Update is actually two daemons, bdflush and update. */ - int pid; + int pid; pid = fork(); - if ( pid < 0 ) + if (pid < 0) return pid; - else if ( pid == 0 ) { + else if (pid == 0) { /* * This is no longer necessary since 1.3.5x, but it will harmlessly * exit if that is the case. @@ -52,11 +52,11 @@ update_main(int argc, char** argv) _exit(0); } pid = fork(); - if ( pid < 0 ) + if (pid < 0) return pid; - else if ( pid == 0 ) { + else if (pid == 0) { argv[0] = "update"; - for ( ; ; ) { + for (;;) { sync(); sleep(30); } diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index e38fd5555..bbed8221a 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* dmesg.c -- Print out the contents of the kernel ring buffer * Created: Sat Oct 9 16:19:47 1993 * Revised: Thu Oct 28 21:52:17 1993 by faith@cs.unc.edu @@ -24,8 +25,8 @@ #ifndef __alpha__ # define __NR_klogctl __NR_syslog - static inline _syscall3(int, klogctl, int, type, char *, b, int, len); -#else /* __alpha__ */ +static inline _syscall3(int, klogctl, int, type, char *, b, int, len); +#else /* __alpha__ */ #define klogctl syslog #endif @@ -35,90 +36,91 @@ static const char dmesg_usage[] = "dmesg [-c] [-n level] [-s bufsize]\n"; -int dmesg_main( int argc, char** argv ) +int dmesg_main(int argc, char **argv) { - char *buf; - int bufsize=8196; - int i; - int n; - int level = 0; - int lastc; - int cmd = 3; - int stopDoingThat; + char *buf; + int bufsize = 8196; + int i; + int n; + int level = 0; + int lastc; + int cmd = 3; + int stopDoingThat; - argc--; - argv++; + argc--; + argv++; - /* Parse any options */ - while (argc && **argv == '-') { - stopDoingThat = FALSE; - while (stopDoingThat == FALSE && *++(*argv)) { - switch (**argv) { - case 'c': - cmd = 4; - break; - case 'n': - cmd = 8; - if (--argc == 0) - goto end; - level = atoi (*(++argv)); - if (--argc > 0) - ++argv; - stopDoingThat = TRUE; - break; - case 's': - if (--argc == 0) - goto end; - bufsize = atoi (*(++argv)); - if (--argc > 0) - ++argv; - stopDoingThat = TRUE; - break; - default: + /* Parse any options */ + while (argc && **argv == '-') { + stopDoingThat = FALSE; + while (stopDoingThat == FALSE && *++(*argv)) { + switch (**argv) { + case 'c': + cmd = 4; + break; + case 'n': + cmd = 8; + if (--argc == 0) + goto end; + level = atoi(*(++argv)); + if (--argc > 0) + ++argv; + stopDoingThat = TRUE; + break; + case 's': + if (--argc == 0) + goto end; + bufsize = atoi(*(++argv)); + if (--argc > 0) + ++argv; + stopDoingThat = TRUE; + break; + default: + goto end; + } + } + } + + if (argc > 1) { goto end; - } } - } - - if (argc > 1) { - goto end; - } - if (cmd == 8) { - n = klogctl( cmd, NULL, level ); - if (n < 0) { - goto klogctl_error; - } - exit( TRUE ); - } + if (cmd == 8) { + n = klogctl(cmd, NULL, level); + if (n < 0) { + goto klogctl_error; + } + exit(TRUE); + } - if (bufsize < 4096) bufsize = 4096; - buf = (char*)malloc(bufsize); - n = klogctl( cmd, buf, bufsize ); - if (n < 0) { - goto klogctl_error; - } + if (bufsize < 4096) + bufsize = 4096; + buf = (char *) malloc(bufsize); + n = klogctl(cmd, buf, bufsize); + if (n < 0) { + goto klogctl_error; + } - lastc = '\n'; - for (i = 0; i < n; i++) { - if ((i == 0 || buf[i - 1] == '\n') && buf[i] == '<') { - i++; - while (buf[i] >= '0' && buf[i] <= '9') - i++; - if (buf[i] == '>') - i++; - } - lastc = buf[i]; - putchar( lastc ); - } - if (lastc != '\n') - putchar( '\n' ); - exit( TRUE); -end: - usage( dmesg_usage); - exit (FALSE); -klogctl_error: - perror( "klogctl" ); - exit( FALSE ); + lastc = '\n'; + for (i = 0; i < n; i++) { + if ((i == 0 || buf[i - 1] == '\n') && buf[i] == '<') { + i++; + while (buf[i] >= '0' && buf[i] <= '9') + i++; + if (buf[i] == '>') + i++; + } + lastc = buf[i]; + putchar(lastc); + } + if (lastc != '\n') + putchar('\n'); + exit(TRUE); + end: + usage(dmesg_usage); + exit(FALSE); + klogctl_error: + perror("klogctl"); + exit(FALSE); } diff --git a/util-linux/fbset.c b/util-linux/fbset.c index c29145e51..a75e431db 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini fbset implementation for busybox * @@ -48,7 +49,7 @@ #define OPT_READMODE (1 << 2) #define CMD_HELP 0 -#define CMD_FB 1 +#define CMD_FB 1 #define CMD_DB 2 #define CMD_GEOMETRY 3 #define CMD_TIMING 4 @@ -87,213 +88,242 @@ static unsigned int g_options = 0; struct cmdoptions_t { - char *name; - unsigned char param_count; - unsigned char code; + char *name; + unsigned char param_count; + unsigned char code; } g_cmdoptions[] = { - { "-h", 0, CMD_HELP }, - { "-fb", 1, CMD_FB }, - { "-db", 1, CMD_DB }, - { "-a", 0, CMD_ALL }, - { "-i", 0, CMD_INFO }, - { "-g", 5, CMD_GEOMETRY }, - { "-t", 7, CMD_TIMING }, - { "-accel", 1, CMD_ACCEL }, - { "-hsync", 1, CMD_HSYNC }, - { "-vsync", 1, CMD_VSYNC }, - { "-laced", 1, CMD_LACED }, - { "-double", 1, CMD_DOUBLE }, - + { + "-h", 0, CMD_HELP}, { + "-fb", 1, CMD_FB}, { + "-db", 1, CMD_DB}, { + "-a", 0, CMD_ALL}, { + "-i", 0, CMD_INFO}, { + "-g", 5, CMD_GEOMETRY}, { + "-t", 7, CMD_TIMING}, { + "-accel", 1, CMD_ACCEL}, { + "-hsync", 1, CMD_HSYNC}, { + "-vsync", 1, CMD_VSYNC}, { + "-laced", 1, CMD_LACED}, { + "-double", 1, CMD_DOUBLE}, #ifdef BB_FBSET_FANCY - { "--help", 0, CMD_HELP }, - { "-all", 0, CMD_ALL }, - { "-xres", 1, CMD_XRES }, - { "-yres", 1, CMD_YRES }, - { "-vxres", 1, CMD_VXRES }, - { "-vyres", 1, CMD_VYRES }, - { "-depth", 1, CMD_DEPTH }, - { "-match", 0, CMD_MATCH }, - { "--geometry", 5, CMD_GEOMETRY }, - - { "-pixclock", 1, CMD_PIXCLOCK }, - { "-left", 1, CMD_LEFT }, - { "-right", 1, CMD_RIGHT }, - { "-upper", 1, CMD_UPPER }, - { "-lower", 1, CMD_LOWER }, - { "-hslen", 1, CMD_HSLEN }, - { "-vslen", 1, CMD_VSLEN }, - { "--timings", 7, CMD_TIMING }, - - { "-csync", 1, CMD_CSYNC }, - { "-gsync", 1, CMD_GSYNC }, - { "-extsync", 1, CMD_EXTSYNC }, - { "-bcast", 1, CMD_BCAST }, - { "-rgba", 1, CMD_RGBA }, - { "-step", 1, CMD_STEP }, - { "-move", 1, CMD_MOVE }, + { + "--help", 0, CMD_HELP}, { + "-all", 0, CMD_ALL}, { + "-xres", 1, CMD_XRES}, { + "-yres", 1, CMD_YRES}, { + "-vxres", 1, CMD_VXRES}, { + "-vyres", 1, CMD_VYRES}, { + "-depth", 1, CMD_DEPTH}, { + "-match", 0, CMD_MATCH}, { + "--geometry", 5, CMD_GEOMETRY}, { + "-pixclock", 1, CMD_PIXCLOCK}, { + "-left", 1, CMD_LEFT}, { + "-right", 1, CMD_RIGHT}, { + "-upper", 1, CMD_UPPER}, { + "-lower", 1, CMD_LOWER}, { + "-hslen", 1, CMD_HSLEN}, { + "-vslen", 1, CMD_VSLEN}, { + "--timings", 7, CMD_TIMING}, { + "-csync", 1, CMD_CSYNC}, { + "-gsync", 1, CMD_GSYNC}, { + "-extsync", 1, CMD_EXTSYNC}, { + "-bcast", 1, CMD_BCAST}, { + "-rgba", 1, CMD_RGBA}, { + "-step", 1, CMD_STEP}, { + "-move", 1, CMD_MOVE}, #endif - { 0, 0, 0 } + { + 0, 0, 0} }; static int readmode(struct fb_var_screeninfo *base, const char *fn, - const char *mode) + const char *mode) { #ifdef BB_FBSET_READMODE - FILE *f; - char buf[256]; - char *p = buf; - - if ((f = fopen(fn, "r")) == NULL) PERROR("readmode(fopen)"); - while (!feof(f)) { - fgets(buf, sizeof(buf), f); - if ((p = strstr(buf, "mode ")) || (p = strstr(buf, "mode\t"))) { - p += 5; - if ((p = strstr(buf, mode))) { - p += strlen(mode); - if (!isspace(*p) && (*p != 0) && (*p != '"') && (*p != '\r') - && (*p != '\n')) continue; /* almost, but not quite */ - while (!feof(f)) { - fgets(buf, sizeof(buf), f); - if (!strstr(buf, "endmode")) return 1; + FILE *f; + char buf[256]; + char *p = buf; + + if ((f = fopen(fn, "r")) == NULL) + PERROR("readmode(fopen)"); + while (!feof(f)) { + fgets(buf, sizeof(buf), f); + if ((p = strstr(buf, "mode ")) || (p = strstr(buf, "mode\t"))) { + p += 5; + if ((p = strstr(buf, mode))) { + p += strlen(mode); + if (!isspace(*p) && (*p != 0) && (*p != '"') + && (*p != '\r') && (*p != '\n')) + continue; /* almost, but not quite */ + while (!feof(f)) { + fgets(buf, sizeof(buf), f); + if (!strstr(buf, "endmode")) + return 1; + } + } } - } } - } #else - fprintf(stderr, "W: mode reading was disabled on this copy of fbset; ignoring request\n"); + fprintf(stderr, + "W: mode reading was disabled on this copy of fbset; ignoring request\n"); #endif - return 0; + return 0; } -static void setmode(struct fb_var_screeninfo *base, - struct fb_var_screeninfo *set) +static void setmode(struct fb_var_screeninfo *base, + struct fb_var_screeninfo *set) { - if ((int)set->xres > 0) base->xres = set->xres; - if ((int)set->yres > 0) base->yres = set->yres; - if ((int)set->xres_virtual > 0) base->xres_virtual = set->xres_virtual; - if ((int)set->yres_virtual > 0) base->yres_virtual = set->yres_virtual; - if ((int)set->bits_per_pixel > 0) base->bits_per_pixel = set->bits_per_pixel; + if ((int) set->xres > 0) + base->xres = set->xres; + if ((int) set->yres > 0) + base->yres = set->yres; + if ((int) set->xres_virtual > 0) + base->xres_virtual = set->xres_virtual; + if ((int) set->yres_virtual > 0) + base->yres_virtual = set->yres_virtual; + if ((int) set->bits_per_pixel > 0) + base->bits_per_pixel = set->bits_per_pixel; } static void showmode(struct fb_var_screeninfo *v) { - double drate = 0, hrate = 0, vrate = 0; - if (v->pixclock) { - drate = 1e12 / v->pixclock; - hrate = drate / (v->left_margin+v->xres+v->right_margin+v->hsync_len); - vrate = hrate / (v->upper_margin+v->yres+v->lower_margin+v->vsync_len); - } - printf("\nmode \"%ux%u-%u\"\n", v->xres, v->yres, (int)(vrate+0.5)); + double drate = 0, hrate = 0, vrate = 0; + + if (v->pixclock) { + drate = 1e12 / v->pixclock; + hrate = + drate / (v->left_margin + v->xres + v->right_margin + + v->hsync_len); + vrate = + hrate / (v->upper_margin + v->yres + v->lower_margin + + v->vsync_len); + } + printf("\nmode \"%ux%u-%u\"\n", v->xres, v->yres, (int) (vrate + 0.5)); #ifdef BB_FBSET_FANCY - printf("\t# D: %.3f MHz, H: %.3f kHz, V: %.3f Hz\n", drate/1e6, hrate/1e3, - vrate); + printf("\t# D: %.3f MHz, H: %.3f kHz, V: %.3f Hz\n", drate / 1e6, + hrate / 1e3, vrate); #endif - printf("\tgeometry %u %u %u %u %u\n", v->xres, v->yres, - v->xres_virtual, v->yres_virtual, v->bits_per_pixel); + printf("\tgeometry %u %u %u %u %u\n", v->xres, v->yres, + v->xres_virtual, v->yres_virtual, v->bits_per_pixel); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) - printf("\ttimings %u %u %u %u %u %u %u\n", v->pixclock, v->left_margin, - v->right_margin, v->upper_margin, v->lower_margin, v->hsync_len, - v->vsync_len); - printf("\taccel %s\n", (v->accel_flags > 0 ? "true" : "false")); + printf("\ttimings %u %u %u %u %u %u %u\n", v->pixclock, v->left_margin, + v->right_margin, v->upper_margin, v->lower_margin, v->hsync_len, + v->vsync_len); + printf("\taccel %s\n", (v->accel_flags > 0 ? "true" : "false")); #else - printf("\ttimings %lu %lu %lu %lu %lu %lu %lu\n", v->pixclock, v->left_margin, - v->right_margin, v->upper_margin, v->lower_margin, v->hsync_len, - v->vsync_len); + printf("\ttimings %lu %lu %lu %lu %lu %lu %lu\n", v->pixclock, + v->left_margin, v->right_margin, v->upper_margin, + v->lower_margin, v->hsync_len, v->vsync_len); #endif - printf("\trgba %u/%u,%u/%u,%u/%u,%u/%u\n", v->red.length, v->red.offset, - v->green.length, v->green.offset, v->blue.length, v->blue.offset, - v->transp.length, v->transp.offset); - printf("endmode\n"); + printf("\trgba %u/%u,%u/%u,%u/%u,%u/%u\n", v->red.length, + v->red.offset, v->green.length, v->green.offset, v->blue.length, + v->blue.offset, v->transp.length, v->transp.offset); + printf("endmode\n"); } static void fbset_usage(void) { - int i; + int i; + #ifndef STANDALONE - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", BB_VER, BB_BT); + fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", + BB_VER, BB_BT); #endif - fprintf(stderr, "Usage: fbset [options] [mode]\n"); - fprintf(stderr, "\tThe following options are recognized:\n"); - for (i = 0; g_cmdoptions[i].name; i++) - fprintf(stderr, "\t\t%s\n", g_cmdoptions[i].name); - exit(-1); + fprintf(stderr, "Usage: fbset [options] [mode]\n"); + fprintf(stderr, "\tThe following options are recognized:\n"); + for (i = 0; g_cmdoptions[i].name; i++) + fprintf(stderr, "\t\t%s\n", g_cmdoptions[i].name); + exit(-1); } #ifdef STANDALONE int main(int argc, char **argv) -#else +#else extern int fbset_main(int argc, char **argv) #endif { - struct fb_var_screeninfo var, varset; - int fh, i; - char *fbdev = DEFAULTFBDEV; - char *modefile = DEFAULTFBMODE; - char *thisarg, *mode = NULL; + struct fb_var_screeninfo var, varset; + int fh, i; + char *fbdev = DEFAULTFBDEV; + char *modefile = DEFAULTFBMODE; + char *thisarg, *mode = NULL; + + memset(&varset, 0xFF, sizeof(varset)); - memset(&varset, 0xFF, sizeof(varset)); - - /* parse cmd args.... why do they have to make things so difficult? */ - argv++; argc--; - for (; argc > 0 && (thisarg = *argv); argc--, argv++) { - for (i = 0; g_cmdoptions[i].name; i++) { - if (!strcmp(thisarg, g_cmdoptions[i].name)) { - if (argc - 1 < g_cmdoptions[i].param_count) fbset_usage(); - switch (g_cmdoptions[i].code) { - case CMD_HELP: fbset_usage(); - case CMD_FB: fbdev = argv[1]; break; - case CMD_DB: modefile = argv[1]; break; - case CMD_GEOMETRY: - varset.xres = strtoul(argv[1],0,0); - varset.yres = strtoul(argv[2],0,0); - varset.xres_virtual = strtoul(argv[3],0,0); - varset.yres_virtual = strtoul(argv[4],0,0); - varset.bits_per_pixel = strtoul(argv[5],0,0); - break; - case CMD_TIMING: - varset.pixclock = strtoul(argv[1],0,0); - varset.left_margin = strtoul(argv[2],0,0); - varset.right_margin = strtoul(argv[3],0,0); - varset.upper_margin = strtoul(argv[4],0,0); - varset.lower_margin = strtoul(argv[5],0,0); - varset.hsync_len = strtoul(argv[6],0,0); - varset.vsync_len = strtoul(argv[7],0,0); - break; + /* parse cmd args.... why do they have to make things so difficult? */ + argv++; + argc--; + for (; argc > 0 && (thisarg = *argv); argc--, argv++) { + for (i = 0; g_cmdoptions[i].name; i++) { + if (!strcmp(thisarg, g_cmdoptions[i].name)) { + if (argc - 1 < g_cmdoptions[i].param_count) + fbset_usage(); + switch (g_cmdoptions[i].code) { + case CMD_HELP: + fbset_usage(); + case CMD_FB: + fbdev = argv[1]; + break; + case CMD_DB: + modefile = argv[1]; + break; + case CMD_GEOMETRY: + varset.xres = strtoul(argv[1], 0, 0); + varset.yres = strtoul(argv[2], 0, 0); + varset.xres_virtual = strtoul(argv[3], 0, 0); + varset.yres_virtual = strtoul(argv[4], 0, 0); + varset.bits_per_pixel = strtoul(argv[5], 0, 0); + break; + case CMD_TIMING: + varset.pixclock = strtoul(argv[1], 0, 0); + varset.left_margin = strtoul(argv[2], 0, 0); + varset.right_margin = strtoul(argv[3], 0, 0); + varset.upper_margin = strtoul(argv[4], 0, 0); + varset.lower_margin = strtoul(argv[5], 0, 0); + varset.hsync_len = strtoul(argv[6], 0, 0); + varset.vsync_len = strtoul(argv[7], 0, 0); + break; #ifdef BB_FBSET_FANCY - case CMD_XRES: varset.xres = strtoul(argv[1],0,0); break; - case CMD_YRES: varset.yres = strtoul(argv[1],0,0); break; + case CMD_XRES: + varset.xres = strtoul(argv[1], 0, 0); + break; + case CMD_YRES: + varset.yres = strtoul(argv[1], 0, 0); + break; #endif + } + argc -= g_cmdoptions[i].param_count; + argv += g_cmdoptions[i].param_count; + break; + } + } + if (!g_cmdoptions[i].name) { + if (argc == 1) { + mode = *argv; + g_options |= OPT_READMODE; + } else { + fbset_usage(); + } } - argc -= g_cmdoptions[i].param_count; - argv += g_cmdoptions[i].param_count; - break; - } - } - if (!g_cmdoptions[i].name) { - if (argc == 1) { - mode = *argv; - g_options |= OPT_READMODE; - } else { - fbset_usage(); - } } - } - if ((fh = open(fbdev, O_RDONLY)) < 0) PERROR("fbset(open)"); - if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) PERROR("fbset(ioctl)"); - if (g_options & OPT_READMODE) { - if (!readmode(&var, modefile, mode)) { - fprintf(stderr, "Unknown video mode `%s'\n", mode); - exit(1); + if ((fh = open(fbdev, O_RDONLY)) < 0) + PERROR("fbset(open)"); + if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) + PERROR("fbset(ioctl)"); + if (g_options & OPT_READMODE) { + if (!readmode(&var, modefile, mode)) { + fprintf(stderr, "Unknown video mode `%s'\n", mode); + exit(1); + } } - } - setmode(&var, &varset); - if (g_options & OPT_CHANGE) - if (ioctl(fh, FBIOPUT_VSCREENINFO, &var)) PERROR("fbset(ioctl)"); - showmode(&var); - close(fh); - - return(TRUE); -} + setmode(&var, &varset); + if (g_options & OPT_CHANGE) + if (ioctl(fh, FBIOPUT_VSCREENINFO, &var)) + PERROR("fbset(ioctl)"); + showmode(&var); + close(fh); + return (TRUE); +} diff --git a/util-linux/fdflush.c b/util-linux/fdflush.c index a244e8def..0b154c8a6 100644 --- a/util-linux/fdflush.c +++ b/util-linux/fdflush.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini fdflush implementation for busybox * @@ -29,24 +30,25 @@ extern int fdflush_main(int argc, char **argv) { - int value; - int fd; - if ( argc <= 1 || **(argv++) == '-' ) { - usage( "fdflush device\n"); - } + int value; + int fd; - fd = open(*argv, 0); - if ( fd < 0 ) { - perror(*argv); - exit(FALSE); - } + if (argc <= 1 || **(argv++) == '-') { + usage("fdflush device\n"); + } - value = ioctl(fd, FDFLUSH, 0); - close(fd); + fd = open(*argv, 0); + if (fd < 0) { + perror(*argv); + exit(FALSE); + } - if ( value ) { - perror(*argv); - exit(FALSE); - } - exit (TRUE); + value = ioctl(fd, FDFLUSH, 0); + close(fd); + + if (value) { + perror(*argv); + exit(FALSE); + } + exit(TRUE); } diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 09111c5dc..084c76d36 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * fsck.c - a file system consistency checker for Linux. * @@ -96,7 +97,7 @@ #include <termios.h> #include <mntent.h> #include <sys/stat.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ #include <linux/fs.h> #include <linux/minix_fs.h> @@ -124,17 +125,17 @@ #define BITS_PER_BLOCK (BLOCK_SIZE<<3) -static char * program_name = "fsck.minix"; -static char * program_version = "1.2 - 11/11/96"; -static char * device_name = NULL; +static char *program_name = "fsck.minix"; +static char *program_version = "1.2 - 11/11/96"; +static char *device_name = NULL; static int IN; -static int repair=0, automatic=0, verbose=0, list=0, show=0, warn_mode=0, - force=0; -static int directory=0, regular=0, blockdev=0, chardev=0, links=0, - symlinks=0, total=0; +static int repair = 0, automatic = 0, verbose = 0, list = 0, show = + 0, warn_mode = 0, force = 0; +static int directory = 0, regular = 0, blockdev = 0, chardev = 0, links = + 0, symlinks = 0, total = 0; -static int changed = 0; /* flags if the filesystem has been changed */ -static int errors_uncorrected = 0; /* flag if some error was not corrected */ +static int changed = 0; /* flags if the filesystem has been changed */ +static int errors_uncorrected = 0; /* flag if some error was not corrected */ static int dirsize = 16; static int namelen = 14; static int version2 = 0; @@ -146,10 +147,12 @@ static int termios_set = 0; static int name_depth = 0; static char name_list[MAX_DEPTH][PATH_MAX + 1]; -static char * inode_buffer = NULL; +static char *inode_buffer = NULL; + #define Inode (((struct minix_inode *) inode_buffer)-1) #define Inode2 (((struct minix2_inode *) inode_buffer)-1) static char super_block_buffer[BLOCK_SIZE]; + #define Super (*(struct minix_super_block *)super_block_buffer) #define INODES ((unsigned long)Super.s_ninodes) #ifdef HAVE_MINIX2 @@ -168,8 +171,8 @@ static char super_block_buffer[BLOCK_SIZE]; static char *inode_map; static char *zone_map; -static unsigned char * inode_count = NULL; -static unsigned char * zone_count = NULL; +static unsigned char *inode_count = NULL; +static unsigned char *zone_count = NULL; static void recursive_check(unsigned int ino); static void recursive_check2(unsigned int ino); @@ -191,22 +194,27 @@ static void leave(int status) exit(status); } -static void show_usage(void) { - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", BB_VER, BB_BT); +static void show_usage(void) +{ + fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", + BB_VER, BB_BT); fprintf(stderr, "Usage: %s [-larvsmf] /dev/name\n\n", program_name); - fprintf(stderr, "Performs a consistency check for MINIX filesystems.\n\n"); + fprintf(stderr, + "Performs a consistency check for MINIX filesystems.\n\n"); fprintf(stderr, "OPTIONS:\n"); fprintf(stderr, "\t-l\tLists all filenames\n"); fprintf(stderr, "\t-r\tPerform interactive repairs\n"); fprintf(stderr, "\t-a\tPerform automatic repairs\n"); fprintf(stderr, "\t-v\tverbose\n"); fprintf(stderr, "\t-s\tOutputs super-block information\n"); - fprintf(stderr, "\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"); + fprintf(stderr, + "\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"); fprintf(stderr, "\t-f\tForce file system check.\n\n"); leave(16); } -static void die(const char *str) { +static void die(const char *str) +{ fprintf(stderr, "%s: %s\n", program_name, str); leave(8); } @@ -217,15 +225,15 @@ static void die(const char *str) { */ static void print_current_name(void) { - int i=0; + int i = 0; - while (i<name_depth) - printf("/%.*s",namelen,name_list[i++]); + while (i < name_depth) + printf("/%.*s", namelen, name_list[i++]); if (i == 0) - printf ("/"); + printf("/"); } -static int ask(const char * string, int def) +static int ask(const char *string, int def) { int c; @@ -237,18 +245,18 @@ static int ask(const char * string, int def) if (automatic) { printf("\n"); if (!def) - errors_uncorrected = 1; + errors_uncorrected = 1; return def; } - printf(def?"%s (y/n)? ":"%s (n/y)? ",string); + printf(def ? "%s (y/n)? " : "%s (n/y)? ", string); for (;;) { fflush(stdout); - if ((c=getchar())==EOF) { - if (!def) - errors_uncorrected = 1; + if ((c = getchar()) == EOF) { + if (!def) + errors_uncorrected = 1; return def; } - c=toupper(c); + c = toupper(c); if (c == 'Y') { def = 1; break; @@ -263,7 +271,7 @@ static int ask(const char * string, int def) else { printf("n\n"); errors_uncorrected = 1; - } + } return def; } @@ -274,17 +282,17 @@ static int ask(const char * string, int def) */ static void check_mount(void) { - FILE * f; - struct mntent * mnt; + FILE *f; + struct mntent *mnt; int cont; int fd; - if ((f = setmntent (MOUNTED, "r")) == NULL) + if ((f = setmntent(MOUNTED, "r")) == NULL) return; - while ((mnt = getmntent (f)) != NULL) - if (strcmp (device_name, mnt->mnt_fsname) == 0) + while ((mnt = getmntent(f)) != NULL) + if (strcmp(device_name, mnt->mnt_fsname) == 0) break; - endmntent (f); + endmntent(f); if (!mnt) return; @@ -298,15 +306,15 @@ static void check_mount(void) return; else close(fd); - - printf ("%s is mounted. ", device_name); + + printf("%s is mounted. ", device_name); if (isatty(0) && isatty(1)) cont = ask("Do you really want to continue", 0); else cont = 0; if (!cont) { - printf ("check aborted.\n"); - exit (0); + printf("check aborted.\n"); + exit(0); } return; } @@ -317,7 +325,7 @@ static void check_mount(void) * if an error was corrected, and returns the zone (0 for no zone * or a bad zone-number). */ -static int check_zone_nr(unsigned short * nr, int * corrected) +static int check_zone_nr(unsigned short *nr, int *corrected) { if (!*nr) return 0; @@ -329,7 +337,7 @@ static int check_zone_nr(unsigned short * nr, int * corrected) return *nr; print_current_name(); printf("'."); - if (ask("Remove block",1)) { + if (ask("Remove block", 1)) { *nr = 0; *corrected = 1; } @@ -337,19 +345,19 @@ static int check_zone_nr(unsigned short * nr, int * corrected) } #ifdef HAVE_MINIX2 -static int check_zone_nr2 (unsigned int *nr, int *corrected) +static int check_zone_nr2(unsigned int *nr, int *corrected) { if (!*nr) return 0; if (*nr < FIRSTZONE) - printf ("Zone nr < FIRSTZONE in file `"); + printf("Zone nr < FIRSTZONE in file `"); else if (*nr >= ZONES) - printf ("Zone nr >= ZONES in file `"); + printf("Zone nr >= ZONES in file `"); else return *nr; - print_current_name (); - printf ("'."); - if (ask ("Remove block", 1)) { + print_current_name(); + printf("'."); + if (ask("Remove block", 1)) { *nr = 0; *corrected = 1; } @@ -360,23 +368,23 @@ static int check_zone_nr2 (unsigned int *nr, int *corrected) /* * read-block reads block nr into the buffer at addr. */ -static void read_block(unsigned int nr, char * addr) +static void read_block(unsigned int nr, char *addr) { if (!nr) { - memset(addr,0,BLOCK_SIZE); + memset(addr, 0, BLOCK_SIZE); return; } - if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET)) { + if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) { printf("Read error: unable to seek to block in file '"); print_current_name(); printf("'\n"); - memset(addr,0,BLOCK_SIZE); + memset(addr, 0, BLOCK_SIZE); errors_uncorrected = 1; } else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) { printf("Read error: bad block in file '"); print_current_name(); printf("'\n"); - memset(addr,0,BLOCK_SIZE); + memset(addr, 0, BLOCK_SIZE); errors_uncorrected = 1; } } @@ -384,17 +392,17 @@ static void read_block(unsigned int nr, char * addr) /* * write_block writes block nr to disk. */ -static void write_block(unsigned int nr, char * addr) +static void write_block(unsigned int nr, char *addr) { if (!nr) return; if (nr < FIRSTZONE || nr >= ZONES) { printf("Internal error: trying to write bad block\n" - "Write request ignored\n"); + "Write request ignored\n"); errors_uncorrected = 1; return; } - if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET)) + if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) die("seek failed in write_block"); if (BLOCK_SIZE != write(IN, addr, BLOCK_SIZE)) { printf("Write error: bad block in file '"); @@ -409,16 +417,16 @@ static void write_block(unsigned int nr, char * addr) * It sets 'changed' if the inode has needed changing, and re-writes * any indirect blocks with errors. */ -static int map_block(struct minix_inode * inode, unsigned int blknr) +static int map_block(struct minix_inode *inode, unsigned int blknr) { - unsigned short ind[BLOCK_SIZE>>1]; - unsigned short dind[BLOCK_SIZE>>1]; + unsigned short ind[BLOCK_SIZE >> 1]; + unsigned short dind[BLOCK_SIZE >> 1]; int blk_chg, block, result; - if (blknr<7) + if (blknr < 7) return check_zone_nr(inode->i_zone + blknr, &changed); blknr -= 7; - if (blknr<512) { + if (blknr < 512) { block = check_zone_nr(inode->i_zone + 7, &changed); read_block(block, (char *) ind); blk_chg = 0; @@ -431,73 +439,73 @@ static int map_block(struct minix_inode * inode, unsigned int blknr) block = check_zone_nr(inode->i_zone + 8, &changed); read_block(block, (char *) dind); blk_chg = 0; - result = check_zone_nr(dind + (blknr/512), &blk_chg); + result = check_zone_nr(dind + (blknr / 512), &blk_chg); if (blk_chg) write_block(block, (char *) dind); block = result; read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr(ind + (blknr%512), &blk_chg); + result = check_zone_nr(ind + (blknr % 512), &blk_chg); if (blk_chg) write_block(block, (char *) ind); return result; } #ifdef HAVE_MINIX2 -static int map_block2 (struct minix2_inode *inode, unsigned int blknr) +static int map_block2(struct minix2_inode *inode, unsigned int blknr) { - unsigned int ind[BLOCK_SIZE >> 2]; + unsigned int ind[BLOCK_SIZE >> 2]; unsigned int dind[BLOCK_SIZE >> 2]; unsigned int tind[BLOCK_SIZE >> 2]; int blk_chg, block, result; if (blknr < 7) - return check_zone_nr2 (inode->i_zone + blknr, &changed); + return check_zone_nr2(inode->i_zone + blknr, &changed); blknr -= 7; if (blknr < 256) { - block = check_zone_nr2 (inode->i_zone + 7, &changed); - read_block (block, (char *) ind); + block = check_zone_nr2(inode->i_zone + 7, &changed); + read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr2 (blknr + ind, &blk_chg); + result = check_zone_nr2(blknr + ind, &blk_chg); if (blk_chg) - write_block (block, (char *) ind); + write_block(block, (char *) ind); return result; } blknr -= 256; if (blknr >= 256 * 256) { - block = check_zone_nr2 (inode->i_zone + 8, &changed); - read_block (block, (char *) dind); + block = check_zone_nr2(inode->i_zone + 8, &changed); + read_block(block, (char *) dind); blk_chg = 0; - result = check_zone_nr2 (dind + blknr / 256, &blk_chg); + result = check_zone_nr2(dind + blknr / 256, &blk_chg); if (blk_chg) - write_block (block, (char *) dind); + write_block(block, (char *) dind); block = result; - read_block (block, (char *) ind); + read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr2 (ind + blknr % 256, &blk_chg); + result = check_zone_nr2(ind + blknr % 256, &blk_chg); if (blk_chg) - write_block (block, (char *) ind); + write_block(block, (char *) ind); return result; } blknr -= 256 * 256; - block = check_zone_nr2 (inode->i_zone + 9, &changed); - read_block (block, (char *) tind); + block = check_zone_nr2(inode->i_zone + 9, &changed); + read_block(block, (char *) tind); blk_chg = 0; - result = check_zone_nr2 (tind + blknr / (256 * 256), &blk_chg); + result = check_zone_nr2(tind + blknr / (256 * 256), &blk_chg); if (blk_chg) - write_block (block, (char *) tind); + write_block(block, (char *) tind); block = result; - read_block (block, (char *) dind); + read_block(block, (char *) dind); blk_chg = 0; - result = check_zone_nr2 (dind + (blknr / 256) % 256, &blk_chg); + result = check_zone_nr2(dind + (blknr / 256) % 256, &blk_chg); if (blk_chg) - write_block (block, (char *) dind); + write_block(block, (char *) dind); block = result; - read_block (block, (char *) ind); + read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr2 (ind + blknr % 256, &blk_chg); + result = check_zone_nr2(ind + blknr % 256, &blk_chg); if (blk_chg) - write_block (block, (char *) ind); + write_block(block, (char *) ind); return result; } #endif @@ -510,11 +518,11 @@ static void write_super_block(void) * unconditionally set if we get this far. */ Super.s_state |= MINIX_VALID_FS; - if ( errors_uncorrected ) + if (errors_uncorrected) Super.s_state |= MINIX_ERROR_FS; else Super.s_state &= ~MINIX_ERROR_FS; - + if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET)) die("seek failed in write_super_block"); if (BLOCK_SIZE != write(IN, super_block_buffer, BLOCK_SIZE)) @@ -527,15 +535,15 @@ static void write_tables(void) { write_super_block(); - if (IMAPS*BLOCK_SIZE != write(IN,inode_map,IMAPS*BLOCK_SIZE)) + if (IMAPS * BLOCK_SIZE != write(IN, inode_map, IMAPS * BLOCK_SIZE)) die("Unable to write inode map"); - if (ZMAPS*BLOCK_SIZE != write(IN,zone_map,ZMAPS*BLOCK_SIZE)) + if (ZMAPS * BLOCK_SIZE != write(IN, zone_map, ZMAPS * BLOCK_SIZE)) die("Unable to write zone map"); - if (INODE_BUFFER_SIZE != write(IN,inode_buffer,INODE_BUFFER_SIZE)) + if (INODE_BUFFER_SIZE != write(IN, inode_buffer, INODE_BUFFER_SIZE)) die("Unable to write inodes"); } -static void get_dirsize (void) +static void get_dirsize(void) { int block; char blk[BLOCK_SIZE]; @@ -547,9 +555,9 @@ static void get_dirsize (void) else #endif block = Inode[ROOT_INO].i_zone[0]; - read_block (block, blk); + read_block(block, blk); for (size = 16; size < BLOCK_SIZE; size <<= 1) { - if (strcmp (blk + size + 2, "..") == 0) { + if (strcmp(blk + size + 2, "..") == 0) { dirsize = size; namelen = size - 2; return; @@ -600,8 +608,8 @@ static void read_tables(void) zone_map = malloc(ZMAPS * BLOCK_SIZE); if (!inode_map) die("Unable to allocate buffer for zone map"); - memset(inode_map,0,sizeof(inode_map)); - memset(zone_map,0,sizeof(zone_map)); + memset(inode_map, 0, sizeof(inode_map)); + memset(zone_map, 0, sizeof(zone_map)); inode_buffer = malloc(INODE_BUFFER_SIZE); if (!inode_buffer) die("Unable to allocate buffer for inodes"); @@ -611,31 +619,31 @@ static void read_tables(void) zone_count = malloc(ZONES); if (!zone_count) die("Unable to allocate buffer for zone count"); - if (IMAPS*BLOCK_SIZE != read(IN,inode_map,IMAPS*BLOCK_SIZE)) + if (IMAPS * BLOCK_SIZE != read(IN, inode_map, IMAPS * BLOCK_SIZE)) die("Unable to read inode map"); - if (ZMAPS*BLOCK_SIZE != read(IN,zone_map,ZMAPS*BLOCK_SIZE)) + if (ZMAPS * BLOCK_SIZE != read(IN, zone_map, ZMAPS * BLOCK_SIZE)) die("Unable to read zone map"); - if (INODE_BUFFER_SIZE != read(IN,inode_buffer,INODE_BUFFER_SIZE)) + if (INODE_BUFFER_SIZE != read(IN, inode_buffer, INODE_BUFFER_SIZE)) die("Unable to read inodes"); if (NORM_FIRSTZONE != FIRSTZONE) { printf("Warning: Firstzone != Norm_firstzone\n"); errors_uncorrected = 1; } - get_dirsize (); + get_dirsize(); if (show) { - printf("%ld inodes\n",INODES); - printf("%ld blocks\n",ZONES); - printf("Firstdatazone=%ld (%ld)\n",FIRSTZONE,NORM_FIRSTZONE); - printf("Zonesize=%d\n",BLOCK_SIZE<<ZONESIZE); - printf("Maxsize=%ld\n",MAXSIZE); + printf("%ld inodes\n", INODES); + printf("%ld blocks\n", ZONES); + printf("Firstdatazone=%ld (%ld)\n", FIRSTZONE, NORM_FIRSTZONE); + printf("Zonesize=%d\n", BLOCK_SIZE << ZONESIZE); + printf("Maxsize=%ld\n", MAXSIZE); printf("Filesystem state=%d\n", Super.s_state); - printf("namelen=%d\n\n",namelen); + printf("namelen=%d\n\n", namelen); } } -struct minix_inode * get_inode(unsigned int nr) +struct minix_inode *get_inode(unsigned int nr) { - struct minix_inode * inode; + struct minix_inode *inode; if (!nr || nr > INODES) return NULL; @@ -643,15 +651,14 @@ struct minix_inode * get_inode(unsigned int nr) inode = Inode + nr; if (!inode_count[nr]) { if (!inode_in_use(nr)) { - printf("Inode %d marked not used, but used for file '", - nr); + printf("Inode %d marked not used, but used for file '", nr); print_current_name(); printf("'\n"); if (repair) { - if (ask("Mark in use",1)) + if (ask("Mark in use", 1)) mark_inode(nr); } else { - errors_uncorrected = 1; + errors_uncorrected = 1; } } if (S_ISDIR(inode->i_mode)) @@ -664,14 +671,12 @@ struct minix_inode * get_inode(unsigned int nr) blockdev++; else if (S_ISLNK(inode->i_mode)) symlinks++; - else if (S_ISSOCK(inode->i_mode)) - ; - else if (S_ISFIFO(inode->i_mode)) - ; + else if (S_ISSOCK(inode->i_mode)); + else if (S_ISFIFO(inode->i_mode)); else { - print_current_name(); - printf(" has mode %05o\n",inode->i_mode); - } + print_current_name(); + printf(" has mode %05o\n", inode->i_mode); + } } else links++; @@ -684,8 +689,7 @@ struct minix_inode * get_inode(unsigned int nr) } #ifdef HAVE_MINIX2 -struct minix2_inode * -get_inode2 (unsigned int nr) +struct minix2_inode *get_inode2(unsigned int nr) { struct minix2_inode *inode; @@ -694,37 +698,37 @@ get_inode2 (unsigned int nr) total++; inode = Inode2 + nr; if (!inode_count[nr]) { - if (!inode_in_use (nr)) { - printf ("Inode %d marked not used, but used for file '", nr); - print_current_name (); - printf ("'\n"); + if (!inode_in_use(nr)) { + printf("Inode %d marked not used, but used for file '", nr); + print_current_name(); + printf("'\n"); if (repair) { - if (ask ("Mark in use", 1)) - mark_inode (nr); + if (ask("Mark in use", 1)) + mark_inode(nr); else errors_uncorrected = 1; } } - if (S_ISDIR (inode->i_mode)) + if (S_ISDIR(inode->i_mode)) directory++; - else if (S_ISREG (inode->i_mode)) + else if (S_ISREG(inode->i_mode)) regular++; - else if (S_ISCHR (inode->i_mode)) + else if (S_ISCHR(inode->i_mode)) chardev++; - else if (S_ISBLK (inode->i_mode)) + else if (S_ISBLK(inode->i_mode)) blockdev++; - else if (S_ISLNK (inode->i_mode)) + else if (S_ISLNK(inode->i_mode)) symlinks++; - else if (S_ISSOCK (inode->i_mode)); - else if (S_ISFIFO (inode->i_mode)); + else if (S_ISSOCK(inode->i_mode)); + else if (S_ISFIFO(inode->i_mode)); else { - print_current_name (); - printf (" has mode %05o\n", inode->i_mode); + print_current_name(); + printf(" has mode %05o\n", inode->i_mode); } } else links++; if (!++inode_count[nr]) { - printf ("Warning: inode count too big.\n"); + printf("Warning: inode count too big.\n"); inode_count[nr]--; errors_uncorrected = 1; } @@ -734,23 +738,23 @@ get_inode2 (unsigned int nr) static void check_root(void) { - struct minix_inode * inode = Inode + ROOT_INO; + struct minix_inode *inode = Inode + ROOT_INO; if (!inode || !S_ISDIR(inode->i_mode)) die("root inode isn't a directory"); } #ifdef HAVE_MINIX2 -static void check_root2 (void) +static void check_root2(void) { struct minix2_inode *inode = Inode2 + ROOT_INO; - if (!inode || !S_ISDIR (inode->i_mode)) - die ("root inode isn't a directory"); + if (!inode || !S_ISDIR(inode->i_mode)) + die("root inode isn't a directory"); } #endif -static int add_zone(unsigned short * znr, int * corrected) +static int add_zone(unsigned short *znr, int *corrected) { int result; int block; @@ -763,7 +767,7 @@ static int add_zone(unsigned short * znr, int * corrected) printf("Block has been used before. Now in file `"); print_current_name(); printf("'."); - if (ask("Clear",1)) { + if (ask("Clear", 1)) { *znr = 0; block = 0; *corrected = 1; @@ -772,10 +776,10 @@ static int add_zone(unsigned short * znr, int * corrected) if (!block) return 0; if (!zone_in_use(block)) { - printf("Block %d in file `",block); + printf("Block %d in file `", block); print_current_name(); printf("' is marked not in use."); - if (ask("Correct",1)) + if (ask("Correct", 1)) mark_zone(block); } if (!++zone_count[block]) @@ -784,20 +788,20 @@ static int add_zone(unsigned short * znr, int * corrected) } #ifdef HAVE_MINIX2 -static int add_zone2 (unsigned int *znr, int *corrected) +static int add_zone2(unsigned int *znr, int *corrected) { int result; int block; result = 0; - block = check_zone_nr2 (znr, corrected); + block = check_zone_nr2(znr, corrected); if (!block) return 0; if (zone_count[block]) { - printf ("Block has been used before. Now in file `"); - print_current_name (); - printf ("'."); - if (ask ("Clear", 1)) { + printf("Block has been used before. Now in file `"); + print_current_name(); + printf("'."); + if (ask("Clear", 1)) { *znr = 0; block = 0; *corrected = 1; @@ -805,12 +809,12 @@ static int add_zone2 (unsigned int *znr, int *corrected) } if (!block) return 0; - if (!zone_in_use (block)) { - printf ("Block %d in file `", block); - print_current_name (); - printf ("' is marked not in use."); - if (ask ("Correct", 1)) - mark_zone (block); + if (!zone_in_use(block)) { + printf("Block %d in file `", block); + print_current_name(); + printf("' is marked not in use."); + if (ask("Correct", 1)) + mark_zone(block); } if (!++zone_count[block]) zone_count[block]--; @@ -818,182 +822,179 @@ static int add_zone2 (unsigned int *znr, int *corrected) } #endif -static void add_zone_ind(unsigned short * znr, int * corrected) +static void add_zone_ind(unsigned short *znr, int *corrected) { static char blk[BLOCK_SIZE]; - int i, chg_blk=0; + int i, chg_blk = 0; int block; block = add_zone(znr, corrected); if (!block) return; read_block(block, blk); - for (i=0 ; i < (BLOCK_SIZE>>1) ; i++) + for (i = 0; i < (BLOCK_SIZE >> 1); i++) add_zone(i + (unsigned short *) blk, &chg_blk); if (chg_blk) write_block(block, blk); } #ifdef HAVE_MINIX2 -static void -add_zone_ind2 (unsigned int *znr, int *corrected) +static void add_zone_ind2(unsigned int *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, chg_blk = 0; int block; - block = add_zone2 (znr, corrected); + block = add_zone2(znr, corrected); if (!block) return; - read_block (block, blk); + read_block(block, blk); for (i = 0; i < BLOCK_SIZE >> 2; i++) - add_zone2 (i + (unsigned int *) blk, &chg_blk); + add_zone2(i + (unsigned int *) blk, &chg_blk); if (chg_blk) - write_block (block, blk); + write_block(block, blk); } #endif -static void add_zone_dind(unsigned short * znr, int * corrected) +static void add_zone_dind(unsigned short *znr, int *corrected) { static char blk[BLOCK_SIZE]; - int i, blk_chg=0; + int i, blk_chg = 0; int block; block = add_zone(znr, corrected); if (!block) return; read_block(block, blk); - for (i=0 ; i < (BLOCK_SIZE>>1) ; i++) + for (i = 0; i < (BLOCK_SIZE >> 1); i++) add_zone_ind(i + (unsigned short *) blk, &blk_chg); if (blk_chg) write_block(block, blk); } #ifdef HAVE_MINIX2 -static void -add_zone_dind2 (unsigned int *znr, int *corrected) +static void add_zone_dind2(unsigned int *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, blk_chg = 0; int block; - block = add_zone2 (znr, corrected); + block = add_zone2(znr, corrected); if (!block) return; - read_block (block, blk); + read_block(block, blk); for (i = 0; i < BLOCK_SIZE >> 2; i++) - add_zone_ind2 (i + (unsigned int *) blk, &blk_chg); + add_zone_ind2(i + (unsigned int *) blk, &blk_chg); if (blk_chg) - write_block (block, blk); + write_block(block, blk); } -static void -add_zone_tind2 (unsigned int *znr, int *corrected) +static void add_zone_tind2(unsigned int *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, blk_chg = 0; int block; - block = add_zone2 (znr, corrected); + block = add_zone2(znr, corrected); if (!block) return; - read_block (block, blk); + read_block(block, blk); for (i = 0; i < BLOCK_SIZE >> 2; i++) - add_zone_dind2 (i + (unsigned int *) blk, &blk_chg); + add_zone_dind2(i + (unsigned int *) blk, &blk_chg); if (blk_chg) - write_block (block, blk); + write_block(block, blk); } #endif static void check_zones(unsigned int i) { - struct minix_inode * inode; + struct minix_inode *inode; if (!i || i > INODES) return; - if (inode_count[i] > 1) /* have we counted this file already? */ + if (inode_count[i] > 1) /* have we counted this file already? */ return; inode = Inode + i; if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) && - !S_ISLNK(inode->i_mode)) - return; - for (i=0 ; i<7 ; i++) + !S_ISLNK(inode->i_mode)) return; + for (i = 0; i < 7; i++) add_zone(i + inode->i_zone, &changed); add_zone_ind(7 + inode->i_zone, &changed); add_zone_dind(8 + inode->i_zone, &changed); } #ifdef HAVE_MINIX2 -static void -check_zones2 (unsigned int i) +static void check_zones2(unsigned int i) { struct minix2_inode *inode; if (!i || i > INODES) return; - if (inode_count[i] > 1) /* have we counted this file already? */ + if (inode_count[i] > 1) /* have we counted this file already? */ return; inode = Inode2 + i; - if (!S_ISDIR (inode->i_mode) && !S_ISREG (inode->i_mode) - && !S_ISLNK (inode->i_mode)) + if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) + && !S_ISLNK(inode->i_mode)) return; for (i = 0; i < 7; i++) - add_zone2 (i + inode->i_zone, &changed); - add_zone_ind2 (7 + inode->i_zone, &changed); - add_zone_dind2 (8 + inode->i_zone, &changed); - add_zone_tind2 (9 + inode->i_zone, &changed); + add_zone2(i + inode->i_zone, &changed); + add_zone_ind2(7 + inode->i_zone, &changed); + add_zone_dind2(8 + inode->i_zone, &changed); + add_zone_tind2(9 + inode->i_zone, &changed); } #endif -static void check_file(struct minix_inode * dir, unsigned int offset) +static void check_file(struct minix_inode *dir, unsigned int offset) { static char blk[BLOCK_SIZE]; - struct minix_inode * inode; + struct minix_inode *inode; int ino; - char * name; + char *name; int block; - block = map_block(dir,offset/BLOCK_SIZE); + block = map_block(dir, offset / BLOCK_SIZE); read_block(block, blk); name = blk + (offset % BLOCK_SIZE) + 2; - ino = * (unsigned short *) (name-2); + ino = *(unsigned short *) (name - 2); if (ino > INODES) { print_current_name(); printf(" contains a bad inode number for file '"); - printf("%.*s'.",namelen,name); - if (ask(" Remove",1)) { - *(unsigned short *)(name-2) = 0; + printf("%.*s'.", namelen, name); + if (ask(" Remove", 1)) { + *(unsigned short *) (name - 2) = 0; write_block(block, blk); } ino = 0; - } + } if (name_depth < MAX_DEPTH) - strncpy (name_list[name_depth], name, namelen); + strncpy(name_list[name_depth], name, namelen); name_depth++; inode = get_inode(ino); name_depth--; if (!offset) { - if (!inode || strcmp(".",name)) { + if (!inode || strcmp(".", name)) { print_current_name(); printf(": bad directory: '.' isn't first\n"); errors_uncorrected = 1; - } else return; + } else + return; } if (offset == dirsize) { - if (!inode || strcmp("..",name)) { + if (!inode || strcmp("..", name)) { print_current_name(); printf(": bad directory: '..' isn't second\n"); errors_uncorrected = 1; - } else return; + } else + return; } if (!inode) return; if (name_depth < MAX_DEPTH) - strncpy(name_list[name_depth],name,namelen); - name_depth++; + strncpy(name_list[name_depth], name, namelen); + name_depth++; if (list) { if (verbose) - printf("%6d %07o %3d ",ino,inode->i_mode,inode->i_nlinks); + printf("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); print_current_name(); if (S_ISDIR(inode->i_mode)) printf(":\n"); @@ -1008,8 +1009,7 @@ static void check_file(struct minix_inode * dir, unsigned int offset) } #ifdef HAVE_MINIX2 -static void -check_file2 (struct minix2_inode *dir, unsigned int offset) +static void check_file2(struct minix2_inode *dir, unsigned int offset) { static char blk[BLOCK_SIZE]; struct minix2_inode *inode; @@ -1017,37 +1017,37 @@ check_file2 (struct minix2_inode *dir, unsigned int offset) char *name; int block; - block = map_block2 (dir, offset / BLOCK_SIZE); - read_block (block, blk); + block = map_block2(dir, offset / BLOCK_SIZE); + read_block(block, blk); name = blk + (offset % BLOCK_SIZE) + 2; ino = *(unsigned short *) (name - 2); if (ino > INODES) { - print_current_name (); - printf (" contains a bad inode number for file '"); - printf ("%.*s'.", namelen, name); - if (ask (" Remove", 1)) { + print_current_name(); + printf(" contains a bad inode number for file '"); + printf("%.*s'.", namelen, name); + if (ask(" Remove", 1)) { *(unsigned short *) (name - 2) = 0; - write_block (block, blk); + write_block(block, blk); } ino = 0; } if (name_depth < MAX_DEPTH) - strncpy (name_list[name_depth], name, namelen); + strncpy(name_list[name_depth], name, namelen); name_depth++; - inode = get_inode2 (ino); + inode = get_inode2(ino); name_depth--; if (!offset) { - if (!inode || strcmp (".", name)) { - print_current_name (); - printf (": bad directory: '.' isn't first\n"); + if (!inode || strcmp(".", name)) { + print_current_name(); + printf(": bad directory: '.' isn't first\n"); errors_uncorrected = 1; } else return; } if (offset == dirsize) { - if (!inode || strcmp ("..", name)) { - print_current_name (); - printf (": bad directory: '..' isn't second\n"); + if (!inode || strcmp("..", name)) { + print_current_name(); + printf(": bad directory: '..' isn't second\n"); errors_uncorrected = 1; } else return; @@ -1057,16 +1057,16 @@ check_file2 (struct minix2_inode *dir, unsigned int offset) name_depth++; if (list) { if (verbose) - printf ("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); - print_current_name (); - if (S_ISDIR (inode->i_mode)) - printf (":\n"); + printf("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); + print_current_name(); + if (S_ISDIR(inode->i_mode)) + printf(":\n"); else - printf ("\n"); + printf("\n"); } - check_zones2 (ino); - if (inode && S_ISDIR (inode->i_mode)) - recursive_check2 (ino); + check_zones2(ino); + if (inode && S_ISDIR(inode->i_mode)) + recursive_check2(ino); name_depth--; return; } @@ -1074,7 +1074,7 @@ check_file2 (struct minix2_inode *dir, unsigned int offset) static void recursive_check(unsigned int ino) { - struct minix_inode * dir; + struct minix_inode *dir; unsigned int offset; dir = Inode + ino; @@ -1085,27 +1085,26 @@ static void recursive_check(unsigned int ino) printf(": bad directory: size<32"); errors_uncorrected = 1; } - for (offset = 0 ; offset < dir->i_size ; offset += dirsize) - check_file(dir,offset); + for (offset = 0; offset < dir->i_size; offset += dirsize) + check_file(dir, offset); } #ifdef HAVE_MINIX2 -static void -recursive_check2 (unsigned int ino) +static void recursive_check2(unsigned int ino) { struct minix2_inode *dir; unsigned int offset; dir = Inode2 + ino; - if (!S_ISDIR (dir->i_mode)) - die ("internal error"); + if (!S_ISDIR(dir->i_mode)) + die("internal error"); if (dir->i_size < 2 * dirsize) { - print_current_name (); - printf (": bad directory: size < 32"); + print_current_name(); + printf(": bad directory: size < 32"); errors_uncorrected = 1; } for (offset = 0; offset < dir->i_size; offset += dirsize) - check_file2 (dir, offset); + check_file2(dir, offset); } #endif @@ -1113,7 +1112,7 @@ static int bad_zone(int i) { char buffer[1024]; - if (BLOCK_SIZE*i != lseek(IN, BLOCK_SIZE*i, SEEK_SET)) + if (BLOCK_SIZE * i != lseek(IN, BLOCK_SIZE * i, SEEK_SET)) die("seek failed in bad_zone"); return (BLOCK_SIZE != read(IN, buffer, BLOCK_SIZE)); } @@ -1122,10 +1121,10 @@ static void check_counts(void) { int i; - for (i=1 ; i <= INODES ; i++) { + for (i = 1; i <= INODES; i++) { if (!inode_in_use(i) && Inode[i].i_mode && warn_mode) { - printf("Inode %d mode not cleared.",i); - if (ask("Clear",1)) { + printf("Inode %d mode not cleared.", i); + if (ask("Clear", 1)) { Inode[i].i_mode = 0; changed = 1; } @@ -1133,117 +1132,115 @@ static void check_counts(void) if (!inode_count[i]) { if (!inode_in_use(i)) continue; - printf("Inode %d not used, marked used in the bitmap.",i); - if (ask("Clear",1)) + printf("Inode %d not used, marked used in the bitmap.", i); + if (ask("Clear", 1)) unmark_inode(i); continue; } if (!inode_in_use(i)) { printf("Inode %d used, marked unused in the bitmap.", i); - if (ask("Set",1)) + if (ask("Set", 1)) mark_inode(i); } if (Inode[i].i_nlinks != inode_count[i]) { printf("Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", - i,Inode[i].i_mode,Inode[i].i_nlinks,inode_count[i]); - if (ask("Set i_nlinks to count",1)) { - Inode[i].i_nlinks=inode_count[i]; - changed=1; + i, Inode[i].i_mode, Inode[i].i_nlinks, inode_count[i]); + if (ask("Set i_nlinks to count", 1)) { + Inode[i].i_nlinks = inode_count[i]; + changed = 1; } } } - for (i=FIRSTZONE ; i < ZONES ; i++) { + for (i = FIRSTZONE; i < ZONES; i++) { if (zone_in_use(i) == zone_count[i]) continue; if (!zone_count[i]) { if (bad_zone(i)) continue; - printf("Zone %d: marked in use, no file uses it.",i); - if (ask("Unmark",1)) + printf("Zone %d: marked in use, no file uses it.", i); + if (ask("Unmark", 1)) unmark_zone(i); continue; } - printf("Zone %d: %sin use, counted=%d\n", - i,zone_in_use(i)?"":"not ",zone_count[i]); + printf("Zone %d: %sin use, counted=%d\n", + i, zone_in_use(i) ? "" : "not ", zone_count[i]); } } #ifdef HAVE_MINIX2 -static void -check_counts2 (void) +static void check_counts2(void) { int i; for (i = 1; i <= INODES; i++) { - if (!inode_in_use (i) && Inode2[i].i_mode && warn_mode) { - printf ("Inode %d mode not cleared.", i); - if (ask ("Clear", 1)) { + if (!inode_in_use(i) && Inode2[i].i_mode && warn_mode) { + printf("Inode %d mode not cleared.", i); + if (ask("Clear", 1)) { Inode2[i].i_mode = 0; changed = 1; } } if (!inode_count[i]) { - if (!inode_in_use (i)) + if (!inode_in_use(i)) continue; - printf ("Inode %d not used, marked used in the bitmap.", i); - if (ask ("Clear", 1)) - unmark_inode (i); + printf("Inode %d not used, marked used in the bitmap.", i); + if (ask("Clear", 1)) + unmark_inode(i); continue; } - if (!inode_in_use (i)) { - printf ("Inode %d used, marked unused in the bitmap.", i); - if (ask ("Set", 1)) - mark_inode (i); + if (!inode_in_use(i)) { + printf("Inode %d used, marked unused in the bitmap.", i); + if (ask("Set", 1)) + mark_inode(i); } if (Inode2[i].i_nlinks != inode_count[i]) { - printf ("Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", - i, Inode2[i].i_mode, Inode2[i].i_nlinks, inode_count[i]); - if (ask ("Set i_nlinks to count", 1)) { + printf("Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", + i, Inode2[i].i_mode, Inode2[i].i_nlinks, + inode_count[i]); + if (ask("Set i_nlinks to count", 1)) { Inode2[i].i_nlinks = inode_count[i]; changed = 1; } } } for (i = FIRSTZONE; i < ZONES; i++) { - if (zone_in_use (i) == zone_count[i]) + if (zone_in_use(i) == zone_count[i]) continue; if (!zone_count[i]) { - if (bad_zone (i)) + if (bad_zone(i)) continue; - printf ("Zone %d: marked in use, no file uses it.", i); - if (ask ("Unmark", 1)) - unmark_zone (i); + printf("Zone %d: marked in use, no file uses it.", i); + if (ask("Unmark", 1)) + unmark_zone(i); continue; } - printf ("Zone %d: %sin use, counted=%d\n", - i, zone_in_use (i) ? "" : "not ", zone_count[i]); + printf("Zone %d: %sin use, counted=%d\n", + i, zone_in_use(i) ? "" : "not ", zone_count[i]); } } #endif static void check(void) { - memset(inode_count,0,(INODES + 1) * sizeof(*inode_count)); - memset(zone_count,0,ZONES*sizeof(*zone_count)); + memset(inode_count, 0, (INODES + 1) * sizeof(*inode_count)); + memset(zone_count, 0, ZONES * sizeof(*zone_count)); check_zones(ROOT_INO); recursive_check(ROOT_INO); check_counts(); } #ifdef HAVE_MINIX2 -static void -check2 (void) +static void check2(void) { - memset (inode_count, 0, (INODES + 1) * sizeof (*inode_count)); - memset (zone_count, 0, ZONES * sizeof (*zone_count)); - check_zones2 (ROOT_INO); - recursive_check2 (ROOT_INO); - check_counts2 (); + memset(inode_count, 0, (INODES + 1) * sizeof(*inode_count)); + memset(zone_count, 0, ZONES * sizeof(*zone_count)); + check_zones2(ROOT_INO); + recursive_check2(ROOT_INO); + check_counts2(); } #endif -extern int -fsck_minix_main(int argc, char ** argv) +extern int fsck_minix_main(int argc, char **argv) { struct termios tmp; int count; @@ -1264,29 +1261,47 @@ fsck_minix_main(int argc, char ** argv) show_usage(); else device_name = argv[0]; - } else while (*++argv[0]) - switch (argv[0][0]) { - case 'l': list=1; break; - case 'a': automatic=1; repair=1; break; - case 'r': automatic=0; repair=1; break; - case 'v': verbose=1; break; - case 's': show=1; break; - case 'm': warn_mode=1; break; - case 'f': force=1; break; - default: show_usage(); - } + } else + while (*++argv[0]) + switch (argv[0][0]) { + case 'l': + list = 1; + break; + case 'a': + automatic = 1; + repair = 1; + break; + case 'r': + automatic = 0; + repair = 1; + break; + case 'v': + verbose = 1; + break; + case 's': + show = 1; + break; + case 'm': + warn_mode = 1; + break; + case 'f': + force = 1; + break; + default: + show_usage(); + } } if (!device_name) show_usage(); - check_mount(); /* trying to check a mounted filesystem? */ + check_mount(); /* trying to check a mounted filesystem? */ if (repair && !automatic) { if (!isatty(0) || !isatty(1)) die("need terminal for interactive repairs"); } - IN = open(device_name,repair?O_RDWR:O_RDONLY); + IN = open(device_name, repair ? O_RDWR : O_RDONLY); if (IN < 0) die("unable to open '%s'"); - for (count=0 ; count<3 ; count++) + for (count = 0; count < 3; count++) sync(); read_superblock(); @@ -1297,80 +1312,77 @@ fsck_minix_main(int argc, char ** argv) * command line. */ printf("%s, %s\n", program_name, program_version); - if ( !(Super.s_state & MINIX_ERROR_FS) && - (Super.s_state & MINIX_VALID_FS) && - !force ) { + if (!(Super.s_state & MINIX_ERROR_FS) && + (Super.s_state & MINIX_VALID_FS) && !force) { if (repair) printf("%s is clean, no check.\n", device_name); return retcode; - } - else if (force) + } else if (force) printf("Forcing filesystem check on %s.\n", device_name); else if (repair) - printf("Filesystem on %s is dirty, needs checking.\n",\ - device_name); + printf("Filesystem on %s is dirty, needs checking.\n", + device_name); read_tables(); if (repair && !automatic) { - tcgetattr(0,&termios); + tcgetattr(0, &termios); tmp = termios; - tmp.c_lflag &= ~(ICANON|ECHO); - tcsetattr(0,TCSANOW,&tmp); + tmp.c_lflag &= ~(ICANON | ECHO); + tcsetattr(0, TCSANOW, &tmp); termios_set = 1; } - #if HAVE_MINIX2 if (version2) { - check_root2 (); - check2 (); - } else + check_root2(); + check2(); + } else #endif - { + { check_root(); check(); } if (verbose) { int i, free; - for (i=1,free=0 ; i <= INODES ; i++) + for (i = 1, free = 0; i <= INODES; i++) if (!inode_in_use(i)) free++; - printf("\n%6ld inodes used (%ld%%)\n",(INODES-free), - 100*(INODES-free)/INODES); - for (i=FIRSTZONE,free=0 ; i < ZONES ; i++) + printf("\n%6ld inodes used (%ld%%)\n", (INODES - free), + 100 * (INODES - free) / INODES); + for (i = FIRSTZONE, free = 0; i < ZONES; i++) if (!zone_in_use(i)) free++; - printf("%6ld zones used (%ld%%)\n",(ZONES-free), - 100*(ZONES-free)/ZONES); + printf("%6ld zones used (%ld%%)\n", (ZONES - free), + 100 * (ZONES - free) / ZONES); printf("\n%6d regular files\n" - "%6d directories\n" - "%6d character device files\n" - "%6d block device files\n" - "%6d links\n" - "%6d symbolic links\n" - "------\n" - "%6d files\n", - regular,directory,chardev,blockdev, - links-2*directory+1,symlinks,total-2*directory+1); + "%6d directories\n" + "%6d character device files\n" + "%6d block device files\n" + "%6d links\n" + "%6d symbolic links\n" + "------\n" + "%6d files\n", + regular, directory, chardev, blockdev, + links - 2 * directory + 1, symlinks, + total - 2 * directory + 1); } if (changed) { write_tables(); - printf( "----------------------------\n" - "FILE SYSTEM HAS BEEN CHANGED\n" - "----------------------------\n"); - for (count=0 ; count<3 ; count++) + printf("----------------------------\n" + "FILE SYSTEM HAS BEEN CHANGED\n" + "----------------------------\n"); + for (count = 0; count < 3; count++) sync(); - } - else if ( repair ) + } else if (repair) write_super_block(); - + if (repair && !automatic) - tcsetattr(0,TCSANOW,&termios); + tcsetattr(0, TCSANOW, &termios); if (changed) - retcode += 3; + retcode += 3; if (errors_uncorrected) - retcode += 4; + retcode += 4; return retcode; } diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index b90d3a700..4435cb64a 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * mkfs.c - make a linux (minix) file-system. * @@ -107,27 +108,30 @@ #define BITS_PER_BLOCK (BLOCK_SIZE<<3) -static char * program_name = "mkfs"; -static char * device_name = NULL; +static char *program_name = "mkfs"; +static char *device_name = NULL; static int DEV = -1; static long BLOCKS = 0; static int check = 0; static int badblocks = 0; -static int namelen = 30; /* default (changed to 30, per Linus's - suggestion, Sun Nov 21 08:05:07 1993) */ +static int namelen = 30; /* default (changed to 30, per Linus's + + suggestion, Sun Nov 21 08:05:07 1993) */ static int dirsize = 32; static int magic = MINIX_SUPER_MAGIC2; static int version2 = 0; static char root_block[BLOCK_SIZE] = "\0"; -static char * inode_buffer = NULL; +static char *inode_buffer = NULL; + #define Inode (((struct minix_inode *) inode_buffer)-1) #ifdef HAVE_MINIX2 #define Inode2 (((struct minix2_inode *) inode_buffer)-1) #endif static char super_block_buffer[BLOCK_SIZE]; static char boot_block_buffer[512]; + #define Super (*(struct minix_super_block *)super_block_buffer) #define INODES ((unsigned long)Super.s_ninodes) #ifdef HAVE_MINIX2 @@ -164,21 +168,28 @@ static unsigned long req_nr_inodes = 0; * to compile this under minix, volatile gives a warning, as * exit() isn't defined as volatile under minix. */ -static volatile void die(char *str) { +static volatile void die(char *str) +{ fprintf(stderr, "%s: %s\n", program_name, str); exit(8); } static volatile void show_usage() { - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", BB_VER, BB_BT); - fprintf(stderr, "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n\n", program_name); + fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", + BB_VER, BB_BT); + fprintf(stderr, + "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n\n", + program_name); fprintf(stderr, "Make a MINIX filesystem.\n\n"); fprintf(stderr, "OPTIONS:\n"); fprintf(stderr, "\t-c\t\tCheck the device for bad blocks\n"); - fprintf(stderr, "\t-n [14|30]\tSpecify the maximum length of filenames\n"); - fprintf(stderr, "\t-i\t\tSpecify the number of inodes for the filesystem\n"); - fprintf(stderr, "\t-l FILENAME\tRead the bad blocks list from FILENAME\n"); + fprintf(stderr, + "\t-n [14|30]\tSpecify the maximum length of filenames\n"); + fprintf(stderr, + "\t-i\t\tSpecify the number of inodes for the filesystem\n"); + fprintf(stderr, + "\t-l FILENAME\tRead the bad blocks list from FILENAME\n"); fprintf(stderr, "\t-v\t\tMake a Minix version 2 filesystem\n\n"); exit(16); } @@ -190,56 +201,55 @@ static volatile void show_usage() */ static void check_mount(void) { - FILE * f; - struct mntent * mnt; + FILE *f; + struct mntent *mnt; - if ((f = setmntent (MOUNTED, "r")) == NULL) + if ((f = setmntent(MOUNTED, "r")) == NULL) return; - while ((mnt = getmntent (f)) != NULL) - if (strcmp (device_name, mnt->mnt_fsname) == 0) + while ((mnt = getmntent(f)) != NULL) + if (strcmp(device_name, mnt->mnt_fsname) == 0) break; - endmntent (f); + endmntent(f); if (!mnt) return; die("%s is mounted; will not make a filesystem here!"); } -static long valid_offset (int fd, int offset) +static long valid_offset(int fd, int offset) { char ch; - if (lseek (fd, offset, 0) < 0) + if (lseek(fd, offset, 0) < 0) return 0; - if (read (fd, &ch, 1) < 1) + if (read(fd, &ch, 1) < 1) return 0; return 1; } -static int count_blocks (int fd) +static int count_blocks(int fd) { int high, low; low = 0; - for (high = 1; valid_offset (fd, high); high *= 2) + for (high = 1; valid_offset(fd, high); high *= 2) low = high; - while (low < high - 1) - { + while (low < high - 1) { const int mid = (low + high) / 2; - if (valid_offset (fd, mid)) + if (valid_offset(fd, mid)) low = mid; else high = mid; } - valid_offset (fd, 0); + valid_offset(fd, 0); return (low + 1); } -static int get_size(const char *file) +static int get_size(const char *file) { - int fd; - long size; + int fd; + long size; fd = open(file, O_RDWR); if (fd < 0) { @@ -250,7 +260,7 @@ static int get_size(const char *file) close(fd); return (size * 512); } - + size = count_blocks(fd); close(fd); return size; @@ -270,18 +280,18 @@ static void write_tables(void) die("seek failed in write_tables"); if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE)) die("unable to write super-block"); - if (IMAPS*BLOCK_SIZE != write(DEV,inode_map,IMAPS*BLOCK_SIZE)) + if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE)) die("unable to write inode map"); - if (ZMAPS*BLOCK_SIZE != write(DEV,zone_map,ZMAPS*BLOCK_SIZE)) + if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE)) die("unable to write zone map"); - if (INODE_BUFFER_SIZE != write(DEV,inode_buffer,INODE_BUFFER_SIZE)) + if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE)) die("unable to write inodes"); - + } -static void write_block(int blk, char * buffer) +static void write_block(int blk, char *buffer) { - if (blk*BLOCK_SIZE != lseek(DEV, blk*BLOCK_SIZE, SEEK_SET)) + if (blk * BLOCK_SIZE != lseek(DEV, blk * BLOCK_SIZE, SEEK_SET)) die("seek failed in write_block"); if (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE)) die("write failed in write_block"); @@ -291,10 +301,10 @@ static int get_free_block(void) { int blk; - if (used_good_blocks+1 >= MAX_GOOD_BLOCKS) + if (used_good_blocks + 1 >= MAX_GOOD_BLOCKS) die("too many bad blocks"); if (used_good_blocks) - blk = good_blocks_table[used_good_blocks-1]+1; + blk = good_blocks_table[used_good_blocks - 1] + 1; else blk = FIRSTZONE; while (blk < ZONES && zone_in_use(blk)) @@ -310,14 +320,14 @@ static void mark_good_blocks(void) { int blk; - for (blk=0 ; blk < used_good_blocks ; blk++) + for (blk = 0; blk < used_good_blocks; blk++) mark_zone(good_blocks_table[blk]); } inline int next(int zone) { if (!zone) - zone = FIRSTZONE-1; + zone = FIRSTZONE - 1; while (++zone < ZONES) if (zone_in_use(zone)) return zone; @@ -326,11 +336,11 @@ inline int next(int zone) static void make_bad_inode(void) { - struct minix_inode * inode = &Inode[MINIX_BAD_INO]; - int i,j,zone; - int ind=0,dind=0; - unsigned short ind_block[BLOCK_SIZE>>1]; - unsigned short dind_block[BLOCK_SIZE>>1]; + struct minix_inode *inode = &Inode[MINIX_BAD_INO]; + int i, j, zone; + int ind = 0, dind = 0; + unsigned short ind_block[BLOCK_SIZE >> 1]; + unsigned short dind_block[BLOCK_SIZE >> 1]; #define NEXT_BAD (zone = next(zone)) @@ -340,34 +350,34 @@ static void make_bad_inode(void) inode->i_nlinks = 1; inode->i_time = time(NULL); inode->i_mode = S_IFREG + 0000; - inode->i_size = badblocks*BLOCK_SIZE; + inode->i_size = badblocks * BLOCK_SIZE; zone = next(0); - for (i=0 ; i<7 ; i++) { + for (i = 0; i < 7; i++) { inode->i_zone[i] = zone; if (!NEXT_BAD) goto end_bad; } inode->i_zone[7] = ind = get_free_block(); - memset(ind_block,0,BLOCK_SIZE); - for (i=0 ; i<512 ; i++) { + memset(ind_block, 0, BLOCK_SIZE); + for (i = 0; i < 512; i++) { ind_block[i] = zone; if (!NEXT_BAD) goto end_bad; } inode->i_zone[8] = dind = get_free_block(); - memset(dind_block,0,BLOCK_SIZE); - for (i=0 ; i<512 ; i++) { - write_block(ind,(char *) ind_block); + memset(dind_block, 0, BLOCK_SIZE); + for (i = 0; i < 512; i++) { + write_block(ind, (char *) ind_block); dind_block[i] = ind = get_free_block(); - memset(ind_block,0,BLOCK_SIZE); - for (j=0 ; j<512 ; j++) { + memset(ind_block, 0, BLOCK_SIZE); + for (j = 0; j < 512; j++) { ind_block[j] = zone; if (!NEXT_BAD) goto end_bad; } } die("too many bad blocks"); -end_bad: + end_bad: if (ind) write_block(ind, (char *) ind_block); if (dind) @@ -375,8 +385,7 @@ end_bad: } #ifdef HAVE_MINIX2 -static void -make_bad_inode2 (void) +static void make_bad_inode2(void) { struct minix2_inode *inode = &Inode2[MINIX_BAD_INO]; int i, j, zone; @@ -386,30 +395,30 @@ make_bad_inode2 (void) if (!badblocks) return; - mark_inode (MINIX_BAD_INO); + mark_inode(MINIX_BAD_INO); inode->i_nlinks = 1; - inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL); + inode->i_atime = inode->i_mtime = inode->i_ctime = time(NULL); inode->i_mode = S_IFREG + 0000; inode->i_size = badblocks * BLOCK_SIZE; - zone = next (0); + zone = next(0); for (i = 0; i < 7; i++) { inode->i_zone[i] = zone; if (!NEXT_BAD) goto end_bad; } - inode->i_zone[7] = ind = get_free_block (); - memset (ind_block, 0, BLOCK_SIZE); + inode->i_zone[7] = ind = get_free_block(); + memset(ind_block, 0, BLOCK_SIZE); for (i = 0; i < 256; i++) { ind_block[i] = zone; if (!NEXT_BAD) goto end_bad; } - inode->i_zone[8] = dind = get_free_block (); - memset (dind_block, 0, BLOCK_SIZE); + inode->i_zone[8] = dind = get_free_block(); + memset(dind_block, 0, BLOCK_SIZE); for (i = 0; i < 256; i++) { - write_block (ind, (char *) ind_block); - dind_block[i] = ind = get_free_block (); - memset (ind_block, 0, BLOCK_SIZE); + write_block(ind, (char *) ind_block); + dind_block[i] = ind = get_free_block(); + memset(ind_block, 0, BLOCK_SIZE); for (j = 0; j < 256; j++) { ind_block[j] = zone; if (!NEXT_BAD) @@ -417,47 +426,46 @@ make_bad_inode2 (void) } } /* Could make triple indirect block here */ - die ("too many bad blocks"); - end_bad: + die("too many bad blocks"); + end_bad: if (ind) - write_block (ind, (char *) ind_block); + write_block(ind, (char *) ind_block); if (dind) - write_block (dind, (char *) dind_block); + write_block(dind, (char *) dind_block); } #endif static void make_root_inode(void) { - struct minix_inode * inode = &Inode[MINIX_ROOT_INO]; + struct minix_inode *inode = &Inode[MINIX_ROOT_INO]; mark_inode(MINIX_ROOT_INO); inode->i_zone[0] = get_free_block(); inode->i_nlinks = 2; inode->i_time = time(NULL); if (badblocks) - inode->i_size = 3*dirsize; + inode->i_size = 3 * dirsize; else { - root_block[2*dirsize] = '\0'; - root_block[2*dirsize+1] = '\0'; - inode->i_size = 2*dirsize; + root_block[2 * dirsize] = '\0'; + root_block[2 * dirsize + 1] = '\0'; + inode->i_size = 2 * dirsize; } inode->i_mode = S_IFDIR + 0755; inode->i_uid = getuid(); if (inode->i_uid) inode->i_gid = getgid(); - write_block(inode->i_zone[0],root_block); + write_block(inode->i_zone[0], root_block); } #ifdef HAVE_MINIX2 -static void -make_root_inode2 (void) +static void make_root_inode2(void) { struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO]; - mark_inode (MINIX_ROOT_INO); - inode->i_zone[0] = get_free_block (); + mark_inode(MINIX_ROOT_INO); + inode->i_zone[0] = get_free_block(); inode->i_nlinks = 2; - inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL); + inode->i_atime = inode->i_mtime = inode->i_ctime = time(NULL); if (badblocks) inode->i_size = 3 * dirsize; else { @@ -469,7 +477,7 @@ make_root_inode2 (void) inode->i_uid = getuid(); if (inode->i_uid) inode->i_gid = getgid(); - write_block (inode->i_zone[0], root_block); + write_block(inode->i_zone[0], root_block); } #endif @@ -478,34 +486,38 @@ static void setup_tables(void) int i; unsigned long inodes; - memset(super_block_buffer,0,BLOCK_SIZE); - memset(boot_block_buffer,0,512); + memset(super_block_buffer, 0, BLOCK_SIZE); + memset(boot_block_buffer, 0, 512); MAGIC = magic; ZONESIZE = 0; - MAXSIZE = version2 ? 0x7fffffff : (7+512+512*512)*1024; + MAXSIZE = version2 ? 0x7fffffff : (7 + 512 + 512 * 512) * 1024; ZONES = BLOCKS; /* some magic nrs: 1 inode / 3 blocks */ - if ( req_nr_inodes == 0 ) - inodes = BLOCKS/3; + if (req_nr_inodes == 0) + inodes = BLOCKS / 3; else inodes = req_nr_inodes; /* Round up inode count to fill block size */ #ifdef HAVE_MINIX2 if (version2) inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) & - ~(MINIX2_INODES_PER_BLOCK - 1)); + ~(MINIX2_INODES_PER_BLOCK - 1)); else #endif inodes = ((inodes + MINIX_INODES_PER_BLOCK - 1) & - ~(MINIX_INODES_PER_BLOCK - 1)); + ~(MINIX_INODES_PER_BLOCK - 1)); if (inodes > 65535) inodes = 65535; INODES = inodes; - IMAPS = UPPER(INODES + 1,BITS_PER_BLOCK); + IMAPS = UPPER(INODES + 1, BITS_PER_BLOCK); ZMAPS = 0; - i=0; - while (ZMAPS != UPPER(BLOCKS - (2+IMAPS+ZMAPS+INODE_BLOCKS) + 1,BITS_PER_BLOCK) && i<1000) { - ZMAPS = UPPER(BLOCKS - (2+IMAPS+ZMAPS+INODE_BLOCKS) + 1,BITS_PER_BLOCK); + i = 0; + while (ZMAPS != + UPPER(BLOCKS - (2 + IMAPS + ZMAPS + INODE_BLOCKS) + 1, + BITS_PER_BLOCK) && i < 1000) { + ZMAPS = + UPPER(BLOCKS - (2 + IMAPS + ZMAPS + INODE_BLOCKS) + 1, + BITS_PER_BLOCK); i++; } /* Real bad hack but overwise mkfs.minix can be thrown @@ -514,50 +526,51 @@ static void setup_tables(void) * dd if=/dev/zero of=test.fs count=10 bs=1024 * /sbin/mkfs.minix -i 200 test.fs * */ - if (i>=999) { - die ("unable to allocate buffers for maps"); + if (i >= 999) { + die("unable to allocate buffers for maps"); } FIRSTZONE = NORM_FIRSTZONE; inode_map = malloc(IMAPS * BLOCK_SIZE); zone_map = malloc(ZMAPS * BLOCK_SIZE); if (!inode_map || !zone_map) die("unable to allocate buffers for maps"); - memset(inode_map,0xff,IMAPS * BLOCK_SIZE); - memset(zone_map,0xff,ZMAPS * BLOCK_SIZE); - for (i = FIRSTZONE ; i<ZONES ; i++) + memset(inode_map, 0xff, IMAPS * BLOCK_SIZE); + memset(zone_map, 0xff, ZMAPS * BLOCK_SIZE); + for (i = FIRSTZONE; i < ZONES; i++) unmark_zone(i); - for (i = MINIX_ROOT_INO ; i<=INODES ; i++) + for (i = MINIX_ROOT_INO; i <= INODES; i++) unmark_inode(i); inode_buffer = malloc(INODE_BUFFER_SIZE); if (!inode_buffer) die("unable to allocate buffer for inodes"); - memset(inode_buffer,0,INODE_BUFFER_SIZE); - printf("%ld inodes\n",INODES); - printf("%ld blocks\n",ZONES); - printf("Firstdatazone=%ld (%ld)\n",FIRSTZONE,NORM_FIRSTZONE); - printf("Zonesize=%d\n",BLOCK_SIZE<<ZONESIZE); - printf("Maxsize=%ld\n\n",MAXSIZE); + memset(inode_buffer, 0, INODE_BUFFER_SIZE); + printf("%ld inodes\n", INODES); + printf("%ld blocks\n", ZONES); + printf("Firstdatazone=%ld (%ld)\n", FIRSTZONE, NORM_FIRSTZONE); + printf("Zonesize=%d\n", BLOCK_SIZE << ZONESIZE); + printf("Maxsize=%ld\n\n", MAXSIZE); } /* * Perform a test of a block; return the number of * blocks readable/writeable. */ -long do_check(char * buffer, int try, unsigned int current_block) +long do_check(char *buffer, int try, unsigned int current_block) { long got; - + /* Seek to the correct loc. */ if (lseek(DEV, current_block * BLOCK_SIZE, SEEK_SET) != - current_block * BLOCK_SIZE ) { - die("seek failed during testing of blocks"); + current_block * BLOCK_SIZE) { + die("seek failed during testing of blocks"); } /* Try the read */ got = read(DEV, buffer, try * BLOCK_SIZE); - if (got < 0) got = 0; - if (got & (BLOCK_SIZE - 1 )) { + if (got < 0) + got = 0; + if (got & (BLOCK_SIZE - 1)) { printf("Weird values in do_check: probably bugs\n"); } got /= BLOCK_SIZE; @@ -570,7 +583,7 @@ static void alarm_intr(int alnum) { if (currently_testing >= ZONES) return; - signal(SIGALRM,alarm_intr); + signal(SIGALRM, alarm_intr); alarm(5); if (!currently_testing) return; @@ -580,19 +593,19 @@ static void alarm_intr(int alnum) static void check_blocks(void) { - int try,got; + int try, got; static char buffer[BLOCK_SIZE * TEST_BUFFER_BLOCKS]; - currently_testing=0; - signal(SIGALRM,alarm_intr); + currently_testing = 0; + signal(SIGALRM, alarm_intr); alarm(5); while (currently_testing < ZONES) { - if (lseek(DEV,currently_testing*BLOCK_SIZE,SEEK_SET) != - currently_testing*BLOCK_SIZE) + if (lseek(DEV, currently_testing * BLOCK_SIZE, SEEK_SET) != + currently_testing * BLOCK_SIZE) die("seek failed in check_blocks"); try = TEST_BUFFER_BLOCKS; if (currently_testing + try > ZONES) - try = ZONES-currently_testing; + try = ZONES - currently_testing; got = do_check(buffer, try, currently_testing); currently_testing += got; if (got == try) @@ -613,139 +626,141 @@ static void get_list_blocks(filename) char *filename; { - FILE *listfile; - unsigned long blockno; - - listfile=fopen(filename,"r"); - if(listfile == (FILE *)NULL) { - die("can't open file of bad blocks"); - } - while(!feof(listfile)) { - fscanf(listfile,"%ld\n", &blockno); - mark_zone(blockno); - badblocks++; - } - if(badblocks > 1) - printf("%d bad blocks\n", badblocks); - else if (badblocks == 1) - printf("one bad block\n"); + FILE *listfile; + unsigned long blockno; + + listfile = fopen(filename, "r"); + if (listfile == (FILE *) NULL) { + die("can't open file of bad blocks"); + } + while (!feof(listfile)) { + fscanf(listfile, "%ld\n", &blockno); + mark_zone(blockno); + badblocks++; + } + if (badblocks > 1) + printf("%d bad blocks\n", badblocks); + else if (badblocks == 1) + printf("one bad block\n"); } -extern int -mkfs_minix_main(int argc, char ** argv) +extern int mkfs_minix_main(int argc, char **argv) { - int i; - char * tmp; - struct stat statbuf; - char * listfile = NULL; - - if (argc && *argv) - program_name = *argv; - if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad inode size"); + int i; + char *tmp; + struct stat statbuf; + char *listfile = NULL; + + if (argc && *argv) + program_name = *argv; + if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) + die("bad inode size"); #ifdef HAVE_MINIX2 - if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad inode size"); + if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) + die("bad inode size"); #endif - opterr = 0; - while ((i = getopt(argc, argv, "ci:l:n:v")) != EOF) - switch (i) { - case 'c': - check=1; break; - case 'i': - req_nr_inodes = (unsigned long) atol(optarg); - break; - case 'l': - listfile = optarg; break; - case 'n': - i = strtoul(optarg,&tmp,0); - if (*tmp) - show_usage(); - if (i == 14) - magic = MINIX_SUPER_MAGIC; - else if (i == 30) - magic = MINIX_SUPER_MAGIC2; - else - show_usage(); - namelen = i; - dirsize = i+2; - break; - case 'v': + opterr = 0; + while ((i = getopt(argc, argv, "ci:l:n:v")) != EOF) + switch (i) { + case 'c': + check = 1; + break; + case 'i': + req_nr_inodes = (unsigned long) atol(optarg); + break; + case 'l': + listfile = optarg; + break; + case 'n': + i = strtoul(optarg, &tmp, 0); + if (*tmp) + show_usage(); + if (i == 14) + magic = MINIX_SUPER_MAGIC; + else if (i == 30) + magic = MINIX_SUPER_MAGIC2; + else + show_usage(); + namelen = i; + dirsize = i + 2; + break; + case 'v': #ifdef HAVE_MINIX2 - version2 = 1; + version2 = 1; #else - fprintf(stderr,"%s: not compiled with minix v2 support\n",program_name,device_name); - exit(-1); + fprintf(stderr, "%s: not compiled with minix v2 support\n", + program_name, device_name); + exit(-1); #endif - break; - default: - show_usage(); - } - argc -= optind; - argv += optind; - if (argc > 0 && !device_name) { - device_name = argv[0]; - argc--; - argv++; - } - if (argc > 0) { - BLOCKS = strtol(argv[0],&tmp,0); - if (*tmp) { - printf("strtol error: number of blocks not specified"); - show_usage(); - } - } - - if (device_name && !BLOCKS) - BLOCKS = get_size (device_name) / 1024; - if (!device_name || BLOCKS<10) { - show_usage(); - } + break; + default: + show_usage(); + } + argc -= optind; + argv += optind; + if (argc > 0 && !device_name) { + device_name = argv[0]; + argc--; + argv++; + } + if (argc > 0) { + BLOCKS = strtol(argv[0], &tmp, 0); + if (*tmp) { + printf("strtol error: number of blocks not specified"); + show_usage(); + } + } + + if (device_name && !BLOCKS) + BLOCKS = get_size(device_name) / 1024; + if (!device_name || BLOCKS < 10) { + show_usage(); + } #ifdef HAVE_MINIX2 - if (version2) { - if (namelen == 14) - magic = MINIX2_SUPER_MAGIC; - else - magic = MINIX2_SUPER_MAGIC2; - } else + if (version2) { + if (namelen == 14) + magic = MINIX2_SUPER_MAGIC; + else + magic = MINIX2_SUPER_MAGIC2; + } else #endif - if (BLOCKS > 65535) - BLOCKS = 65535; - check_mount(); /* is it already mounted? */ - tmp = root_block; - *(short *)tmp = 1; - strcpy(tmp+2,"."); - tmp += dirsize; - *(short *)tmp = 1; - strcpy(tmp+2,".."); - tmp += dirsize; - *(short *)tmp = 2; - strcpy(tmp+2,".badblocks"); - DEV = open(device_name,O_RDWR ); - if (DEV<0) - die("unable to open %s"); - if (fstat(DEV,&statbuf)<0) - die("unable to stat %s"); - if (!S_ISBLK(statbuf.st_mode)) - check=0; - else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) - die("will not try to make filesystem on '%s'"); - setup_tables(); - if (check) - check_blocks(); - else if (listfile) - get_list_blocks(listfile); + if (BLOCKS > 65535) + BLOCKS = 65535; + check_mount(); /* is it already mounted? */ + tmp = root_block; + *(short *) tmp = 1; + strcpy(tmp + 2, "."); + tmp += dirsize; + *(short *) tmp = 1; + strcpy(tmp + 2, ".."); + tmp += dirsize; + *(short *) tmp = 2; + strcpy(tmp + 2, ".badblocks"); + DEV = open(device_name, O_RDWR); + if (DEV < 0) + die("unable to open %s"); + if (fstat(DEV, &statbuf) < 0) + die("unable to stat %s"); + if (!S_ISBLK(statbuf.st_mode)) + check = 0; + else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) + die("will not try to make filesystem on '%s'"); + setup_tables(); + if (check) + check_blocks(); + else if (listfile) + get_list_blocks(listfile); #ifdef HAVE_MINIX2 - if (version2) { - make_root_inode2 (); - make_bad_inode2 (); - } else + if (version2) { + make_root_inode2(); + make_bad_inode2(); + } else #endif - { - make_root_inode(); - make_bad_inode(); - } - mark_good_blocks(); - write_tables(); - return 0; + { + make_root_inode(); + make_bad_inode(); + } + mark_good_blocks(); + write_tables(); + return 0; } diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index 601188f86..130d24162 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * mkswap.c - set up a linux swap device * @@ -40,20 +41,21 @@ #include <string.h> #include <fcntl.h> #include <stdlib.h> -#include <sys/ioctl.h> /* for _IO */ +#include <sys/ioctl.h> /* for _IO */ #include <sys/utsname.h> #include <sys/stat.h> -#include <asm/page.h> /* for PAGE_SIZE and PAGE_SHIFT */ +#include <asm/page.h> /* for PAGE_SIZE and PAGE_SHIFT */ /* we also get PAGE_SIZE via getpagesize() */ -static const char mkswap_usage[] = "mkswap [-c] [-v0|-v1] device [block-count]\n\n" -"Prepare a disk partition to be used as a swap partition.\n\n" -"Options:\n" -"\t-c\t\tCheck for read-ability.\n" -"\t-v0\t\tMake version 0 swap [max 128 Megs].\n" -"\t-v1\t\tMake version 1 swap [big!] (default for kernels > 2.1.117).\n" -"\tblock-count\tNumber of block to use (default is entire partition).\n"; +static const char mkswap_usage[] = + "mkswap [-c] [-v0|-v1] device [block-count]\n\n" + "Prepare a disk partition to be used as a swap partition.\n\n" + "Options:\n" "\t-c\t\tCheck for read-ability.\n" + "\t-v0\t\tMake version 0 swap [max 128 Megs].\n" + "\t-v1\t\tMake version 1 swap [big!] (default for kernels > 2.1.117).\n" + + "\tblock-count\tNumber of block to use (default is entire partition).\n"; #ifndef _IO @@ -64,8 +66,8 @@ static const char mkswap_usage[] = "mkswap [-c] [-v0|-v1] device [block-count]\n #define BLKGETSIZE _IO(0x12,96) #endif -static char * program_name = "mkswap"; -static char * device_name = NULL; +static char *program_name = "mkswap"; +static char *device_name = NULL; static int DEV = -1; static long PAGES = 0; static int check = 0; @@ -74,8 +76,8 @@ static int version = -1; #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) -static int -linux_version_code(void) { +static int linux_version_code(void) +{ struct utsname my_utsname; int p, q, r; @@ -83,7 +85,7 @@ linux_version_code(void) { p = atoi(strtok(my_utsname.release, ".")); q = atoi(strtok(NULL, ".")); r = atoi(strtok(NULL, ".")); - return MAKE_VERSION(p,q,r); + return MAKE_VERSION(p, q, r); } return 0; } @@ -98,7 +100,7 @@ static int pagesize; static int *signature_page; struct swap_header_v1 { - char bootbits[1024]; /* Space for disklabel etc. */ + char bootbits[1024]; /* Space for disklabel etc. */ unsigned int version; unsigned int last_page; unsigned int nr_badpages; @@ -106,8 +108,8 @@ struct swap_header_v1 { unsigned int badpages[1]; } *p; -static void -init_signature_page() { +static void init_signature_page() +{ pagesize = getpagesize(); #ifdef PAGE_SIZE @@ -115,15 +117,15 @@ init_signature_page() { fprintf(stderr, "Assuming pages of size %d\n", pagesize); #endif signature_page = (int *) malloc(pagesize); - memset(signature_page,0,pagesize); + memset(signature_page, 0, pagesize); p = (struct swap_header_v1 *) signature_page; } -static void -write_signature(char *sig) { +static void write_signature(char *sig) +{ char *sp = (char *) signature_page; - strncpy(sp+pagesize-10, sig, 10); + strncpy(sp + pagesize - 10, sig, 10); } #define V0_MAX_PAGES (8 * (pagesize - 10)) @@ -172,42 +174,46 @@ It is roughly 2GB on i386, PPC, m68k, ARM, 1GB on sparc, 512MB on mips, #define MAX_BADPAGES ((pagesize-1024-128*sizeof(int)-10)/sizeof(int)) -static void bit_set (unsigned int *addr, unsigned int nr) +static void bit_set(unsigned int *addr, unsigned int nr) { unsigned int r, m; addr += nr / (8 * sizeof(int)); + r = *addr; m = 1 << (nr & (8 * sizeof(int) - 1)); + *addr = r | m; } -static int bit_test_and_clear (unsigned int *addr, unsigned int nr) +static int bit_test_and_clear(unsigned int *addr, unsigned int nr) { unsigned int r, m; addr += nr / (8 * sizeof(int)); + r = *addr; m = 1 << (nr & (8 * sizeof(int) - 1)); + *addr = r & ~m; return (r & m) != 0; } -void -die(const char *str) { +void die(const char *str) +{ fprintf(stderr, "%s: %s\n", program_name, str); - exit( FALSE); + exit(FALSE); } -void -page_ok(int page) { - if (version==0) +void page_ok(int page) +{ + if (version == 0) bit_set(signature_page, page); } -void -page_bad(int page) { +void page_bad(int page) +{ if (version == 0) bit_test_and_clear(signature_page, page); else { @@ -218,8 +224,8 @@ page_bad(int page) { badpages++; } -void -check_blocks(void) { +void check_blocks(void) +{ unsigned int current_page; int do_seek = 1; char *buffer; @@ -233,8 +239,8 @@ check_blocks(void) { page_ok(current_page++); continue; } - if (do_seek && lseek(DEV,current_page*pagesize,SEEK_SET) != - current_page*pagesize) + if (do_seek && lseek(DEV, current_page * pagesize, SEEK_SET) != + current_page * pagesize) die("seek failed in check_blocks"); if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) { page_bad(current_page++); @@ -248,30 +254,28 @@ check_blocks(void) { printf("%d bad pages\n", badpages); } -static long valid_offset (int fd, int offset) +static long valid_offset(int fd, int offset) { char ch; - if (lseek (fd, offset, 0) < 0) + if (lseek(fd, offset, 0) < 0) return 0; - if (read (fd, &ch, 1) < 1) + if (read(fd, &ch, 1) < 1) return 0; return 1; } -static int -find_size (int fd) +static int find_size(int fd) { unsigned int high, low; low = 0; - for (high = 1; high > 0 && valid_offset (fd, high); high *= 2) + for (high = 1; high > 0 && valid_offset(fd, high); high *= 2) low = high; - while (low < high - 1) - { + while (low < high - 1) { const int mid = (low + high) / 2; - if (valid_offset (fd, mid)) + if (valid_offset(fd, mid)) low = mid; else high = mid; @@ -280,11 +284,10 @@ find_size (int fd) } /* return size in pages, to avoid integer overflow */ -static long -get_size(const char *file) +static long get_size(const char *file) { - int fd; - long size; + int fd; + long size; fd = open(file, O_RDONLY); if (fd < 0) { @@ -292,7 +295,8 @@ get_size(const char *file) exit(1); } if (ioctl(fd, BLKGETSIZE, &size) >= 0) { - int sectors_per_page = pagesize/512; + int sectors_per_page = pagesize / 512; + size /= sectors_per_page; } else { size = find_size(fd) / pagesize; @@ -301,9 +305,9 @@ get_size(const char *file) return size; } -int mkswap_main(int argc, char ** argv) +int mkswap_main(int argc, char **argv) { - char * tmp; + char *tmp; struct stat statbuf; int sz; int maxpages; @@ -314,56 +318,56 @@ int mkswap_main(int argc, char ** argv) if (argc && *argv) program_name = *argv; - init_signature_page(); /* get pagesize */ + init_signature_page(); /* get pagesize */ while (argc-- > 1) { argv++; if (argv[0][0] != '-') { if (device_name) { - int blocks_per_page = pagesize/1024; - PAGES = strtol(argv[0],&tmp,0)/blocks_per_page; + int blocks_per_page = pagesize / 1024; + + PAGES = strtol(argv[0], &tmp, 0) / blocks_per_page; if (*tmp) - usage( mkswap_usage); + usage(mkswap_usage); } else device_name = argv[0]; } else { switch (argv[0][1]) { - case 'c': - check=1; - break; - case 'f': - force=1; - break; - case 'v': - version=atoi(argv[0]+2); - break; - default: - usage( mkswap_usage); + case 'c': + check = 1; + break; + case 'f': + force = 1; + break; + case 'v': + version = atoi(argv[0] + 2); + break; + default: + usage(mkswap_usage); } } } if (!device_name) { fprintf(stderr, - "%s: error: Nowhere to set up swap on?\n", - program_name); - usage( mkswap_usage); + "%s: error: Nowhere to set up swap on?\n", program_name); + usage(mkswap_usage); } sz = get_size(device_name); if (!PAGES) { PAGES = sz; } else if (PAGES > sz && !force) { fprintf(stderr, - "%s: error: " - "size %ld is larger than device size %d\n", - program_name, - PAGES*(pagesize/1024), sz*(pagesize/1024)); - exit( FALSE); + "%s: error: " + "size %ld is larger than device size %d\n", + program_name, + PAGES * (pagesize / 1024), sz * (pagesize / 1024)); + exit(FALSE); } if (version == -1) { if (PAGES <= V0_MAX_PAGES) version = 0; - else if (linux_version_code() < MAKE_VERSION(2,1,117)) + else if (linux_version_code() < MAKE_VERSION(2, 1, 117)) version = 0; else if (pagesize < 2048) version = 0; @@ -372,21 +376,21 @@ int mkswap_main(int argc, char ** argv) } if (version != 0 && version != 1) { fprintf(stderr, "%s: error: unknown version %d\n", - program_name, version); - usage( mkswap_usage); + program_name, version); + usage(mkswap_usage); } if (PAGES < 10) { fprintf(stderr, - "%s: error: swap area needs to be at least %ldkB\n", - program_name, (long)(10 * pagesize / 1024)); - usage( mkswap_usage); + "%s: error: swap area needs to be at least %ldkB\n", + program_name, (long) (10 * pagesize / 1024)); + usage(mkswap_usage); } #if 0 maxpages = ((version == 0) ? V0_MAX_PAGES : V1_MAX_PAGES); #else if (!version) maxpages = V0_MAX_PAGES; - else if (linux_version_code() >= MAKE_VERSION(2,2,1)) + else if (linux_version_code() >= MAKE_VERSION(2, 2, 1)) maxpages = V1_MAX_PAGES; else { maxpages = V1_OLD_MAX_PAGES; @@ -397,29 +401,29 @@ int mkswap_main(int argc, char ** argv) if (PAGES > maxpages) { PAGES = maxpages; fprintf(stderr, "%s: warning: truncating swap area to %ldkB\n", - program_name, PAGES * pagesize / 1024); + program_name, PAGES * pagesize / 1024); } - DEV = open(device_name,O_RDWR); + DEV = open(device_name, O_RDWR); if (DEV < 0 || fstat(DEV, &statbuf) < 0) { perror(device_name); - exit( FALSE); + exit(FALSE); } if (!S_ISBLK(statbuf.st_mode)) - check=0; + check = 0; else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) die("Will not try to make swapdevice on '%s'"); #ifdef __sparc__ if (!force && version == 0) { /* Don't overwrite partition table unless forced */ - unsigned char *buffer = (unsigned char *)signature_page; + unsigned char *buffer = (unsigned char *) signature_page; unsigned short *q, sum; if (read(DEV, buffer, 512) != 512) die("fatal: first page unreadable"); if (buffer[508] == 0xDA && buffer[509] == 0xBE) { - q = (unsigned short *)(buffer + 510); + q = (unsigned short *) (buffer + 510); for (sum = 0; q >= (unsigned short *) buffer;) sum ^= *q--; if (!sum) { @@ -427,9 +431,8 @@ int mkswap_main(int argc, char ** argv) %s: Device '%s' contains a valid Sun disklabel.\n\ This probably means creating v0 swap would destroy your partition table\n\ No swap created. If you really want to create swap v0 on that device, use\n\ -the -f option to force it.\n", - program_name, device_name); - exit( FALSE); +the -f option to force it.\n", program_name, device_name); + exit(FALSE); } } } @@ -437,11 +440,11 @@ the -f option to force it.\n", if (version == 0 || check) check_blocks(); - if (version == 0 && !bit_test_and_clear(signature_page,0)) + if (version == 0 && !bit_test_and_clear(signature_page, 0)) die("fatal: first page unreadable"); if (version == 1) { p->version = version; - p->last_page = PAGES-1; + p->last_page = PAGES - 1; p->nr_badpages = badpages; } @@ -449,14 +452,14 @@ the -f option to force it.\n", if (goodpages <= 0) die("Unable to set up swap-space: unreadable"); printf("Setting up swapspace version %d, size = %ld bytes\n", - version, (long)(goodpages*pagesize)); + version, (long) (goodpages * pagesize)); write_signature((version == 0) ? "SWAP-SPACE" : "SWAPSPACE2"); offset = ((version == 0) ? 0 : 1024); if (lseek(DEV, offset, SEEK_SET) != offset) die("unable to rewind swap-device"); - if (write(DEV,(char*)signature_page+offset, pagesize-offset) - != pagesize-offset) + if (write(DEV, (char *) signature_page + offset, pagesize - offset) + != pagesize - offset) die("unable to write signature page"); /* @@ -464,6 +467,6 @@ the -f option to force it.\n", * is not actually on disk. (This is a kernel bug.) */ if (fsync(DEV)) - die("fsync failed"); - exit ( TRUE); + die("fsync failed"); + exit(TRUE); } diff --git a/util-linux/more.c b/util-linux/more.c index 821427dda..d5711aa2f 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini more implementation for busybox * @@ -45,19 +46,20 @@ static const char more_usage[] = "more [file ...]\n"; # define stty(fd,argp) tcsetattr(fd,TCSANOW,argp) #endif - FILE *cin; - struct termios initial_settings, new_settings; +FILE *cin; +struct termios initial_settings, new_settings; - void gotsig(int sig) { - stty(fileno(cin), &initial_settings); - fprintf(stdout, "\n"); - exit( TRUE); - } +void gotsig(int sig) +{ + stty(fileno(cin), &initial_settings); + fprintf(stdout, "\n"); + exit(TRUE); +} #endif -#define TERMINAL_WIDTH 79 /* not 80 in case terminal has linefold bug */ +#define TERMINAL_WIDTH 79 /* not 80 in case terminal has linefold bug */ #define TERMINAL_HEIGHT 24 @@ -72,118 +74,121 @@ static int terminal_width = 0, terminal_height = 0; extern int more_main(int argc, char **argv) { - int c, lines=0, input=0; - int next_page=0; - struct stat st; - FILE *file; + int c, lines = 0, input = 0; + int next_page = 0; + struct stat st; + FILE *file; + #ifdef BB_FEATURE_AUTOWIDTH - struct winsize win = {0,0}; + struct winsize win = { 0, 0 }; #endif - argc--; - argv++; - - if ( argc > 0 && (strcmp(*argv,"--help")==0 || strcmp(*argv,"-h")==0) ) { - usage (more_usage); - } - do { - if (argc==0) { - file = stdin; - } - else - file = fopen(*argv, "r"); + argc--; + argv++; - if (file == NULL) { - perror(*argv); - exit(FALSE); + if (argc > 0 + && (strcmp(*argv, "--help") == 0 || strcmp(*argv, "-h") == 0)) { + usage(more_usage); } - fstat(fileno(file), &st); + do { + if (argc == 0) { + file = stdin; + } else + file = fopen(*argv, "r"); + + if (file == NULL) { + perror(*argv); + exit(FALSE); + } + fstat(fileno(file), &st); #ifdef BB_FEATURE_USE_TERMIOS - cin = fopen("/dev/tty", "r"); - if (!cin) - cin = fopen("/dev/console", "r"); + cin = fopen("/dev/tty", "r"); + if (!cin) + cin = fopen("/dev/console", "r"); #ifdef USE_OLD_TERMIO - ioctl(fileno(cin),TCGETA,&initial_settings); + ioctl(fileno(cin), TCGETA, &initial_settings); #else - tcgetattr(fileno(cin),&initial_settings); + tcgetattr(fileno(cin), &initial_settings); #endif - new_settings = initial_settings; - new_settings.c_lflag &= ~ICANON; - new_settings.c_lflag &= ~ECHO; - stty(fileno(cin), &new_settings); - -#ifdef BB_FEATURE_AUTOWIDTH - ioctl(fileno(stdout), TIOCGWINSZ, &win); - if (win.ws_row > 4) - terminal_height = win.ws_row - 2; - if (win.ws_col > 0) - terminal_width = win.ws_col - 1; + new_settings = initial_settings; + new_settings.c_lflag &= ~ICANON; + new_settings.c_lflag &= ~ECHO; + stty(fileno(cin), &new_settings); + +#ifdef BB_FEATURE_AUTOWIDTH + ioctl(fileno(stdout), TIOCGWINSZ, &win); + if (win.ws_row > 4) + terminal_height = win.ws_row - 2; + if (win.ws_col > 0) + terminal_width = win.ws_col - 1; #endif - (void) signal(SIGINT, gotsig); - (void) signal(SIGQUIT, gotsig); - (void) signal(SIGTERM, gotsig); + (void) signal(SIGINT, gotsig); + (void) signal(SIGQUIT, gotsig); + (void) signal(SIGTERM, gotsig); #endif - while ((c = getc(file)) != EOF) { - if ( next_page ) { - int len=0; - next_page = 0; - lines=0; - len = fprintf(stdout, "--More-- "); - if (file != stdin) { - len += fprintf(stdout, "(%d%% of %ld bytes)", - (int) (100*( (double) ftell(file) / (double) st.st_size )), - st.st_size); - } - len += fprintf(stdout, "%s", + while ((c = getc(file)) != EOF) { + if (next_page) { + int len = 0; + + next_page = 0; + lines = 0; + len = fprintf(stdout, "--More-- "); + if (file != stdin) { + len += fprintf(stdout, "(%d%% of %ld bytes)", + (int) (100 * + ((double) ftell(file) / + (double) st.st_size)), + st.st_size); + } + len += fprintf(stdout, "%s", #ifdef BB_FEATURE_USE_TERMIOS - "" + "" #else - "\n" + "\n" #endif - ); + ); - fflush(stdout); - input = getc( cin); + fflush(stdout); + input = getc(cin); #ifdef BB_FEATURE_USE_TERMIOS - /* Erase the "More" message */ - while(--len >= 0) - putc('\b', stdout); - while(++len <= terminal_width) - putc(' ', stdout); - while(--len >= 0) - putc('\b', stdout); - fflush(stdout); + /* Erase the "More" message */ + while (--len >= 0) + putc('\b', stdout); + while (++len <= terminal_width) + putc(' ', stdout); + while (--len >= 0) + putc('\b', stdout); + fflush(stdout); #endif - } - if (c == '\n' ) { - switch(input) { - case 'q': - goto end; - case '\n': - /* increment by just one line if we are at - * the end of this line*/ - next_page = 1; - break; + } + if (c == '\n') { + switch (input) { + case 'q': + goto end; + case '\n': + /* increment by just one line if we are at + * the end of this line*/ + next_page = 1; + break; + } + if (++lines == terminal_height) + next_page = 1; + } + putc(c, stdout); } - if ( ++lines == terminal_height ) - next_page = 1; - } - putc(c, stdout); - } - fclose(file); - fflush(stdout); + fclose(file); + fflush(stdout); - argv++; - } while (--argc > 0); -end: + argv++; + } while (--argc > 0); + end: #ifdef BB_FEATURE_USE_TERMIOS - gotsig(0); -#endif - exit(TRUE); + gotsig(0); +#endif + exit(TRUE); } - diff --git a/util-linux/mount.c b/util-linux/mount.c index 4c9e77be0..c3e3bbd75 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini mount implementation for busybox * @@ -55,357 +56,371 @@ static int use_loop = 0; #endif -extern const char mtab_file[]; /* Defined in utility.c */ +extern const char mtab_file[]; /* Defined in utility.c */ static const char mount_usage[] = "\tmount [flags]\n" - "\tmount [flags] device directory [-o options,more-options]\n" - "\n" - "Flags:\n" - "\t-a:\tMount all file systems in fstab.\n" + "\tmount [flags] device directory [-o options,more-options]\n" + "\n" "Flags:\n" "\t-a:\tMount all file systems in fstab.\n" #ifdef BB_MTAB - "\t-f:\t\"Fake\" mount. Add entry to mount table but don't mount it.\n" - "\t-n:\tDon't write a mount table entry.\n" + "\t-f:\t\"Fake\" mount. Add entry to mount table but don't mount it.\n" + "\t-n:\tDon't write a mount table entry.\n" #endif - "\t-o option:\tOne of many filesystem options, listed below.\n" - "\t-r:\tMount the filesystem read-only.\n" - "\t-t filesystem-type:\tSpecify the filesystem type.\n" - "\t-w:\tMount for reading and writing (default).\n" - "\n" - "Options for use with the \"-o\" flag:\n" - "\tasync / sync:\tWrites are asynchronous / synchronous.\n" - "\tdev / nodev:\tAllow use of special device files / disallow them.\n" - "\texec / noexec:\tAllow use of executable files / disallow them.\n" + "\t-o option:\tOne of many filesystem options, listed below.\n" + "\t-r:\tMount the filesystem read-only.\n" + "\t-t filesystem-type:\tSpecify the filesystem type.\n" + "\t-w:\tMount for reading and writing (default).\n" + "\n" + "Options for use with the \"-o\" flag:\n" + "\tasync / sync:\tWrites are asynchronous / synchronous.\n" + "\tdev / nodev:\tAllow use of special device files / disallow them.\n" + "\texec / noexec:\tAllow use of executable files / disallow them.\n" #if defined BB_FEATURE_MOUNT_LOOP - "\tloop: Mounts a file via loop device.\n" + "\tloop: Mounts a file via loop device.\n" #endif - "\tsuid / nosuid:\tAllow set-user-id-root programs / disallow them.\n" - "\tremount: Re-mount a currently-mounted filesystem, changing its flags.\n" - "\tro / rw: Mount for read-only / read-write.\n" - "\t" - "There are EVEN MORE flags that are specific to each filesystem.\n" - "You'll have to see the written documentation for those.\n"; + "\tsuid / nosuid:\tAllow set-user-id-root programs / disallow them.\n" + "\tremount: Re-mount a currently-mounted filesystem, changing its flags.\n" + "\tro / rw: Mount for read-only / read-write.\n" + "\t" + + "There are EVEN MORE flags that are specific to each filesystem.\n" + "You'll have to see the written documentation for those.\n"; struct mount_options { - const char *name; - unsigned long and; - unsigned long or; + const char *name; + unsigned long and; + unsigned long or; }; static const struct mount_options mount_options[] = { - {"async", ~MS_SYNCHRONOUS, 0}, - {"defaults", ~0, 0}, - {"dev", ~MS_NODEV, 0}, - {"exec", ~MS_NOEXEC, 0}, - {"nodev", ~0, MS_NODEV}, - {"noexec", ~0, MS_NOEXEC}, - {"nosuid", ~0, MS_NOSUID}, - {"remount", ~0, MS_REMOUNT}, - {"ro", ~0, MS_RDONLY}, - {"rw", ~MS_RDONLY, 0}, - {"suid", ~MS_NOSUID, 0}, - {"sync", ~0, MS_SYNCHRONOUS}, - {0, 0, 0} + {"async", ~MS_SYNCHRONOUS, 0}, + {"defaults", ~0, 0}, + {"dev", ~MS_NODEV, 0}, + {"exec", ~MS_NOEXEC, 0}, + {"nodev", ~0, MS_NODEV}, + {"noexec", ~0, MS_NOEXEC}, + {"nosuid", ~0, MS_NOSUID}, + {"remount", ~0, MS_REMOUNT}, + {"ro", ~0, MS_RDONLY}, + {"rw", ~MS_RDONLY, 0}, + {"suid", ~MS_NOSUID, 0}, + {"sync", ~0, MS_SYNCHRONOUS}, + {0, 0, 0} }; static int -do_mount(char* specialfile, char* dir, char* filesystemtype, - long flags, void* string_flags, int useMtab, int fakeIt, char* mtab_opts) +do_mount(char *specialfile, char *dir, char *filesystemtype, + long flags, void *string_flags, int useMtab, int fakeIt, + char *mtab_opts) { - int status=0; + int status = 0; #if defined BB_MTAB - if (fakeIt==FALSE) + if (fakeIt == FALSE) #endif - { + { #if defined BB_FEATURE_MOUNT_LOOP - if (use_loop) { - int loro = flags & MS_RDONLY; - char *lofile = specialfile; - specialfile = find_unused_loop_device(); - if (specialfile == NULL) { - fprintf(stderr, "Could not find a spare loop device\n"); - return( FALSE); - } - if (set_loop (specialfile, lofile, 0, &loro)) { - fprintf(stderr, "Could not setup loop device\n"); - return( FALSE); - } - if (!(flags & MS_RDONLY) && loro) { /* loop is ro, but wanted rw */ - fprintf(stderr, "WARNING: loop device is read-only\n"); - flags &= ~MS_RDONLY; - } - } + if (use_loop) { + int loro = flags & MS_RDONLY; + char *lofile = specialfile; + + specialfile = find_unused_loop_device(); + if (specialfile == NULL) { + fprintf(stderr, "Could not find a spare loop device\n"); + return (FALSE); + } + if (set_loop(specialfile, lofile, 0, &loro)) { + fprintf(stderr, "Could not setup loop device\n"); + return (FALSE); + } + if (!(flags & MS_RDONLY) && loro) { /* loop is ro, but wanted rw */ + fprintf(stderr, "WARNING: loop device is read-only\n"); + flags &= ~MS_RDONLY; + } + } #endif - status=mount(specialfile, dir, filesystemtype, flags, string_flags); - } + status = + mount(specialfile, dir, filesystemtype, flags, string_flags); + } - /* If the mount was sucessful, do anything needed, then return TRUE */ - if (status == 0) { + /* If the mount was sucessful, do anything needed, then return TRUE */ + if (status == 0) { #if defined BB_MTAB - if (useMtab==TRUE) { - write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts); - } + if (useMtab == TRUE) { + write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts); + } #endif - return( TRUE); - } + return (TRUE); + } - /* Bummer. mount failed. Clean up */ + /* Bummer. mount failed. Clean up */ #if defined BB_FEATURE_MOUNT_LOOP - if (specialfile != NULL) { - del_loop(specialfile); - } + if (specialfile != NULL) { + del_loop(specialfile); + } #endif - return( FALSE); + return (FALSE); } #if defined BB_MTAB -#define whine_if_fstab_is_missing() {} +#define whine_if_fstab_is_missing() {} #else extern void whine_if_fstab_is_missing() { - struct stat statBuf; - if (stat("/etc/fstab", &statBuf) < 0) - fprintf(stderr, "/etc/fstab file missing -- install one to name /dev/root.\n\n"); + struct stat statBuf; + + if (stat("/etc/fstab", &statBuf) < 0) + fprintf(stderr, + "/etc/fstab file missing -- install one to name /dev/root.\n\n"); } #endif /* Seperate standard mount options from the nonstandard string options */ static void -parse_mount_options ( char *options, unsigned long *flags, char *strflags) +parse_mount_options(char *options, unsigned long *flags, char *strflags) { - while (options) { - int gotone=FALSE; - char *comma = strchr (options, ','); - const struct mount_options* f = mount_options; - if (comma) - *comma = '\0'; - - while (f->name != 0) { - if (strcasecmp (f->name, options) == 0) { - - *flags &= f->and; - *flags |= f->or; - gotone=TRUE; - break; - } - f++; - } + while (options) { + int gotone = FALSE; + char *comma = strchr(options, ','); + const struct mount_options *f = mount_options; + + if (comma) + *comma = '\0'; + + while (f->name != 0) { + if (strcasecmp(f->name, options) == 0) { + + *flags &= f->and; + *flags |= f->or; + gotone = TRUE; + break; + } + f++; + } #if defined BB_FEATURE_MOUNT_LOOP - if (gotone==FALSE && !strcasecmp ("loop", options)) { /* loop device support */ - use_loop = 1; - gotone=TRUE; - } + if (gotone == FALSE && !strcasecmp("loop", options)) { /* loop device support */ + use_loop = 1; + gotone = TRUE; + } #endif - if (*strflags && strflags!= '\0' && gotone==FALSE) { - char *temp=strflags; - temp += strlen (strflags); - *temp++ = ','; - *temp++ = '\0'; - } - if (gotone==FALSE) - strcat (strflags, options); - if (comma) { - *comma = ','; - options = ++comma; - } else { - break; + if (*strflags && strflags != '\0' && gotone == FALSE) { + char *temp = strflags; + + temp += strlen(strflags); + *temp++ = ','; + *temp++ = '\0'; + } + if (gotone == FALSE) + strcat(strflags, options); + if (comma) { + *comma = ','; + options = ++comma; + } else { + break; + } } - } } int mount_one(char *blockDevice, char *directory, char *filesystemType, - unsigned long flags, char *string_flags, int useMtab, int fakeIt, char *mtab_opts) + unsigned long flags, char *string_flags, int useMtab, int fakeIt, + char *mtab_opts) { - int status = 0; + int status = 0; - char buf[255]; + char buf[255]; #if defined BB_FEATURE_USE_PROCFS - if (strcmp(filesystemType, "auto") == 0) { - FILE *f = fopen ("/proc/filesystems", "r"); - - if (f == NULL) - return( FALSE); - - while (fgets (buf, sizeof (buf), f) != NULL) { - filesystemType = buf; - if (*filesystemType == '\t') { // Not a nodev filesystem - - // Add NULL termination to each line - while (*filesystemType && *filesystemType != '\n') - filesystemType++; - *filesystemType = '\0'; - - filesystemType = buf; - filesystemType++; // hop past tab - - status = do_mount (blockDevice, directory, filesystemType, - flags | MS_MGC_VAL, string_flags, useMtab, - fakeIt, mtab_opts); - if (status == TRUE) - break; - } - } - fclose (f); - } else + if (strcmp(filesystemType, "auto") == 0) { + FILE *f = fopen("/proc/filesystems", "r"); + + if (f == NULL) + return (FALSE); + + while (fgets(buf, sizeof(buf), f) != NULL) { + filesystemType = buf; + if (*filesystemType == '\t') { // Not a nodev filesystem + + // Add NULL termination to each line + while (*filesystemType && *filesystemType != '\n') + filesystemType++; + *filesystemType = '\0'; + + filesystemType = buf; + filesystemType++; // hop past tab + + status = do_mount(blockDevice, directory, filesystemType, + flags | MS_MGC_VAL, string_flags, + useMtab, fakeIt, mtab_opts); + if (status == TRUE) + break; + } + } + fclose(f); + } else #endif - { - status = do_mount (blockDevice, directory, filesystemType, - flags | MS_MGC_VAL, string_flags, useMtab, - fakeIt, mtab_opts); - } - - if (status==FALSE) { - fprintf (stderr, "Mounting %s on %s failed: %s\n", - blockDevice, directory, strerror(errno)); - return (FALSE); - } - return (TRUE); + { + status = do_mount(blockDevice, directory, filesystemType, + flags | MS_MGC_VAL, string_flags, useMtab, + fakeIt, mtab_opts); + } + + if (status == FALSE) { + fprintf(stderr, "Mounting %s on %s failed: %s\n", + blockDevice, directory, strerror(errno)); + return (FALSE); + } + return (TRUE); } -extern int mount_main (int argc, char **argv) +extern int mount_main(int argc, char **argv) { - char string_flags_buf[1024]=""; - char *string_flags = string_flags_buf; - char *extra_opts = string_flags_buf; - unsigned long flags = 0; - char *filesystemType = "auto"; - char *device = NULL; - char *directory = NULL; - int all = FALSE; - int fakeIt = FALSE; - int useMtab = TRUE; - int i; - - /* Only compiled in if BB_MTAB is not defined */ - whine_if_fstab_is_missing(); - - if (argc == 1) { - FILE *mountTable = setmntent (mtab_file, "r"); - if (mountTable) { - struct mntent *m; - while ((m = getmntent (mountTable)) != 0) { - struct fstab* fstabItem; - char *blockDevice = m->mnt_fsname; - /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */ - if (strcmp (blockDevice, "/dev/root") == 0) { - fstabItem = getfsfile ("/"); - if (fstabItem != NULL) - blockDevice = fstabItem->fs_spec; + char string_flags_buf[1024] = ""; + char *string_flags = string_flags_buf; + char *extra_opts = string_flags_buf; + unsigned long flags = 0; + char *filesystemType = "auto"; + char *device = NULL; + char *directory = NULL; + int all = FALSE; + int fakeIt = FALSE; + int useMtab = TRUE; + int i; + + /* Only compiled in if BB_MTAB is not defined */ + whine_if_fstab_is_missing(); + + if (argc == 1) { + FILE *mountTable = setmntent(mtab_file, "r"); + + if (mountTable) { + struct mntent *m; + + while ((m = getmntent(mountTable)) != 0) { + struct fstab *fstabItem; + char *blockDevice = m->mnt_fsname; + + /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */ + if (strcmp(blockDevice, "/dev/root") == 0) { + fstabItem = getfsfile("/"); + if (fstabItem != NULL) + blockDevice = fstabItem->fs_spec; + } + printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir, + m->mnt_type, m->mnt_opts); + } + endmntent(mountTable); + } else { + perror(mtab_file); } - printf ("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir, - m->mnt_type, m->mnt_opts); - } - endmntent (mountTable); - } else { - perror(mtab_file); + exit(TRUE); } - exit( TRUE); - } - - - /* Parse options */ - i = --argc; - argv++; - while (i > 0 && **argv) { - if (**argv == '-') { - char *opt = *argv; - while (i>0 && *++opt) switch (*opt) { - case 'o': - if (--i == 0) { - goto goodbye; - } - parse_mount_options (*(++argv), &flags, string_flags); - break; - case 'r': - flags |= MS_RDONLY; - break; - case 't': - if (--i == 0) { - goto goodbye; - } - filesystemType = *(++argv); - break; - case 'w': - flags &= ~MS_RDONLY; - break; - case 'a': - all = TRUE; - break; + + + /* Parse options */ + i = --argc; + argv++; + while (i > 0 && **argv) { + if (**argv == '-') { + char *opt = *argv; + + while (i > 0 && *++opt) + switch (*opt) { + case 'o': + if (--i == 0) { + goto goodbye; + } + parse_mount_options(*(++argv), &flags, string_flags); + break; + case 'r': + flags |= MS_RDONLY; + break; + case 't': + if (--i == 0) { + goto goodbye; + } + filesystemType = *(++argv); + break; + case 'w': + flags &= ~MS_RDONLY; + break; + case 'a': + all = TRUE; + break; #ifdef BB_MTAB - case 'f': - fakeIt = TRUE; - break; - case 'n': - useMtab = FALSE; - break; + case 'f': + fakeIt = TRUE; + break; + case 'n': + useMtab = FALSE; + break; #endif - case 'v': - case 'h': - case '-': - goto goodbye; - } - } else { - if (device == NULL) - device = *argv; - else if (directory == NULL) - directory = *argv; - else { - goto goodbye; - } + case 'v': + case 'h': + case '-': + goto goodbye; + } + } else { + if (device == NULL) + device = *argv; + else if (directory == NULL) + directory = *argv; + else { + goto goodbye; + } + } + i--; + argv++; } - i--; - argv++; - } - if (all == TRUE) { - struct mntent *m; - FILE *f = setmntent ("/etc/fstab", "r"); + if (all == TRUE) { + struct mntent *m; + FILE *f = setmntent("/etc/fstab", "r"); - if (f == NULL) { - perror("/etc/fstab"); - exit( FALSE); - } - while ((m = getmntent (f)) != NULL) { - // If the file system isn't noauto, and isn't mounted on /, - // and isn't swap or nfs, then mount it - if ((!strstr (m->mnt_opts, "noauto")) && - (m->mnt_dir[1] != '\0') && - (!strstr (m->mnt_type, "swap")) && - (!strstr (m->mnt_type, "nfs"))) - { - flags = 0; - *string_flags = '\0'; - parse_mount_options(m->mnt_opts, &flags, string_flags); - mount_one (m->mnt_fsname, m->mnt_dir, m->mnt_type, - flags, string_flags, useMtab, fakeIt, extra_opts); - } - } - endmntent (f); - } else { - if (device && directory) { + if (f == NULL) { + perror("/etc/fstab"); + exit(FALSE); + } + while ((m = getmntent(f)) != NULL) { + // If the file system isn't noauto, and isn't mounted on /, + // and isn't swap or nfs, then mount it + if ((!strstr(m->mnt_opts, "noauto")) && + (m->mnt_dir[1] != '\0') && + (!strstr(m->mnt_type, "swap")) && + (!strstr(m->mnt_type, "nfs"))) { + flags = 0; + *string_flags = '\0'; + parse_mount_options(m->mnt_opts, &flags, string_flags); + mount_one(m->mnt_fsname, m->mnt_dir, m->mnt_type, + flags, string_flags, useMtab, fakeIt, + extra_opts); + } + } + endmntent(f); + } else { + if (device && directory) { #ifdef BB_NFSMOUNT - if (strcmp(filesystemType, "nfs") == 0) { - if (nfsmount(device, directory, &flags, &extra_opts, &string_flags, 1) != 0) - exit(FALSE); - } + if (strcmp(filesystemType, "nfs") == 0) { + if (nfsmount + (device, directory, &flags, &extra_opts, &string_flags, + 1) != 0) + exit(FALSE); + } #endif - exit (mount_one (device, directory, filesystemType, - flags, string_flags, useMtab, fakeIt, extra_opts)); - } else { - goto goodbye; + exit(mount_one(device, directory, filesystemType, + flags, string_flags, useMtab, fakeIt, + extra_opts)); + } else { + goto goodbye; + } } - } - exit( TRUE); + exit(TRUE); -goodbye: - usage( mount_usage); + goodbye: + usage(mount_usage); } - diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index f2bd2f49c..03ce58447 100644 --- a/util-linux/nfsmount.c +++ b/util-linux/nfsmount.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * nfsmount.c -- Linux NFS mount * Copyright (C) 1993 Rick Sladkey <jrs@world.std.com> @@ -53,7 +54,7 @@ #define _ #define HAVE_inet_aton -#define MS_REMOUNT 32 /* Alter flags of a mounted FS */ +#define MS_REMOUNT 32 /* Alter flags of a mounted FS */ #define sloppy 0 #define EX_FAIL 1 #define EX_BG 1 @@ -65,8 +66,8 @@ static char *nfs_strerror(int stat); #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) -static int -linux_version_code(void) { +static int linux_version_code(void) +{ struct utsname my_utsname; int p, q, r; @@ -74,7 +75,7 @@ linux_version_code(void) { p = atoi(strtok(my_utsname.release, ".")); q = atoi(strtok(NULL, ".")); r = atoi(strtok(NULL, ".")); - return MAKE_VERSION(p,q,r); + return MAKE_VERSION(p, q, r); } return 0; } @@ -95,22 +96,22 @@ static int nfs_mount_version = NFS_MOUNT_VERSION; * NFS_MOUNT_VERSION: these nfsmount sources at compile time * nfs_mount_version: version this source and running kernel can handle */ -static void -find_kernel_nfs_mount_version(void) { +static void find_kernel_nfs_mount_version(void) +{ int kernel_version = linux_version_code(); if (kernel_version) { - if (kernel_version < MAKE_VERSION(2,1,32)) - nfs_mount_version = 1; - else - nfs_mount_version = 3; + if (kernel_version < MAKE_VERSION(2, 1, 32)) + nfs_mount_version = 1; + else + nfs_mount_version = 3; } if (nfs_mount_version > NFS_MOUNT_VERSION) - nfs_mount_version = NFS_MOUNT_VERSION; + nfs_mount_version = NFS_MOUNT_VERSION; } int nfsmount(const char *spec, const char *node, unsigned long *flags, - char **extra_opts, char **mount_opts, int running_bg) + char **extra_opts, char **mount_opts, int running_bg) { static char *prev_bg_host; char hostdir[1024]; @@ -118,7 +119,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, char *hostname; char *dirname; char *old_opts; - char *mounthost=NULL; + char *mounthost = NULL; char new_opts[1024]; fhandle root_fhandle; struct timeval total_timeout; @@ -161,7 +162,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, mclient = NULL; if (strlen(spec) >= sizeof(hostdir)) { fprintf(stderr, _("mount: " - "excessively long host:dir argument\n")); + "excessively long host:dir argument\n")); goto fail; } strcpy(hostdir, spec); @@ -174,11 +175,11 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if ((s = strchr(hostdir, ','))) { *s = '\0'; fprintf(stderr, _("mount: warning: " - "multiple hostnames not supported\n")); + "multiple hostnames not supported\n")); } } else { fprintf(stderr, _("mount: " - "directory to mount not in host:dir format\n")); + "directory to mount not in host:dir format\n")); goto fail; } @@ -189,20 +190,18 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, { if ((hp = gethostbyname(hostname)) == NULL) { fprintf(stderr, _("mount: can't get address for %s\n"), - hostname); + hostname); goto fail; } else { if (hp->h_length > sizeof(struct in_addr)) { - fprintf(stderr, - _("mount: got bad hp->h_length\n")); + fprintf(stderr, _("mount: got bad hp->h_length\n")); hp->h_length = sizeof(struct in_addr); } - memcpy(&server_addr.sin_addr, - hp->h_addr, hp->h_length); + memcpy(&server_addr.sin_addr, hp->h_addr, hp->h_length); } } - memcpy (&mount_server_addr, &server_addr, sizeof (mount_server_addr)); + memcpy(&mount_server_addr, &server_addr, sizeof(mount_server_addr)); /* add IP address to mtab options for use when unmounting */ @@ -211,12 +210,10 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if (!old_opts) old_opts = ""; if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) { - fprintf(stderr, _("mount: " - "excessively long option argument\n")); + fprintf(stderr, _("mount: " "excessively long option argument\n")); goto fail; } - sprintf(new_opts, "%s%saddr=%s", - old_opts, *old_opts ? "," : "", s); + sprintf(new_opts, "%s%saddr=%s", old_opts, *old_opts ? "," : "", s); *extra_opts = xstrdup(new_opts); /* Set default options. @@ -224,13 +221,13 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, * let the kernel decide. * timeo is filled in after we know whether it'll be TCP or UDP. */ memset(&data, 0, sizeof(data)); - data.retrans = 3; - data.acregmin = 3; - data.acregmax = 60; - data.acdirmin = 30; - data.acdirmax = 60; + data.retrans = 3; + data.acregmin = 3; + data.acregmax = 60; + data.acdirmin = 30; + data.acdirmax = 60; #if NFS_MOUNT_VERSION >= 2 - data.namlen = NAME_MAX; + data.namlen = NAME_MAX; #endif bg = 0; @@ -240,7 +237,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, nocto = 0; nolock = 0; noac = 0; - retry = 10000; /* 10000 minutes ~ 1 week */ + retry = 10000; /* 10000 minutes ~ 1 week */ tcp = 0; mountprog = MOUNTPROG; @@ -254,7 +251,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, for (opt = strtok(old_opts, ","); opt; opt = strtok(NULL, ",")) { if ((opteq = strchr(opt, '='))) { - val = atoi(opteq + 1); + val = atoi(opteq + 1); *opteq = '\0'; if (!strcmp(opt, "rsize")) data.rsize = val; @@ -277,29 +274,27 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, data.acregmax = val; data.acdirmin = val; data.acdirmax = val; - } - else if (!strcmp(opt, "retry")) + } else if (!strcmp(opt, "retry")) retry = val; else if (!strcmp(opt, "port")) port = val; else if (!strcmp(opt, "mountport")) - mountport = val; + mountport = val; else if (!strcmp(opt, "mounthost")) - mounthost=xstrndup(opteq+1, - strcspn(opteq+1," \t\n\r,")); + mounthost = xstrndup(opteq + 1, + strcspn(opteq + 1, " \t\n\r,")); else if (!strcmp(opt, "mountprog")) mountprog = val; else if (!strcmp(opt, "mountvers")) mountvers = val; else if (!strcmp(opt, "nfsprog")) nfsprog = val; - else if (!strcmp(opt, "nfsvers") || - !strcmp(opt, "vers")) + else if (!strcmp(opt, "nfsvers") || !strcmp(opt, "vers")) nfsvers = val; else if (!strcmp(opt, "proto")) { - if (!strncmp(opteq+1, "tcp", 3)) + if (!strncmp(opteq + 1, "tcp", 3)) tcp = 1; - else if (!strncmp(opteq+1, "udp", 3)) + else if (!strncmp(opteq + 1, "udp", 3)) tcp = 0; else printf(_("Warning: Unrecognized proto= option.\n")); @@ -309,24 +304,24 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, data.namlen = val; else #endif - printf(_("Warning: Option namlen is not supported.\n")); + printf(_ + ("Warning: Option namlen is not supported.\n")); } else if (!strcmp(opt, "addr")) - /* ignore */; + /* ignore */ ; else { printf(_("unknown nfs mount parameter: " - "%s=%d\n"), opt, val); + "%s=%d\n"), opt, val); goto fail; } - } - else { + } else { val = 1; if (!strncmp(opt, "no", 2)) { val = 0; opt += 2; } - if (!strcmp(opt, "bg")) + if (!strcmp(opt, "bg")) bg = val; - else if (!strcmp(opt, "fg")) + else if (!strcmp(opt, "fg")) bg = !val; else if (!strcmp(opt, "soft")) soft = val; @@ -348,11 +343,12 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if (nfs_mount_version >= 3) nolock = !val; else - printf(_("Warning: option nolock is not supported.\n")); + printf(_ + ("Warning: option nolock is not supported.\n")); } else { if (!sloppy) { printf(_("unknown nfs mount option: " - "%s%s\n"), val ? "" : "no", opt); + "%s%s\n"), val ? "" : "no", opt); goto fail; } } @@ -378,22 +374,21 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, #ifdef NFS_MOUNT_DEBUG printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n", - data.rsize, data.wsize, data.timeo, data.retrans); + data.rsize, data.wsize, data.timeo, data.retrans); printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n", - data.acregmin, data.acregmax, data.acdirmin, data.acdirmax); + data.acregmin, data.acregmax, data.acdirmin, data.acdirmax); printf("port = %d, bg = %d, retry = %d, flags = %.8x\n", - port, bg, retry, data.flags); + port, bg, retry, data.flags); printf("mountprog = %d, mountvers = %d, nfsprog = %d, nfsvers = %d\n", - mountprog, mountvers, nfsprog, nfsvers); + mountprog, mountvers, nfsprog, nfsvers); printf("soft = %d, intr = %d, posix = %d, nocto = %d, noac = %d\n", - (data.flags & NFS_MOUNT_SOFT) != 0, - (data.flags & NFS_MOUNT_INTR) != 0, - (data.flags & NFS_MOUNT_POSIX) != 0, - (data.flags & NFS_MOUNT_NOCTO) != 0, - (data.flags & NFS_MOUNT_NOAC) != 0); + (data.flags & NFS_MOUNT_SOFT) != 0, + (data.flags & NFS_MOUNT_INTR) != 0, + (data.flags & NFS_MOUNT_POSIX) != 0, + (data.flags & NFS_MOUNT_NOCTO) != 0, + (data.flags & NFS_MOUNT_NOAC) != 0); #if NFS_MOUNT_VERSION >= 2 - printf("tcp = %d\n", - (data.flags & NFS_MOUNT_TCP) != 0); + printf("tcp = %d\n", (data.flags & NFS_MOUNT_TCP) != 0); #endif #endif @@ -409,7 +404,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, * give up immediately, to avoid the initial timeout. */ if (bg && !running_bg && - prev_bg_host && strcmp(hostname, prev_bg_host) == 0) { + prev_bg_host && strcmp(hostname, prev_bg_host) == 0) { if (retry > 0) retval = EX_BG; return retval; @@ -418,25 +413,24 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, /* create mount deamon client */ /* See if the nfs host = mount host. */ if (mounthost) { - if (mounthost[0] >= '0' && mounthost[0] <= '9') { - mount_server_addr.sin_family = AF_INET; - mount_server_addr.sin_addr.s_addr = inet_addr(hostname); - } else { - if ((hp = gethostbyname(mounthost)) == NULL) { - fprintf(stderr, _("mount: can't get address for %s\n"), - hostname); - goto fail; - } else { - if (hp->h_length > sizeof(struct in_addr)) { - fprintf(stderr, - _("mount: got bad hp->h_length?\n")); - hp->h_length = sizeof(struct in_addr); - } - mount_server_addr.sin_family = AF_INET; - memcpy(&mount_server_addr.sin_addr, - hp->h_addr, hp->h_length); - } - } + if (mounthost[0] >= '0' && mounthost[0] <= '9') { + mount_server_addr.sin_family = AF_INET; + mount_server_addr.sin_addr.s_addr = inet_addr(hostname); + } else { + if ((hp = gethostbyname(mounthost)) == NULL) { + fprintf(stderr, _("mount: can't get address for %s\n"), + hostname); + goto fail; + } else { + if (hp->h_length > sizeof(struct in_addr)) { + fprintf(stderr, _("mount: got bad hp->h_length?\n")); + hp->h_length = sizeof(struct in_addr); + } + mount_server_addr.sin_family = AF_INET; + memcpy(&mount_server_addr.sin_addr, + hp->h_addr, hp->h_length); + } + } } /* @@ -466,7 +460,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, for (;;) { if (bg && stat(node, &statbuf) == -1) { if (running_bg) { - sleep(val); /* 1, 2, 4, 8, 16, 30, ... */ + sleep(val); /* 1, 2, 4, 8, 16, 30, ... */ val *= 2; if (val > 30) val = 30; @@ -480,24 +474,24 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, mount_server_addr.sin_port = htons(mountport); msock = RPC_ANYSOCK; mclient = clnttcp_create(&mount_server_addr, - mountprog, mountvers, - &msock, 0, 0); + mountprog, mountvers, &msock, 0, 0); /* if this fails, contact the mount daemon via UDP */ if (!mclient) { mount_server_addr.sin_port = htons(mountport); msock = RPC_ANYSOCK; mclient = clntudp_create(&mount_server_addr, - mountprog, mountvers, - retry_timeout, &msock); + mountprog, mountvers, + retry_timeout, &msock); } if (mclient) { /* try to mount hostname:dirname */ mclient->cl_auth = authunix_create_default(); clnt_stat = clnt_call(mclient, MOUNTPROC_MNT, - (xdrproc_t) xdr_dirpath, (caddr_t) &dirname, - (xdrproc_t) xdr_fhstatus, (caddr_t) &status, - total_timeout); + (xdrproc_t) xdr_dirpath, + (caddr_t) & dirname, + (xdrproc_t) xdr_fhstatus, + (caddr_t) & status, total_timeout); if (clnt_stat == RPC_SUCCESS) break; /* we're done */ if (errno != ECONNREFUSED) { @@ -517,7 +511,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, prevt = t; } if (!bg) - goto fail; + goto fail; if (!running_bg) { prev_bg_host = xstrdup(hostname); if (retry > 0) @@ -531,18 +525,18 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if (status.fhs_status != 0) { fprintf(stderr, - _("mount: %s:%s failed, reason given by server: %s\n"), - hostname, dirname, nfs_strerror(status.fhs_status)); + _("mount: %s:%s failed, reason given by server: %s\n"), + hostname, dirname, nfs_strerror(status.fhs_status)); goto fail; } memcpy((char *) &root_fhandle, (char *) status.fhstatus_u.fhs_fhandle, - sizeof (root_fhandle)); + sizeof(root_fhandle)); /* create nfs socket for kernel */ if (tcp) { if (nfs_mount_version < 3) { - printf(_("NFS over TCP is not supported.\n")); + printf(_("NFS over TCP is not supported.\n")); goto fail; } fsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -559,7 +553,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, if (port == 0) { server_addr.sin_port = PMAPPORT; port = pmap_getport(&server_addr, nfsprog, nfsvers, - tcp ? IPPROTO_TCP : IPPROTO_UDP); + tcp ? IPPROTO_TCP : IPPROTO_UDP); if (port == 0) port = NFS_PORT; #ifdef NFS_MOUNT_DEBUG @@ -571,14 +565,14 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, printf(_("using port %d for nfs deamon\n"), port); #endif server_addr.sin_port = htons(port); - /* - * connect() the socket for kernels 1.3.10 and below only, - * to avoid problems with multihomed hosts. - * --Swen - */ + /* + * connect() the socket for kernels 1.3.10 and below only, + * to avoid problems with multihomed hosts. + * --Swen + */ if (linux_version_code() <= 66314 - && connect(fsock, (struct sockaddr *) &server_addr, - sizeof (server_addr)) < 0) { + && connect(fsock, (struct sockaddr *) &server_addr, + sizeof(server_addr)) < 0) { perror(_("nfs connect")); goto fail; } @@ -587,7 +581,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, data.fd = fsock; memcpy((char *) &data.root, (char *) &root_fhandle, - sizeof (root_fhandle)); + sizeof(root_fhandle)); memcpy((char *) &data.addr, (char *) &server_addr, sizeof(data.addr)); strncpy(data.hostname, hostname, sizeof(data.hostname)); @@ -600,7 +594,7 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags, /* abort */ -fail: + fail: if (msock != -1) { if (mclient) { auth_destroy(mclient->cl_auth); @@ -611,7 +605,7 @@ fail: if (fsock != -1) close(fsock); return retval; -} +} /* * We need to translate between nfs status return values and @@ -630,33 +624,37 @@ static struct { enum nfs_stat stat; int errnum; } nfs_errtbl[] = { - { NFS_OK, 0 }, - { NFSERR_PERM, EPERM }, - { NFSERR_NOENT, ENOENT }, - { NFSERR_IO, EIO }, - { NFSERR_NXIO, ENXIO }, - { NFSERR_ACCES, EACCES }, - { NFSERR_EXIST, EEXIST }, - { NFSERR_NODEV, ENODEV }, - { NFSERR_NOTDIR, ENOTDIR }, - { NFSERR_ISDIR, EISDIR }, + { + NFS_OK, 0}, { + NFSERR_PERM, EPERM}, { + NFSERR_NOENT, ENOENT}, { + NFSERR_IO, EIO}, { + NFSERR_NXIO, ENXIO}, { + NFSERR_ACCES, EACCES}, { + NFSERR_EXIST, EEXIST}, { + NFSERR_NODEV, ENODEV}, { + NFSERR_NOTDIR, ENOTDIR}, { + NFSERR_ISDIR, EISDIR}, #ifdef NFSERR_INVAL - { NFSERR_INVAL, EINVAL }, /* that Sun forgot */ + { + NFSERR_INVAL, EINVAL}, /* that Sun forgot */ #endif - { NFSERR_FBIG, EFBIG }, - { NFSERR_NOSPC, ENOSPC }, - { NFSERR_ROFS, EROFS }, - { NFSERR_NAMETOOLONG, ENAMETOOLONG }, - { NFSERR_NOTEMPTY, ENOTEMPTY }, - { NFSERR_DQUOT, EDQUOT }, - { NFSERR_STALE, ESTALE }, + { + NFSERR_FBIG, EFBIG}, { + NFSERR_NOSPC, ENOSPC}, { + NFSERR_ROFS, EROFS}, { + NFSERR_NAMETOOLONG, ENAMETOOLONG}, { + NFSERR_NOTEMPTY, ENOTEMPTY}, { + NFSERR_DQUOT, EDQUOT}, { + NFSERR_STALE, ESTALE}, #ifdef EWFLUSH - { NFSERR_WFLUSH, EWFLUSH }, + { + NFSERR_WFLUSH, EWFLUSH}, #endif - /* Throw in some NFSv3 values for even more fun (HP returns these) */ - { 71, EREMOTE }, - - { -1, EIO } + /* Throw in some NFSv3 values for even more fun (HP returns these) */ + { + 71, EREMOTE}, { + -1, EIO} }; static char *nfs_strerror(int stat) @@ -673,33 +671,32 @@ static char *nfs_strerror(int stat) } #if 0 -int -my_getport(struct in_addr server, struct timeval *timeo, ...) +int my_getport(struct in_addr server, struct timeval *timeo, ...) { - struct sockaddr_in sin; - struct pmap pmap; - CLIENT *clnt; - int sock = RPC_ANYSOCK, port; - - pmap.pm_prog = prog; - pmap.pm_vers = vers; - pmap.pm_prot = prot; - pmap.pm_port = 0; - sin.sin_family = AF_INET; - sin.sin_addr = server; - sin.sin_port = htons(111); - clnt = clntudp_create(&sin, 100000, 2, *timeo, &sock); - status = clnt_call(clnt, PMAP_GETPORT, - &pmap, (xdrproc_t) xdr_pmap, - &port, (xdrproc_t) xdr_uint); - if (status != SUCCESS) { - /* natter */ - port = 0; - } - - clnt_destroy(clnt); - close(sock); - return port; + struct sockaddr_in sin; + struct pmap pmap; + CLIENT *clnt; + int sock = RPC_ANYSOCK, port; + + pmap.pm_prog = prog; + pmap.pm_vers = vers; + pmap.pm_prot = prot; + pmap.pm_port = 0; + sin.sin_family = AF_INET; + sin.sin_addr = server; + sin.sin_port = htons(111); + clnt = clntudp_create(&sin, 100000, 2, *timeo, &sock); + status = clnt_call(clnt, PMAP_GETPORT, + &pmap, (xdrproc_t) xdr_pmap, + &port, (xdrproc_t) xdr_uint); + if (status != SUCCESS) { + /* natter */ + port = 0; + } + + clnt_destroy(clnt); + close(sock); + return port; } #endif @@ -756,28 +753,26 @@ my_getport(struct in_addr server, struct timeval *timeo, ...) /* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */ -bool_t -xdr_fhandle(XDR *xdrs, fhandle objp) +bool_t xdr_fhandle(XDR * xdrs, fhandle objp) { - if (!xdr_opaque(xdrs, objp, FHSIZE)) { - return (FALSE); - } + if (!xdr_opaque(xdrs, objp, FHSIZE)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_fhstatus(XDR *xdrs, fhstatus *objp) +bool_t xdr_fhstatus(XDR * xdrs, fhstatus * objp) { - if (!xdr_u_int(xdrs, &objp->fhs_status)) { - return (FALSE); - } + if (!xdr_u_int(xdrs, &objp->fhs_status)) { + return (FALSE); + } switch (objp->fhs_status) { case 0: - if (!xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle)) { - return (FALSE); - } + if (!xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle)) { + return (FALSE); + } break; default: break; @@ -785,245 +780,246 @@ xdr_fhstatus(XDR *xdrs, fhstatus *objp) return (TRUE); } -bool_t -xdr_dirpath(XDR *xdrs, dirpath *objp) +bool_t xdr_dirpath(XDR * xdrs, dirpath * objp) { - if (!xdr_string(xdrs, objp, MNTPATHLEN)) { - return (FALSE); - } + if (!xdr_string(xdrs, objp, MNTPATHLEN)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_name(XDR *xdrs, name *objp) +bool_t xdr_name(XDR * xdrs, name * objp) { - if (!xdr_string(xdrs, objp, MNTNAMLEN)) { - return (FALSE); - } + if (!xdr_string(xdrs, objp, MNTNAMLEN)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_mountlist(XDR *xdrs, mountlist *objp) +bool_t xdr_mountlist(XDR * xdrs, mountlist * objp) { - if (!xdr_pointer(xdrs, (char **)objp, sizeof(struct mountbody), (xdrproc_t)xdr_mountbody)) { - return (FALSE); - } + if (!xdr_pointer + (xdrs, (char **) objp, sizeof(struct mountbody), + (xdrproc_t) xdr_mountbody)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_mountbody(XDR *xdrs, mountbody *objp) +bool_t xdr_mountbody(XDR * xdrs, mountbody * objp) { - if (!xdr_name(xdrs, &objp->ml_hostname)) { - return (FALSE); - } - if (!xdr_dirpath(xdrs, &objp->ml_directory)) { - return (FALSE); - } - if (!xdr_mountlist(xdrs, &objp->ml_next)) { - return (FALSE); - } + if (!xdr_name(xdrs, &objp->ml_hostname)) { + return (FALSE); + } + if (!xdr_dirpath(xdrs, &objp->ml_directory)) { + return (FALSE); + } + if (!xdr_mountlist(xdrs, &objp->ml_next)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_groups(XDR *xdrs, groups *objp) +bool_t xdr_groups(XDR * xdrs, groups * objp) { - if (!xdr_pointer(xdrs, (char **)objp, sizeof(struct groupnode), (xdrproc_t)xdr_groupnode)) { - return (FALSE); - } + if (!xdr_pointer + (xdrs, (char **) objp, sizeof(struct groupnode), + (xdrproc_t) xdr_groupnode)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_groupnode(XDR *xdrs, groupnode *objp) +bool_t xdr_groupnode(XDR * xdrs, groupnode * objp) { - if (!xdr_name(xdrs, &objp->gr_name)) { - return (FALSE); - } - if (!xdr_groups(xdrs, &objp->gr_next)) { - return (FALSE); - } + if (!xdr_name(xdrs, &objp->gr_name)) { + return (FALSE); + } + if (!xdr_groups(xdrs, &objp->gr_next)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_exports(XDR *xdrs, exports *objp) +bool_t xdr_exports(XDR * xdrs, exports * objp) { - if (!xdr_pointer(xdrs, (char **)objp, sizeof(struct exportnode), (xdrproc_t)xdr_exportnode)) { - return (FALSE); - } + if (!xdr_pointer + (xdrs, (char **) objp, sizeof(struct exportnode), + (xdrproc_t) xdr_exportnode)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_exportnode(XDR *xdrs, exportnode *objp) +bool_t xdr_exportnode(XDR * xdrs, exportnode * objp) { - if (!xdr_dirpath(xdrs, &objp->ex_dir)) { - return (FALSE); - } - if (!xdr_groups(xdrs, &objp->ex_groups)) { - return (FALSE); - } - if (!xdr_exports(xdrs, &objp->ex_next)) { - return (FALSE); - } + if (!xdr_dirpath(xdrs, &objp->ex_dir)) { + return (FALSE); + } + if (!xdr_groups(xdrs, &objp->ex_groups)) { + return (FALSE); + } + if (!xdr_exports(xdrs, &objp->ex_next)) { + return (FALSE); + } return (TRUE); } -bool_t -xdr_ppathcnf(XDR *xdrs, ppathcnf *objp) +bool_t xdr_ppathcnf(XDR * xdrs, ppathcnf * objp) { - register long *buf; - - int i; - - if (xdrs->x_op == XDR_ENCODE) { - buf = (long*)XDR_INLINE(xdrs,6 * BYTES_PER_XDR_UNIT); - if (buf == NULL) { - if (!xdr_int(xdrs, &objp->pc_link_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_canon)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_input)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_name_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_path_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { - return (FALSE); - } - - } - else { - IXDR_PUT_LONG(buf,objp->pc_link_max); - IXDR_PUT_SHORT(buf,objp->pc_max_canon); - IXDR_PUT_SHORT(buf,objp->pc_max_input); - IXDR_PUT_SHORT(buf,objp->pc_name_max); - IXDR_PUT_SHORT(buf,objp->pc_path_max); - IXDR_PUT_SHORT(buf,objp->pc_pipe_buf); - } - if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { - return (FALSE); - } - if (!xdr_char(xdrs, &objp->pc_xxx)) { - return (FALSE); - } - buf = (long*)XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); + register long *buf; + + int i; + + if (xdrs->x_op == XDR_ENCODE) { + buf = (long *) XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) { - return (FALSE); - } - - } - else { - { register short *genp; - for ( i = 0,genp=objp->pc_mask; - i < 2; i++){ - IXDR_PUT_SHORT(buf,*genp++); - } - }; - } - - return (TRUE); + if (!xdr_int(xdrs, &objp->pc_link_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_canon)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_input)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_name_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_path_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { + return (FALSE); + } + + } else { + IXDR_PUT_LONG(buf, objp->pc_link_max); + IXDR_PUT_SHORT(buf, objp->pc_max_canon); + IXDR_PUT_SHORT(buf, objp->pc_max_input); + IXDR_PUT_SHORT(buf, objp->pc_name_max); + IXDR_PUT_SHORT(buf, objp->pc_path_max); + IXDR_PUT_SHORT(buf, objp->pc_pipe_buf); + } + if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { + return (FALSE); + } + if (!xdr_char(xdrs, &objp->pc_xxx)) { + return (FALSE); + } + buf = (long *) XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); + if (buf == NULL) { + if (!xdr_vector + (xdrs, (char *) objp->pc_mask, 2, sizeof(short), + (xdrproc_t) xdr_short)) { + return (FALSE); + } + + } else { + { + register short *genp; + + for (i = 0, genp = objp->pc_mask; i < 2; i++) { + IXDR_PUT_SHORT(buf, *genp++); + } + }; + } + + return (TRUE); } else if (xdrs->x_op == XDR_DECODE) { - buf = (long*)XDR_INLINE(xdrs,6 * BYTES_PER_XDR_UNIT); - if (buf == NULL) { - if (!xdr_int(xdrs, &objp->pc_link_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_canon)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_input)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_name_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_path_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { - return (FALSE); - } - - } - else { - objp->pc_link_max = IXDR_GET_LONG(buf); - objp->pc_max_canon = IXDR_GET_SHORT(buf); - objp->pc_max_input = IXDR_GET_SHORT(buf); - objp->pc_name_max = IXDR_GET_SHORT(buf); - objp->pc_path_max = IXDR_GET_SHORT(buf); - objp->pc_pipe_buf = IXDR_GET_SHORT(buf); - } - if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { - return (FALSE); - } - if (!xdr_char(xdrs, &objp->pc_xxx)) { - return (FALSE); - } - buf = (long*)XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); + buf = (long *) XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT); + if (buf == NULL) { + if (!xdr_int(xdrs, &objp->pc_link_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_canon)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_input)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_name_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_path_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { + return (FALSE); + } + + } else { + objp->pc_link_max = IXDR_GET_LONG(buf); + objp->pc_max_canon = IXDR_GET_SHORT(buf); + objp->pc_max_input = IXDR_GET_SHORT(buf); + objp->pc_name_max = IXDR_GET_SHORT(buf); + objp->pc_path_max = IXDR_GET_SHORT(buf); + objp->pc_pipe_buf = IXDR_GET_SHORT(buf); + } + if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { + return (FALSE); + } + if (!xdr_char(xdrs, &objp->pc_xxx)) { + return (FALSE); + } + buf = (long *) XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) { - return (FALSE); - } - - } - else { - { register short *genp; - for ( i = 0,genp=objp->pc_mask; - i < 2; i++){ - *genp++ = IXDR_GET_SHORT(buf); - } - }; - } - return(TRUE); + if (!xdr_vector + (xdrs, (char *) objp->pc_mask, 2, sizeof(short), + (xdrproc_t) xdr_short)) { + return (FALSE); + } + + } else { + { + register short *genp; + + for (i = 0, genp = objp->pc_mask; i < 2; i++) { + *genp++ = IXDR_GET_SHORT(buf); + } + }; + } + return (TRUE); } - if (!xdr_int(xdrs, &objp->pc_link_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_canon)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_max_input)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_name_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_path_max)) { - return (FALSE); - } - if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { - return (FALSE); - } - if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { - return (FALSE); - } - if (!xdr_char(xdrs, &objp->pc_xxx)) { - return (FALSE); - } - if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) { - return (FALSE); - } + if (!xdr_int(xdrs, &objp->pc_link_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_canon)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_max_input)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_name_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_path_max)) { + return (FALSE); + } + if (!xdr_short(xdrs, &objp->pc_pipe_buf)) { + return (FALSE); + } + if (!xdr_u_char(xdrs, &objp->pc_vdisable)) { + return (FALSE); + } + if (!xdr_char(xdrs, &objp->pc_xxx)) { + return (FALSE); + } + if (!xdr_vector + (xdrs, (char *) objp->pc_mask, 2, sizeof(short), + (xdrproc_t) xdr_short)) { + return (FALSE); + } return (TRUE); } @@ -1063,247 +1059,232 @@ xdr_ppathcnf(XDR *xdrs, ppathcnf *objp) /* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */ -#include <string.h> /* for memset() */ +#include <string.h> /* for memset() */ /* Default timeout can be changed using clnt_control() */ static struct timeval TIMEOUT = { 25, 0 }; -void * -mountproc_null_1(argp, clnt) - void *argp; - CLIENT *clnt; +void *mountproc_null_1(argp, clnt) +void *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); - if (clnt_call(clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, argp, (xdrproc_t) xdr_void, &clnt_res, TIMEOUT) != RPC_SUCCESS) { + memset((char *) &clnt_res, 0, sizeof(clnt_res)); + if (clnt_call + (clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, argp, + (xdrproc_t) xdr_void, &clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -fhstatus * -mountproc_mnt_1(argp, clnt) - dirpath *argp; - CLIENT *clnt; +fhstatus *mountproc_mnt_1(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static fhstatus clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_MNT, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_fhstatus, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_fhstatus, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -mountlist * -mountproc_dump_1(argp, clnt) - void *argp; - CLIENT *clnt; +mountlist *mountproc_dump_1(argp, clnt) +void *argp; +CLIENT *clnt; { static mountlist clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_DUMP, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_mountlist, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_mountlist, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -void * -mountproc_umnt_1(argp, clnt) - dirpath *argp; - CLIENT *clnt; +void *mountproc_umnt_1(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_UMNT, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_void, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_void, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -void * -mountproc_umntall_1(argp, clnt) - void *argp; - CLIENT *clnt; +void *mountproc_umntall_1(argp, clnt) +void *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_UMNTALL, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_void, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_void, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -exports * -mountproc_export_1(argp, clnt) - void *argp; - CLIENT *clnt; +exports *mountproc_export_1(argp, clnt) +void *argp; +CLIENT *clnt; { static exports clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_EXPORT, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_exports, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_exports, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -exports * -mountproc_exportall_1(argp, clnt) - void *argp; - CLIENT *clnt; +exports *mountproc_exportall_1(argp, clnt) +void *argp; +CLIENT *clnt; { static exports clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_EXPORTALL, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_exports, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { - return (NULL); + (caddr_t) argp, (xdrproc_t) xdr_exports, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { + return (NULL); } return (&clnt_res); } -void * -mountproc_null_2(argp, clnt) - void *argp; - CLIENT *clnt; +void *mountproc_null_2(argp, clnt) +void *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); - if (clnt_call(clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, argp, (xdrproc_t) xdr_void, &clnt_res, TIMEOUT) != RPC_SUCCESS) { + memset((char *) &clnt_res, 0, sizeof(clnt_res)); + if (clnt_call + (clnt, MOUNTPROC_NULL, (xdrproc_t) xdr_void, argp, + (xdrproc_t) xdr_void, &clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -fhstatus * -mountproc_mnt_2(argp, clnt) - dirpath *argp; - CLIENT *clnt; +fhstatus *mountproc_mnt_2(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static fhstatus clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_MNT, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_fhstatus, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_fhstatus, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -mountlist * -mountproc_dump_2(argp, clnt) - void *argp; - CLIENT *clnt; +mountlist *mountproc_dump_2(argp, clnt) +void *argp; +CLIENT *clnt; { static mountlist clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_DUMP, (xdrproc_t) xdr_void, argp, - (xdrproc_t) xdr_mountlist, (caddr_t) &clnt_res, - TIMEOUT) != RPC_SUCCESS) { + (xdrproc_t) xdr_mountlist, (caddr_t) & clnt_res, + TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -void * -mountproc_umnt_2(argp, clnt) - dirpath *argp; - CLIENT *clnt; +void *mountproc_umnt_2(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_UMNT, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_void, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_void, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -void * -mountproc_umntall_2(argp, clnt) - void *argp; - CLIENT *clnt; +void *mountproc_umntall_2(argp, clnt) +void *argp; +CLIENT *clnt; { static char clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_UMNTALL, (xdrproc_t) xdr_void, - (caddr_t) argp, (xdrproc_t) xdr_void, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_void, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } - return ((void *)&clnt_res); + return ((void *) &clnt_res); } -exports * -mountproc_export_2(argp, clnt) - void *argp; - CLIENT *clnt; +exports *mountproc_export_2(argp, clnt) +void *argp; +CLIENT *clnt; { static exports clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_EXPORT, (xdrproc_t) xdr_void, - argp, (xdrproc_t) xdr_exports, (caddr_t) &clnt_res, - TIMEOUT) != RPC_SUCCESS) { + argp, (xdrproc_t) xdr_exports, (caddr_t) & clnt_res, + TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -exports * -mountproc_exportall_2(argp, clnt) - void *argp; - CLIENT *clnt; +exports *mountproc_exportall_2(argp, clnt) +void *argp; +CLIENT *clnt; { static exports clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_EXPORTALL, (xdrproc_t) xdr_void, argp, - (xdrproc_t) xdr_exports, (caddr_t) &clnt_res, - TIMEOUT) != RPC_SUCCESS) { + (xdrproc_t) xdr_exports, (caddr_t) & clnt_res, + TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } -ppathcnf * -mountproc_pathconf_2(argp, clnt) - dirpath *argp; - CLIENT *clnt; +ppathcnf *mountproc_pathconf_2(argp, clnt) +dirpath *argp; +CLIENT *clnt; { static ppathcnf clnt_res; - memset((char *)&clnt_res, 0, sizeof(clnt_res)); + memset((char *) &clnt_res, 0, sizeof(clnt_res)); if (clnt_call(clnt, MOUNTPROC_PATHCONF, (xdrproc_t) xdr_dirpath, - (caddr_t) argp, (xdrproc_t) xdr_ppathcnf, - (caddr_t) &clnt_res, TIMEOUT) != RPC_SUCCESS) { + (caddr_t) argp, (xdrproc_t) xdr_ppathcnf, + (caddr_t) & clnt_res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&clnt_res); } - - - - diff --git a/util-linux/nfsmount.h b/util-linux/nfsmount.h index 73c71fc68..64ac617c0 100644 --- a/util-linux/nfsmount.h +++ b/util-linux/nfsmount.h @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Please do not edit this file. * It was generated using rpcgen. diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index 3c02bdd42..6bda22277 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini swapon/swapoff implementation for busybox * @@ -32,91 +33,93 @@ static int whichApp; -static const char* appName; +static const char *appName; -static const char swapoff_usage[] = -"swapoff device\n" -"\nStop swapping virtual memory pages on the given device.\n"; -static const char swapon_usage[] = -"swapon device\n" -"\nStart swapping virtual memory pages on the given device.\n"; +static const char swapoff_usage[] = + + "swapoff device\n" + "\nStop swapping virtual memory pages on the given device.\n"; +static const char swapon_usage[] = + + "swapon device\n" + "\nStart swapping virtual memory pages on the given device.\n"; #define SWAPON_APP 1 #define SWAPOFF_APP 2 -static void -swap_enable_disable( char *device) +static void swap_enable_disable(char *device) { - int status; - if ( whichApp == SWAPON_APP ) - status = swapon(device, 0); - else - status = swapoff(device); - - if ( status != 0 ) { - perror(appName); - exit( FALSE); - } + int status; + + if (whichApp == SWAPON_APP) + status = swapon(device, 0); + else + status = swapoff(device); + + if (status != 0) { + perror(appName); + exit(FALSE); + } } -static void -do_em_all() +static void do_em_all() { struct mntent *m; - FILE *f = setmntent ("/etc/fstab", "r"); + FILE *f = setmntent("/etc/fstab", "r"); if (f == NULL) { - perror("/etc/fstab"); - exit( FALSE); + perror("/etc/fstab"); + exit(FALSE); } - while ((m = getmntent (f)) != NULL) { - if (!strstr (m->mnt_type, MNTTYPE_SWAP)) { - swap_enable_disable( m->mnt_fsname); - } + while ((m = getmntent(f)) != NULL) { + if (!strstr(m->mnt_type, MNTTYPE_SWAP)) { + swap_enable_disable(m->mnt_fsname); + } } - endmntent (f); - exit( TRUE); + endmntent(f); + exit(TRUE); } -extern int -swap_on_off_main(int argc, char * * argv) +extern int swap_on_off_main(int argc, char **argv) { - struct stat statBuf; - if (stat("/etc/fstab", &statBuf) < 0) - fprintf(stderr, "/etc/fstab file missing -- Please install one.\n\n"); - - if (strcmp(*argv, "swapon")==0) { - appName = *argv; - whichApp = SWAPON_APP; - - } else { - appName = *argv; - whichApp = SWAPOFF_APP; - } - - if (argc < 2) - goto usage_and_exit; - argc--; - argv++; - - /* Parse any options */ - while (**argv == '-') { - while (*++(*argv)) switch (**argv) { - case 'a': - do_em_all(); - break; - default: + struct stat statBuf; + + if (stat("/etc/fstab", &statBuf) < 0) + fprintf(stderr, + "/etc/fstab file missing -- Please install one.\n\n"); + + if (strcmp(*argv, "swapon") == 0) { + appName = *argv; + whichApp = SWAPON_APP; + + } else { + appName = *argv; + whichApp = SWAPOFF_APP; + } + + if (argc < 2) goto usage_and_exit; + argc--; + argv++; + + /* Parse any options */ + while (**argv == '-') { + while (*++(*argv)) + switch (**argv) { + case 'a': + do_em_all(); + break; + default: + goto usage_and_exit; + } } - } - swap_enable_disable(*argv); - exit( TRUE); + swap_enable_disable(*argv); + exit(TRUE); -usage_and_exit: - usage( (whichApp==SWAPON_APP)? swapon_usage : swapoff_usage); - exit( FALSE); + usage_and_exit: + usage((whichApp == SWAPON_APP) ? swapon_usage : swapoff_usage); + exit(FALSE); } - diff --git a/util-linux/umount.c b/util-linux/umount.c index b65caf76e..a2ca8c74a 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini umount implementation for busybox * @@ -28,24 +29,23 @@ #include <fstab.h> #include <errno.h> -static const char umount_usage[] = -"umount [flags] filesystem|directory\n\n" -"Flags:\n" -"\t-a:\tUnmount all file systems" +static const char umount_usage[] = + "umount [flags] filesystem|directory\n\n" + "Flags:\n" "\t-a:\tUnmount all file systems" #ifdef BB_MTAB -" in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n" + " in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n" #else -"\n" + "\n" #endif #ifdef BB_FEATURE_REMOUNT -"\t-r:\tTry to remount devices as read-only if mount is busy\n" + "\t-r:\tTry to remount devices as read-only if mount is busy\n" #endif ; struct _mtab_entry_t { - char *device; - char *mountpt; - struct _mtab_entry_t *next; + char *device; + char *mountpt; + struct _mtab_entry_t *next; }; static struct _mtab_entry_t *mtab_cache = NULL; @@ -55,113 +55,112 @@ static struct _mtab_entry_t *mtab_cache = NULL; static int useMtab = TRUE; static int umountAll = FALSE; static int doRemount = FALSE; -extern const char mtab_file[]; /* Defined in utility.c */ +extern const char mtab_file[]; /* Defined in utility.c */ #define MIN(x,y) (x > y ? x : y) -static int -do_umount(const char* name, int useMtab) +static int do_umount(const char *name, int useMtab) { - int status; - char *blockDevice = mtab_getinfo(name, MTAB_GETDEVICE); + int status; + char *blockDevice = mtab_getinfo(name, MTAB_GETDEVICE); - if (blockDevice && strcmp(blockDevice, name) == 0) - name = mtab_getinfo(blockDevice, MTAB_GETMOUNTPT); + if (blockDevice && strcmp(blockDevice, name) == 0) + name = mtab_getinfo(blockDevice, MTAB_GETMOUNTPT); - status = umount(name); + status = umount(name); #if defined BB_FEATURE_MOUNT_LOOP - if (blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9)) - /* this was a loop device, delete it */ - del_loop(blockDevice); + if (blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9)) + /* this was a loop device, delete it */ + del_loop(blockDevice); #endif #if defined BB_FEATURE_REMOUNT - if ( status != 0 && doRemount == TRUE && errno == EBUSY ) { - status = mount(blockDevice, name, NULL, - MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL); - if (status == 0) { - fprintf(stderr, "umount: %s busy - remounted read-only\n", - blockDevice); - /* TODO: update mtab if BB_MTAB is defined */ - } else { - fprintf(stderr, "umount: Cannot remount %s read-only\n", - blockDevice); + if (status != 0 && doRemount == TRUE && errno == EBUSY) { + status = mount(blockDevice, name, NULL, + MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL); + if (status == 0) { + fprintf(stderr, "umount: %s busy - remounted read-only\n", + blockDevice); + /* TODO: update mtab if BB_MTAB is defined */ + } else { + fprintf(stderr, "umount: Cannot remount %s read-only\n", + blockDevice); + } } - } #endif - if ( status == 0 ) { + if (status == 0) { #if defined BB_MTAB - if ( useMtab==TRUE ) - erase_mtab(name); + if (useMtab == TRUE) + erase_mtab(name); #endif - return( TRUE); - } - return(FALSE); + return (TRUE); + } + return (FALSE); } -static int -umount_all(int useMtab) +static int umount_all(int useMtab) { int status = TRUE; char *mountpt; void *iter; for (mountpt = mtab_first(&iter); mountpt; mountpt = mtab_next(&iter)) { - status=do_umount (mountpt, useMtab); - if (status != 0) { - /* Don't bother retrying the umount on busy devices */ - if (errno == EBUSY) { - perror(mountpt); - continue; - } - status = do_umount (mountpt, useMtab); + status = do_umount(mountpt, useMtab); if (status != 0) { - printf ("Couldn't umount %s on %s: %s\n", - mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE), strerror(errno)); + /* Don't bother retrying the umount on busy devices */ + if (errno == EBUSY) { + perror(mountpt); + continue; + } + status = do_umount(mountpt, useMtab); + if (status != 0) { + printf("Couldn't umount %s on %s: %s\n", + mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE), + strerror(errno)); + } } - } - } - return (status); + } + return (status); } -extern int -umount_main(int argc, char** argv) +extern int umount_main(int argc, char **argv) { - if (argc < 2) { - usage( umount_usage); - } - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - while (*++(*argv)) switch (**argv) { - case 'a': - umountAll = TRUE; - break; + if (argc < 2) { + usage(umount_usage); + } + + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + while (*++(*argv)) + switch (**argv) { + case 'a': + umountAll = TRUE; + break; #ifdef BB_MTAB - case 'n': - useMtab = FALSE; - break; + case 'n': + useMtab = FALSE; + break; #endif #ifdef BB_FEATURE_REMOUNT - case 'r': - doRemount = TRUE; - break; + case 'r': + doRemount = TRUE; + break; #endif - default: - usage( umount_usage); + default: + usage(umount_usage); + } + } + + mtab_read(); + if (umountAll == TRUE) { + exit(umount_all(useMtab)); + } + if (do_umount(*argv, useMtab) == 0) + exit(TRUE); + else { + perror("umount"); + exit(FALSE); } - } - - mtab_read(); - if (umountAll==TRUE) { - exit(umount_all(useMtab)); - } - if ( do_umount(*argv,useMtab) == 0 ) - exit (TRUE); - else { - perror("umount"); - exit(FALSE); - } } @@ -172,79 +171,89 @@ umount_main(int argc, char** argv) */ void mtab_read(void) { - struct _mtab_entry_t *entry = NULL; - struct mntent *e; - FILE *fp; - - if (mtab_cache != NULL) return; - - if ((fp = setmntent(mtab_file, "r")) == NULL) { - fprintf(stderr, "Cannot open %s\n", mtab_file); - return; - } - while ((e = getmntent(fp))) { - entry = malloc(sizeof(struct _mtab_entry_t)); - entry->device = strdup(e->mnt_fsname); - entry->mountpt = strdup(e->mnt_dir); - entry->next = mtab_cache; - mtab_cache = entry; - } - endmntent(fp); + struct _mtab_entry_t *entry = NULL; + struct mntent *e; + FILE *fp; + + if (mtab_cache != NULL) + return; + + if ((fp = setmntent(mtab_file, "r")) == NULL) { + fprintf(stderr, "Cannot open %s\n", mtab_file); + return; + } + while ((e = getmntent(fp))) { + entry = malloc(sizeof(struct _mtab_entry_t)); + + entry->device = strdup(e->mnt_fsname); + entry->mountpt = strdup(e->mnt_dir); + entry->next = mtab_cache; + mtab_cache = entry; + } + endmntent(fp); } char *mtab_getinfo(const char *match, const char which) { - struct _mtab_entry_t *cur = mtab_cache; - while (cur) { - if (strcmp(cur->mountpt, match) == 0 || - strcmp(cur->device, match) == 0) { - if (which == MTAB_GETMOUNTPT) { - return cur->mountpt; - } else { + struct _mtab_entry_t *cur = mtab_cache; + + while (cur) { + if (strcmp(cur->mountpt, match) == 0 || + strcmp(cur->device, match) == 0) { + if (which == MTAB_GETMOUNTPT) { + return cur->mountpt; + } else { #if !defined BB_MTAB - if (strcmp(cur->device, "/dev/root") == 0) { - struct fstab* fstabItem; - fstabItem = getfsfile ("/"); - if (fstabItem != NULL) return fstabItem->fs_spec; - } + if (strcmp(cur->device, "/dev/root") == 0) { + struct fstab *fstabItem; + + fstabItem = getfsfile("/"); + if (fstabItem != NULL) + return fstabItem->fs_spec; + } #endif - return cur->device; - } + return cur->device; + } + } + cur = cur->next; } - cur = cur->next; - } - return NULL; + return NULL; } char *mtab_first(void **iter) { - struct _mtab_entry_t *mtab_iter; - if (!iter) return NULL; - mtab_iter = mtab_cache; - *iter = (void *)mtab_iter; - return mtab_next(iter); + struct _mtab_entry_t *mtab_iter; + + if (!iter) + return NULL; + mtab_iter = mtab_cache; + *iter = (void *) mtab_iter; + return mtab_next(iter); } char *mtab_next(void **iter) { - char *mp; - if (iter == NULL || *iter == NULL) return NULL; - mp = ((struct _mtab_entry_t *)(*iter))->mountpt; - *iter = (void *)((struct _mtab_entry_t *)(*iter))->next; - return mp; + char *mp; + + if (iter == NULL || *iter == NULL) + return NULL; + mp = ((struct _mtab_entry_t *) (*iter))->mountpt; + *iter = (void *) ((struct _mtab_entry_t *) (*iter))->next; + return mp; } void mtab_free(void) { - struct _mtab_entry_t *this, *next; - - this = mtab_cache; - while (this) { - next = this->next; - if (this->device) free(this->device); - if (this->mountpt) free(this->mountpt); - free(this); - this = next; - } -} + struct _mtab_entry_t *this, *next; + this = mtab_cache; + while (this) { + next = this->next; + if (this->device) + free(this->device); + if (this->mountpt) + free(this->mountpt); + free(this); + this = next; + } +} @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Utility routines. * @@ -46,7 +47,7 @@ #include <sys/stat.h> #include <unistd.h> #include <ctype.h> -#include <sys/param.h> /* for PATH_MAX */ +#include <sys/param.h> /* for PATH_MAX */ #if defined BB_FEATURE_MOUNT_LOOP #include <fcntl.h> @@ -70,10 +71,10 @@ const char mtab_file[] = "/etc/mtab"; extern void usage(const char *usage) { - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", - BB_VER, BB_BT); - fprintf(stderr, "Usage: %s\n", usage); - exit FALSE; + fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", + BB_VER, BB_BT); + fprintf(stderr, "Usage: %s\n", usage); + exit FALSE; } @@ -86,22 +87,21 @@ extern void usage(const char *usage) * so, for example, to check if the kernel is greater than 2.2.11: * if (get_kernel_revision() <= 2*65536+2*256+11) { <stuff> } */ -int -get_kernel_revision() +int get_kernel_revision() { - FILE *file; - int major=0, minor=0, patch=0; - - file = fopen("/proc/sys/kernel/osrelease", "r"); - if (file == NULL) { - /* bummer, /proc must not be mounted... */ - return( 0); - } - fscanf(file,"%d.%d.%d",&major,&minor,&patch); - fclose(file); - return major*65536 + minor*256 + patch; + FILE *file; + int major = 0, minor = 0, patch = 0; + + file = fopen("/proc/sys/kernel/osrelease", "r"); + if (file == NULL) { + /* bummer, /proc must not be mounted... */ + return (0); + } + fscanf(file, "%d.%d.%d", &major, &minor, &patch); + fclose(file); + return major * 65536 + minor * 256 + patch; } -#endif /* BB_INIT || BB_PS */ +#endif /* BB_INIT || BB_PS */ @@ -112,19 +112,19 @@ get_kernel_revision() */ int isDirectory(const char *fileName, const int followLinks) { - struct stat statBuf; - int status; - - if (followLinks == TRUE) - status = stat(fileName, &statBuf); - else - status = lstat(fileName, &statBuf); - - if (status < 0) - return FALSE; - if (S_ISDIR(statBuf.st_mode)) - return TRUE; - return FALSE; + struct stat statBuf; + int status; + + if (followLinks == TRUE) + status = stat(fileName, &statBuf); + else + status = lstat(fileName, &statBuf); + + if (status < 0) + return FALSE; + if (S_ISDIR(statBuf.st_mode)) + return TRUE; + return FALSE; } #endif @@ -137,148 +137,150 @@ int isDirectory(const char *fileName, const int followLinks) * -Erik Andersen */ int -copyFile( const char *srcName, const char *destName, - int setModes, int followLinks) +copyFile(const char *srcName, const char *destName, + int setModes, int followLinks) { - int rfd; - int wfd; - int rcc; - int status; - char buf[BUF_SIZE]; - struct stat srcStatBuf; - struct stat dstStatBuf; - struct utimbuf times; - - if (followLinks == TRUE) - status = stat(srcName, &srcStatBuf); - else - status = lstat(srcName, &srcStatBuf); - - if (status < 0) { - perror(srcName); - return FALSE; - } + int rfd; + int wfd; + int rcc; + int status; + char buf[BUF_SIZE]; + struct stat srcStatBuf; + struct stat dstStatBuf; + struct utimbuf times; + + if (followLinks == TRUE) + status = stat(srcName, &srcStatBuf); + else + status = lstat(srcName, &srcStatBuf); - if (followLinks == TRUE) - status = stat(destName, &dstStatBuf); - else - status = lstat(destName, &dstStatBuf); + if (status < 0) { + perror(srcName); + return FALSE; + } - if (status < 0) { - dstStatBuf.st_ino = -1; - dstStatBuf.st_dev = -1; - } + if (followLinks == TRUE) + status = stat(destName, &dstStatBuf); + else + status = lstat(destName, &dstStatBuf); - if ((srcStatBuf.st_dev == dstStatBuf.st_dev) && - (srcStatBuf.st_ino == dstStatBuf.st_ino)) { - fprintf(stderr, "Copying file \"%s\" to itself\n", srcName); - return FALSE; - } - - if (S_ISDIR(srcStatBuf.st_mode)) { - //fprintf(stderr, "copying directory %s to %s\n", srcName, destName); - /* Make sure the directory is writable */ - status = mkdir(destName, 0777777 ^ umask(0)); - if (status < 0 && errno != EEXIST) { - perror(destName); - return FALSE; - } - } else if (S_ISLNK(srcStatBuf.st_mode)) { - char link_val[PATH_MAX + 1]; - int link_size; - - //fprintf(stderr, "copying link %s to %s\n", srcName, destName); - /* Warning: This could possibly truncate silently, to PATH_MAX chars */ - link_size = readlink(srcName, &link_val[0], PATH_MAX); - if (link_size < 0) { - perror(srcName); - return FALSE; - } - link_val[link_size] = '\0'; - status = symlink(link_val, destName); if (status < 0) { - perror(destName); - return FALSE; + dstStatBuf.st_ino = -1; + dstStatBuf.st_dev = -1; } -#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - if (setModes == TRUE) { - if (lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) { - perror(destName); - return FALSE; - } + + if ((srcStatBuf.st_dev == dstStatBuf.st_dev) && + (srcStatBuf.st_ino == dstStatBuf.st_ino)) { + fprintf(stderr, "Copying file \"%s\" to itself\n", srcName); + return FALSE; } + + if (S_ISDIR(srcStatBuf.st_mode)) { + //fprintf(stderr, "copying directory %s to %s\n", srcName, destName); + /* Make sure the directory is writable */ + status = mkdir(destName, 0777777 ^ umask(0)); + if (status < 0 && errno != EEXIST) { + perror(destName); + return FALSE; + } + } else if (S_ISLNK(srcStatBuf.st_mode)) { + char link_val[PATH_MAX + 1]; + int link_size; + + //fprintf(stderr, "copying link %s to %s\n", srcName, destName); + /* Warning: This could possibly truncate silently, to PATH_MAX chars */ + link_size = readlink(srcName, &link_val[0], PATH_MAX); + if (link_size < 0) { + perror(srcName); + return FALSE; + } + link_val[link_size] = '\0'; + status = symlink(link_val, destName); + if (status < 0) { + perror(destName); + return FALSE; + } +#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) + if (setModes == TRUE) { + if (lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) { + perror(destName); + return FALSE; + } + } #endif - return TRUE; - } else if (S_ISFIFO(srcStatBuf.st_mode)) { - //fprintf(stderr, "copying fifo %s to %s\n", srcName, destName); - if (mkfifo(destName, 0644) < 0) { - perror(destName); - return FALSE; - } - } else if (S_ISBLK(srcStatBuf.st_mode) || S_ISCHR(srcStatBuf.st_mode) - || S_ISSOCK (srcStatBuf.st_mode)) { - //fprintf(stderr, "copying soc, blk, or chr %s to %s\n", srcName, destName); - if (mknod(destName, srcStatBuf.st_mode, srcStatBuf.st_rdev) < 0) { - perror(destName); - return FALSE; - } - } else if (S_ISREG(srcStatBuf.st_mode)) { - //fprintf(stderr, "copying regular file %s to %s\n", srcName, destName); - rfd = open(srcName, O_RDONLY); - if (rfd < 0) { - perror(srcName); - return FALSE; - } + return TRUE; + } else if (S_ISFIFO(srcStatBuf.st_mode)) { + //fprintf(stderr, "copying fifo %s to %s\n", srcName, destName); + if (mkfifo(destName, 0644) < 0) { + perror(destName); + return FALSE; + } + } else if (S_ISBLK(srcStatBuf.st_mode) || S_ISCHR(srcStatBuf.st_mode) + || S_ISSOCK(srcStatBuf.st_mode)) { + //fprintf(stderr, "copying soc, blk, or chr %s to %s\n", srcName, destName); + if (mknod(destName, srcStatBuf.st_mode, srcStatBuf.st_rdev) < 0) { + perror(destName); + return FALSE; + } + } else if (S_ISREG(srcStatBuf.st_mode)) { + //fprintf(stderr, "copying regular file %s to %s\n", srcName, destName); + rfd = open(srcName, O_RDONLY); + if (rfd < 0) { + perror(srcName); + return FALSE; + } - wfd = open(destName, O_WRONLY | O_CREAT | O_TRUNC, srcStatBuf.st_mode); - if (wfd < 0) { - perror(destName); - close(rfd); - return FALSE; - } + wfd = + open(destName, O_WRONLY | O_CREAT | O_TRUNC, + srcStatBuf.st_mode); + if (wfd < 0) { + perror(destName); + close(rfd); + return FALSE; + } - while ((rcc = read(rfd, buf, sizeof(buf))) > 0) { - if (fullWrite(wfd, buf, rcc) < 0) - goto error_exit; - } - if (rcc < 0) { - goto error_exit; - } + while ((rcc = read(rfd, buf, sizeof(buf))) > 0) { + if (fullWrite(wfd, buf, rcc) < 0) + goto error_exit; + } + if (rcc < 0) { + goto error_exit; + } - close(rfd); - if (close(wfd) < 0) { - return FALSE; + close(rfd); + if (close(wfd) < 0) { + return FALSE; + } } - } - if (setModes == TRUE) { - /* This is fine, since symlinks never get here */ - if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) { - perror(destName); - exit FALSE; - } - if (chmod(destName, srcStatBuf.st_mode) < 0) { - perror(destName); - exit FALSE; - } - times.actime = srcStatBuf.st_atime; - times.modtime = srcStatBuf.st_mtime; - if (utime(destName, ×) < 0) { - perror(destName); - exit FALSE; + if (setModes == TRUE) { + /* This is fine, since symlinks never get here */ + if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) { + perror(destName); + exit FALSE; + } + if (chmod(destName, srcStatBuf.st_mode) < 0) { + perror(destName); + exit FALSE; + } + times.actime = srcStatBuf.st_atime; + times.modtime = srcStatBuf.st_mtime; + if (utime(destName, ×) < 0) { + perror(destName); + exit FALSE; + } } - } - return TRUE; + return TRUE; - error_exit: - perror(destName); - close(rfd); - close(wfd); + error_exit: + perror(destName); + close(rfd); + close(wfd); - return FALSE; + return FALSE; } -#endif /* BB_CP_MV */ +#endif /* BB_CP_MV */ @@ -289,16 +291,16 @@ copyFile( const char *srcName, const char *destName, /* The special bits. If set, display SMODE0/1 instead of MODE0/1 */ static const mode_t SBIT[] = { - 0, 0, S_ISUID, - 0, 0, S_ISGID, - 0, 0, S_ISVTX + 0, 0, S_ISUID, + 0, 0, S_ISGID, + 0, 0, S_ISVTX }; /* The 9 mode bits to test */ static const mode_t MBIT[] = { - S_IRUSR, S_IWUSR, S_IXUSR, - S_IRGRP, S_IWGRP, S_IXGRP, - S_IROTH, S_IWOTH, S_IXOTH + S_IRUSR, S_IWUSR, S_IXUSR, + S_IRGRP, S_IWGRP, S_IXGRP, + S_IROTH, S_IWOTH, S_IXOTH }; #define MODE1 "rwxrwxrwx" @@ -312,21 +314,20 @@ static const mode_t MBIT[] = { */ const char *modeString(int mode) { - static char buf[12]; - - int i; - buf[0] = TYPECHAR(mode); - for (i=0; i<9; i++) { - if (mode & SBIT[i]) - buf[i+1] = (mode & MBIT[i])? - SMODE1[i] : SMODE0[i]; - else - buf[i+1] = (mode & MBIT[i])? - MODE1[i] : MODE0[i]; - } - return buf; + static char buf[12]; + + int i; + + buf[0] = TYPECHAR(mode); + for (i = 0; i < 9; i++) { + if (mode & SBIT[i]) + buf[i + 1] = (mode & MBIT[i]) ? SMODE1[i] : SMODE0[i]; + else + buf[i + 1] = (mode & MBIT[i]) ? MODE1[i] : MODE0[i]; + } + return buf; } -#endif /* BB_TAR || BB_LS */ +#endif /* BB_TAR || BB_LS */ #if defined BB_TAR @@ -336,25 +337,25 @@ const char *modeString(int mode) */ const char *timeString(time_t timeVal) { - time_t now; - char *str; - static char buf[26]; + time_t now; + char *str; + static char buf[26]; - time(&now); + time(&now); - str = ctime(&timeVal); + str = ctime(&timeVal); - strcpy(buf, &str[4]); - buf[12] = '\0'; + strcpy(buf, &str[4]); + buf[12] = '\0'; - if ((timeVal > now) || (timeVal < now - 365 * 24 * 60 * 60L)) { - strcpy(&buf[7], &str[20]); - buf[11] = '\0'; - } + if ((timeVal > now) || (timeVal < now - 365 * 24 * 60 * 60L)) { + strcpy(&buf[7], &str[20]); + buf[11] = '\0'; + } - return buf; + return buf; } -#endif /* BB_TAR */ +#endif /* BB_TAR */ #if defined BB_TAR || defined BB_CP_MV /* @@ -364,25 +365,25 @@ const char *timeString(time_t timeVal) */ int fullWrite(int fd, const char *buf, int len) { - int cc; - int total; + int cc; + int total; - total = 0; + total = 0; - while (len > 0) { - cc = write(fd, buf, len); + while (len > 0) { + cc = write(fd, buf, len); - if (cc < 0) - return -1; + if (cc < 0) + return -1; - buf += cc; - total += cc; - len -= cc; - } + buf += cc; + total += cc; + len -= cc; + } - return total; + return total; } -#endif /* BB_TAR || BB_CP_MV */ +#endif /* BB_TAR || BB_CP_MV */ #if defined BB_TAR || defined BB_TAIL @@ -394,28 +395,28 @@ int fullWrite(int fd, const char *buf, int len) */ int fullRead(int fd, char *buf, int len) { - int cc; - int total; + int cc; + int total; - total = 0; + total = 0; - while (len > 0) { - cc = read(fd, buf, len); + while (len > 0) { + cc = read(fd, buf, len); - if (cc < 0) - return -1; + if (cc < 0) + return -1; - if (cc == 0) - break; + if (cc == 0) + break; - buf += cc; - total += cc; - len -= cc; - } + buf += cc; + total += cc; + len -= cc; + } - return total; + return total; } -#endif /* BB_TAR || BB_TAIL */ +#endif /* BB_TAR || BB_TAIL */ #if defined (BB_CHMOD_CHOWN_CHGRP) \ @@ -434,102 +435,104 @@ int fullRead(int fd, char *buf, int len) * is so stinking huge. */ int recursiveAction(const char *fileName, - int recurse, int followLinks, int depthFirst, - int (*fileAction) (const char *fileName, - struct stat* statbuf), - int (*dirAction) (const char *fileName, - struct stat* statbuf)) + int recurse, int followLinks, int depthFirst, + int (*fileAction) (const char *fileName, + struct stat * statbuf), + int (*dirAction) (const char *fileName, + struct stat * statbuf)) { - int status; - struct stat statbuf; - struct dirent *next; + int status; + struct stat statbuf; + struct dirent *next; - if (followLinks == TRUE) - status = stat(fileName, &statbuf); - else - status = lstat(fileName, &statbuf); + if (followLinks == TRUE) + status = stat(fileName, &statbuf); + else + status = lstat(fileName, &statbuf); - if (status < 0) { + if (status < 0) { #ifdef BB_DEBUG_PRINT_SCAFFOLD - fprintf(stderr, - "status=%d followLinks=%d TRUE=%d\n", - status, followLinks, TRUE); + fprintf(stderr, + "status=%d followLinks=%d TRUE=%d\n", + status, followLinks, TRUE); #endif - perror(fileName); - return FALSE; - } - - if ((followLinks == FALSE) && (S_ISLNK(statbuf.st_mode)) ) { - if (fileAction == NULL) - return TRUE; - else - return fileAction(fileName, &statbuf); - } - - if (recurse == FALSE) { - if (S_ISDIR(statbuf.st_mode)) { - if (dirAction != NULL) - return (dirAction(fileName, &statbuf)); - else - return TRUE; - } - } - - if (S_ISDIR(statbuf.st_mode)) { - DIR *dir; - dir = opendir(fileName); - if (!dir) { - perror(fileName); - return FALSE; - } - if (dirAction != NULL && depthFirst == FALSE) { - status = dirAction(fileName, &statbuf); - if (status == FALSE) { perror(fileName); return FALSE; - } } - while ((next = readdir(dir)) != NULL) { - char nextFile[PATH_MAX + 1]; - if ((strcmp(next->d_name, "..") == 0) - || (strcmp(next->d_name, ".") == 0)) { - continue; - } - if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) { - fprintf(stderr, name_too_long, "ftw"); - return FALSE; - } - sprintf(nextFile, "%s/%s", fileName, next->d_name); - status = - recursiveAction(nextFile, TRUE, followLinks, depthFirst, - fileAction, dirAction); - if (status < 0) { - closedir(dir); - return FALSE; - } + + if ((followLinks == FALSE) && (S_ISLNK(statbuf.st_mode))) { + if (fileAction == NULL) + return TRUE; + else + return fileAction(fileName, &statbuf); } - status = closedir(dir); - if (status < 0) { - perror(fileName); - return FALSE; + + if (recurse == FALSE) { + if (S_ISDIR(statbuf.st_mode)) { + if (dirAction != NULL) + return (dirAction(fileName, &statbuf)); + else + return TRUE; + } } - if (dirAction != NULL && depthFirst == TRUE) { - status = dirAction(fileName, &statbuf); - if (status == FALSE) { - perror(fileName); - return FALSE; - } + + if (S_ISDIR(statbuf.st_mode)) { + DIR *dir; + + dir = opendir(fileName); + if (!dir) { + perror(fileName); + return FALSE; + } + if (dirAction != NULL && depthFirst == FALSE) { + status = dirAction(fileName, &statbuf); + if (status == FALSE) { + perror(fileName); + return FALSE; + } + } + while ((next = readdir(dir)) != NULL) { + char nextFile[PATH_MAX + 1]; + + if ((strcmp(next->d_name, "..") == 0) + || (strcmp(next->d_name, ".") == 0)) { + continue; + } + if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) { + fprintf(stderr, name_too_long, "ftw"); + return FALSE; + } + sprintf(nextFile, "%s/%s", fileName, next->d_name); + status = + recursiveAction(nextFile, TRUE, followLinks, depthFirst, + fileAction, dirAction); + if (status < 0) { + closedir(dir); + return FALSE; + } + } + status = closedir(dir); + if (status < 0) { + perror(fileName); + return FALSE; + } + if (dirAction != NULL && depthFirst == TRUE) { + status = dirAction(fileName, &statbuf); + if (status == FALSE) { + perror(fileName); + return FALSE; + } + } + } else { + if (fileAction == NULL) + return TRUE; + else + return fileAction(fileName, &statbuf); } - } else { - if (fileAction == NULL) - return TRUE; - else - return fileAction(fileName, &statbuf); - } - return TRUE; + return TRUE; } -#endif /* BB_CHMOD_CHOWN_CHGRP || BB_CP_MV || BB_FIND || BB_LS || BB_INSMOD */ +#endif /* BB_CHMOD_CHOWN_CHGRP || BB_CP_MV || BB_FIND || BB_LS || BB_INSMOD */ @@ -540,30 +543,30 @@ int recursiveAction(const char *fileName, * while all previous ones get default protections. Errors are not reported * here, as failures to restore files can be reported later. */ -extern int createPath (const char *name, int mode) +extern int createPath(const char *name, int mode) { - char *cp; - char *cpOld; - char buf[PATH_MAX + 1]; - int retVal=0; - - strcpy( buf, name); - for (cp = buf; *cp == '/'; cp++); - cp = strchr(cp, '/'); - while (cp) { - cpOld = cp; - cp = strchr(cp + 1, '/'); - *cpOld = '\0'; - retVal = mkdir(buf, cp ? 0777 : mode); - if (retVal != 0 && errno != EEXIST) { - perror(buf); - return FALSE; + char *cp; + char *cpOld; + char buf[PATH_MAX + 1]; + int retVal = 0; + + strcpy(buf, name); + for (cp = buf; *cp == '/'; cp++); + cp = strchr(cp, '/'); + while (cp) { + cpOld = cp; + cp = strchr(cp + 1, '/'); + *cpOld = '\0'; + retVal = mkdir(buf, cp ? 0777 : mode); + if (retVal != 0 && errno != EEXIST) { + perror(buf); + return FALSE; + } + *cpOld = '/'; } - *cpOld = '/'; - } - return TRUE; + return TRUE; } -#endif /* BB_TAR || BB_MKDIR */ +#endif /* BB_TAR || BB_MKDIR */ @@ -572,67 +575,68 @@ extern int createPath (const char *name, int mode) -extern int -parse_mode( const char* s, mode_t* theMode) +extern int parse_mode(const char *s, mode_t * theMode) { - mode_t andMode = S_ISVTX|S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO; + mode_t andMode = + + S_ISVTX | S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO; mode_t orMode = 0; - mode_t mode = 0; - mode_t groups = 0; - char type; - char c; + mode_t mode = 0; + mode_t groups = 0; + char type; + char c; do { - for ( ; ; ) { - switch ( c = *s++ ) { + for (;;) { + switch (c = *s++) { case '\0': return -1; case 'u': - groups |= S_ISUID|S_IRWXU; + groups |= S_ISUID | S_IRWXU; continue; case 'g': - groups |= S_ISGID|S_IRWXG; + groups |= S_ISGID | S_IRWXG; continue; case 'o': groups |= S_IRWXO; continue; case 'a': - groups |= S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO; + groups |= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO; continue; case '+': case '=': case '-': type = c; - if ( groups == 0 ) /* The default is "all" */ - groups |= S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO; + if (groups == 0) /* The default is "all" */ + groups |= + S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO; break; default: - if ( isdigit(c) && c >= '0' && c <= '7' && - mode == 0 && groups == 0 ) { + if (isdigit(c) && c >= '0' && c <= '7' && + mode == 0 && groups == 0) { *theMode = strtol(--s, NULL, 8); return (TRUE); - } - else + } else return (FALSE); } break; } - while ( (c = *s++) != '\0' ) { - switch ( c ) { + while ((c = *s++) != '\0') { + switch (c) { case ',': break; case 'r': - mode |= S_IRUSR|S_IRGRP|S_IROTH; + mode |= S_IRUSR | S_IRGRP | S_IROTH; continue; case 'w': - mode |= S_IWUSR|S_IWGRP|S_IWOTH; + mode |= S_IWUSR | S_IWGRP | S_IWOTH; continue; case 'x': - mode |= S_IXUSR|S_IXGRP|S_IXOTH; + mode |= S_IXUSR | S_IXGRP | S_IXOTH; continue; case 's': - mode |= S_IXGRP|S_ISUID|S_ISGID; + mode |= S_IXGRP | S_ISUID | S_ISGID; continue; case 't': mode |= 0; @@ -640,11 +644,11 @@ parse_mode( const char* s, mode_t* theMode) default: *theMode &= andMode; *theMode |= orMode; - return( TRUE); + return (TRUE); } break; } - switch ( type ) { + switch (type) { case '=': andMode &= ~(groups); /* fall through */ @@ -656,14 +660,14 @@ parse_mode( const char* s, mode_t* theMode) orMode &= andMode; break; } - } while ( c == ',' ); + } while (c == ','); *theMode &= andMode; *theMode |= orMode; return (TRUE); } -#endif /* BB_CHMOD_CHOWN_CHGRP || BB_MKDIR */ +#endif /* BB_CHMOD_CHOWN_CHGRP || BB_MKDIR */ @@ -676,82 +680,77 @@ parse_mode( const char* s, mode_t* theMode) /* Use this to avoid needing the glibc NSS stuff * This uses storage buf to hold things. * */ -uid_t -my_getid(const char *filename, char *name, uid_t id) +uid_t my_getid(const char *filename, char *name, uid_t id) { FILE *file; char *rname, *start, *end, buf[128]; uid_t rid; - file=fopen(filename,"r"); + file = fopen(filename, "r"); if (file == NULL) { - perror(filename); - return (-1); + perror(filename); + return (-1); } - while (fgets (buf, 128, file) != NULL) { + while (fgets(buf, 128, file) != NULL) { if (buf[0] == '#') continue; start = buf; - end = strchr (start, ':'); + end = strchr(start, ':'); if (end == NULL) continue; *end = '\0'; rname = start; start = end + 1; - end = strchr (start, ':'); + end = strchr(start, ':'); if (end == NULL) continue; start = end + 1; - rid = (uid_t) strtol (start, &end, 10); + rid = (uid_t) strtol(start, &end, 10); if (end == start) continue; if (name) { - if (0 == strcmp(rname, name)) { - fclose( file); - return( rid); - } - } - if ( id != -1 && id == rid ) { - strncpy(name, rname, 8); - fclose( file); - return( TRUE); + if (0 == strcmp(rname, name)) { + fclose(file); + return (rid); + } + } + if (id != -1 && id == rid) { + strncpy(name, rname, 8); + fclose(file); + return (TRUE); } } fclose(file); return (-1); } -uid_t -my_getpwnam(char *name) +uid_t my_getpwnam(char *name) { - return my_getid("/etc/passwd", name, -1); + return my_getid("/etc/passwd", name, -1); } -gid_t -my_getgrnam(char *name) +gid_t my_getgrnam(char *name) { - return my_getid("/etc/group", name, -1); + return my_getid("/etc/group", name, -1); } -void -my_getpwuid(char* name, uid_t uid) +void my_getpwuid(char *name, uid_t uid) { - my_getid("/etc/passwd", name, uid); + my_getid("/etc/passwd", name, uid); } -void -my_getgrgid(char* group, gid_t gid) +void my_getgrgid(char *group, gid_t gid) { - my_getid("/etc/group", group, gid); + my_getid("/etc/group", group, gid); } -#endif /* BB_CHMOD_CHOWN_CHGRP || BB_PS */ +#endif /* BB_CHMOD_CHOWN_CHGRP || BB_PS */ @@ -762,43 +761,42 @@ my_getgrgid(char* group, gid_t gid) #include <linux/kd.h> #include <sys/ioctl.h> -int is_a_console(int fd) +int is_a_console(int fd) { - char arg; - - arg = 0; - return (ioctl(fd, KDGKBTYPE, &arg) == 0 - && ((arg == KB_101) || (arg == KB_84))); + char arg; + + arg = 0; + return (ioctl(fd, KDGKBTYPE, &arg) == 0 + && ((arg == KB_101) || (arg == KB_84))); } -static int open_a_console(char *fnam) +static int open_a_console(char *fnam) { - int fd; - - /* try read-only */ - fd = open(fnam, O_RDWR); - - /* if failed, try read-only */ - if (fd < 0 && errno == EACCES) - fd = open(fnam, O_RDONLY); - - /* if failed, try write-only */ - if (fd < 0 && errno == EACCES) - fd = open(fnam, O_WRONLY); - - /* if failed, fail */ - if (fd < 0) - return -1; - - /* if not a console, fail */ - if (! is_a_console(fd)) - { - close(fd); - return -1; - } - - /* success */ - return fd; + int fd; + + /* try read-only */ + fd = open(fnam, O_RDWR); + + /* if failed, try read-only */ + if (fd < 0 && errno == EACCES) + fd = open(fnam, O_RDONLY); + + /* if failed, try write-only */ + if (fd < 0 && errno == EACCES) + fd = open(fnam, O_WRONLY); + + /* if failed, fail */ + if (fd < 0) + return -1; + + /* if not a console, fail */ + if (!is_a_console(fd)) { + close(fd); + return -1; + } + + /* success */ + return fd; } /* @@ -809,59 +807,59 @@ static int open_a_console(char *fnam) * if tty_name is non-NULL, try this one instead. */ -int get_console_fd(char* tty_name) +int get_console_fd(char *tty_name) { - int fd; + int fd; - if (tty_name) - { - if (-1 == (fd = open_a_console(tty_name))) - return -1; - else - return fd; - } - - fd = open_a_console("/dev/tty"); - if (fd >= 0) - return fd; - - fd = open_a_console("/dev/tty0"); - if (fd >= 0) - return fd; - - fd = open_a_console("/dev/console"); - if (fd >= 0) - return fd; - - for (fd = 0; fd < 3; fd++) - if (is_a_console(fd)) - return fd; - - fprintf(stderr, - "Couldnt get a file descriptor referring to the console\n"); - return -1; /* total failure */ + if (tty_name) { + if (-1 == (fd = open_a_console(tty_name))) + return -1; + else + return fd; + } + + fd = open_a_console("/dev/tty"); + if (fd >= 0) + return fd; + + fd = open_a_console("/dev/tty0"); + if (fd >= 0) + return fd; + + fd = open_a_console("/dev/console"); + if (fd >= 0) + return fd; + + for (fd = 0; fd < 3; fd++) + if (is_a_console(fd)) + return fd; + + fprintf(stderr, + "Couldnt get a file descriptor referring to the console\n"); + return -1; /* total failure */ } -#endif /* BB_CHVT || BB_DEALLOCVT */ +#endif /* BB_CHVT || BB_DEALLOCVT */ -#if !defined BB_REGEXP && (defined BB_GREP || defined BB_SED) +#if !defined BB_REGEXP && (defined BB_GREP || defined BB_SED) /* Do a case insensitive strstr() */ -char* stristr(char *haystack, const char *needle) +char *stristr(char *haystack, const char *needle) { - int len = strlen( needle ); - while( *haystack ) { - if( !strncasecmp( haystack, needle, len ) ) - break; - haystack++; - } + int len = strlen(needle); - if( !(*haystack) ) - haystack = NULL; + while (*haystack) { + if (!strncasecmp(haystack, needle, len)) + break; + haystack++; + } - return haystack; + if (!(*haystack)) + haystack = NULL; + + return haystack; } /* This tries to find a needle in a haystack, but does so by @@ -873,56 +871,61 @@ char* stristr(char *haystack, const char *needle) extern int find_match(char *haystack, char *needle, int ignoreCase) { - if (ignoreCase == FALSE) - haystack = strstr (haystack, needle); - else - haystack = stristr (haystack, needle); - if (haystack == NULL) - return FALSE; - return TRUE; + if (ignoreCase == FALSE) + haystack = strstr(haystack, needle); + else + haystack = stristr(haystack, needle); + if (haystack == NULL) + return FALSE; + return TRUE; } /* This performs substitutions after a string match has been found. */ -extern int replace_match(char *haystack, char *needle, char *newNeedle, int ignoreCase) +extern int replace_match(char *haystack, char *needle, char *newNeedle, + int ignoreCase) { - int foundOne=0; - char *where, *slider, *slider1, *oldhayStack; + int foundOne = 0; + char *where, *slider, *slider1, *oldhayStack; - if (ignoreCase == FALSE) - where = strstr (haystack, needle); - else - where = stristr (haystack, needle); + if (ignoreCase == FALSE) + where = strstr(haystack, needle); + else + where = stristr(haystack, needle); - if (strcmp(needle, newNeedle)==0) - return FALSE; + if (strcmp(needle, newNeedle) == 0) + return FALSE; - oldhayStack = (char*)malloc((unsigned)(strlen(haystack))); - while(where!=NULL) { - foundOne++; - strcpy(oldhayStack, haystack); + oldhayStack = (char *) malloc((unsigned) (strlen(haystack))); + while (where != NULL) { + foundOne++; + strcpy(oldhayStack, haystack); #if 0 - if ( strlen(newNeedle) > strlen(needle)) { - haystack = (char *)realloc(haystack, (unsigned)(strlen(haystack) - - strlen(needle) + strlen(newNeedle))); - } + if (strlen(newNeedle) > strlen(needle)) { + haystack = + (char *) realloc(haystack, + (unsigned) (strlen(haystack) - + strlen(needle) + + strlen(newNeedle))); + } #endif - for(slider=haystack,slider1=oldhayStack;slider!=where;slider++,slider1++); - *slider=0; - haystack=strcat(haystack, newNeedle); - slider1+=strlen(needle); - haystack = strcat(haystack, slider1); - where = strstr (slider, needle); - } - free( oldhayStack); - - if (foundOne > 0) - return TRUE; - else - return FALSE; + for (slider = haystack, slider1 = oldhayStack; slider != where; + slider++, slider1++); + *slider = 0; + haystack = strcat(haystack, newNeedle); + slider1 += strlen(needle); + haystack = strcat(haystack, slider1); + where = strstr(slider, needle); + } + free(oldhayStack); + + if (foundOne > 0) + return TRUE; + else + return FALSE; } -#endif /* ! BB_REGEXP && (BB_GREP || BB_SED) */ +#endif /* ! BB_REGEXP && (BB_GREP || BB_SED) */ #if defined BB_FIND @@ -940,91 +943,84 @@ extern int replace_match(char *haystack, char *needle, char *newNeedle, int igno * provided that this copyright notice remains intact. * Permission to distribute this code under the GPL has been granted. */ -extern int -check_wildcard_match(const char* text, const char* pattern) +extern int check_wildcard_match(const char *text, const char *pattern) { - const char* retryPat; - const char* retryText; - int ch; - int found; - - retryPat = NULL; - retryText = NULL; - - while (*text || *pattern) - { - ch = *pattern++; - - switch (ch) - { - case '*': - retryPat = pattern; - retryText = text; - break; + const char *retryPat; + const char *retryText; + int ch; + int found; - case '[': - found = FALSE; + retryPat = NULL; + retryText = NULL; - while ((ch = *pattern++) != ']') - { - if (ch == '\\') - ch = *pattern++; + while (*text || *pattern) { + ch = *pattern++; - if (ch == '\0') - return FALSE; + switch (ch) { + case '*': + retryPat = pattern; + retryText = text; + break; - if (*text == ch) - found = TRUE; - } + case '[': + found = FALSE; - //if (!found) - if (found==TRUE) - { - pattern = retryPat; - text = ++retryText; - } + while ((ch = *pattern++) != ']') { + if (ch == '\\') + ch = *pattern++; + + if (ch == '\0') + return FALSE; - /* fall into next case */ + if (*text == ch) + found = TRUE; + } - case '?': - if (*text++ == '\0') - return FALSE; + //if (!found) + if (found == TRUE) { + pattern = retryPat; + text = ++retryText; + } - break; + /* fall into next case */ - case '\\': - ch = *pattern++; + case '?': + if (*text++ == '\0') + return FALSE; - if (ch == '\0') - return FALSE; + break; + + case '\\': + ch = *pattern++; - /* fall into next case */ + if (ch == '\0') + return FALSE; - default: - if (*text == ch) - { - if (*text) - text++; - break; - } + /* fall into next case */ - if (*text) - { - pattern = retryPat; - text = ++retryText; - break; + default: + if (*text == ch) { + if (*text) + text++; + break; + } + + if (*text) { + pattern = retryPat; + text = ++retryText; + break; + } + + return FALSE; } - return FALSE; + if (pattern == NULL) + return FALSE; } - if (pattern == NULL) - return FALSE; - } - - return TRUE; + return TRUE; } -#endif /* BB_FIND */ +#endif /* BB_FIND */ @@ -1039,36 +1035,36 @@ check_wildcard_match(const char* text, const char* pattern) */ extern struct mntent *findMountPoint(const char *name, const char *table) { - struct stat s; - dev_t mountDevice; - FILE *mountTable; - struct mntent *mountEntry; + struct stat s; + dev_t mountDevice; + FILE *mountTable; + struct mntent *mountEntry; - if (stat(name, &s) != 0) - return 0; + if (stat(name, &s) != 0) + return 0; - if ((s.st_mode & S_IFMT) == S_IFBLK) - mountDevice = s.st_rdev; - else - mountDevice = s.st_dev; + if ((s.st_mode & S_IFMT) == S_IFBLK) + mountDevice = s.st_rdev; + else + mountDevice = s.st_dev; - if ((mountTable = setmntent(table, "r")) == 0) - return 0; + if ((mountTable = setmntent(table, "r")) == 0) + return 0; - while ((mountEntry = getmntent(mountTable)) != 0) { - if (strcmp(name, mountEntry->mnt_dir) == 0 - || strcmp(name, mountEntry->mnt_fsname) == 0) /* String match. */ - break; - if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice) /* Match the device. */ - break; - if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice) /* Match the directory's mount point. */ - break; - } - endmntent(mountTable); - return mountEntry; + while ((mountEntry = getmntent(mountTable)) != 0) { + if (strcmp(name, mountEntry->mnt_dir) == 0 + || strcmp(name, mountEntry->mnt_fsname) == 0) /* String match. */ + break; + if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice) /* Match the device. */ + break; + if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice) /* Match the directory's mount point. */ + break; + } + endmntent(mountTable); + return mountEntry; } -#endif /* BB_DF || BB_MTAB */ +#endif /* BB_DF || BB_MTAB */ @@ -1077,74 +1073,74 @@ extern struct mntent *findMountPoint(const char *name, const char *table) * Read a number with a possible multiplier. * Returns -1 if the number format is illegal. */ -extern long getNum (const char *cp) +extern long getNum(const char *cp) { - long value; + long value; - if (!isDecimal (*cp)) - return -1; + if (!isDecimal(*cp)) + return -1; - value = 0; + value = 0; - while (isDecimal (*cp)) - value = value * 10 + *cp++ - '0'; + while (isDecimal(*cp)) + value = value * 10 + *cp++ - '0'; - switch (*cp++) { - case 'M': - case 'm': /* `tail' uses it traditionally */ - value *= 1048576; - break; + switch (*cp++) { + case 'M': + case 'm': /* `tail' uses it traditionally */ + value *= 1048576; + break; - case 'k': - value *= 1024; - break; + case 'k': + value *= 1024; + break; - case 'b': - value *= 512; - break; + case 'b': + value *= 512; + break; - case 'w': - value *= 2; - break; + case 'w': + value *= 2; + break; - case '\0': - return value; + case '\0': + return value; - default: - return -1; - } + default: + return -1; + } - if (*cp) - return -1; + if (*cp) + return -1; - return value; + return value; } -#endif /* BB_DD || BB_TAIL */ +#endif /* BB_DD || BB_TAIL */ #if defined BB_INIT || defined BB_SYSLOGD /* try to open up the specified device */ extern int device_open(char *device, int mode) { - int m, f, fd = -1; + int m, f, fd = -1; - m = mode | O_NONBLOCK; + m = mode | O_NONBLOCK; - /* Retry up to 5 times */ - for (f = 0; f < 5; f++) - if ((fd = open(device, m, 0600)) >= 0) - break; - if (fd < 0) + /* Retry up to 5 times */ + for (f = 0; f < 5; f++) + if ((fd = open(device, m, 0600)) >= 0) + break; + if (fd < 0) + return fd; + /* Reset original flags. */ + if (m != mode) + fcntl(fd, F_SETFL, mode); return fd; - /* Reset original flags. */ - if (m != mode) - fcntl(fd, F_SETFL, mode); - return fd; } -#endif /* BB_INIT BB_SYSLOGD */ +#endif /* BB_INIT BB_SYSLOGD */ -#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT +#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT #if ! defined BB_FEATURE_USE_PROCFS #error Sorry, I depend on the /proc filesystem right now. @@ -1158,101 +1154,103 @@ extern int device_open(char *device, int mode) * 0 failure * pid when init's pid is found. */ -extern pid_t -findInitPid() +extern pid_t findInitPid() { - pid_t init_pid; - char filename[256]; - char buffer[256]; - - /* no need to opendir ;) */ - for (init_pid = 1; init_pid < 65536; init_pid++) { - FILE *status; - - sprintf(filename, "/proc/%d/status", init_pid); - status = fopen(filename, "r"); - if (!status) { continue; } - fgets(buffer, 256, status); - fclose(status); - - if ( (strstr(buffer, "init\n") != NULL )) { - return init_pid; + pid_t init_pid; + char filename[256]; + char buffer[256]; + + /* no need to opendir ;) */ + for (init_pid = 1; init_pid < 65536; init_pid++) { + FILE *status; + + sprintf(filename, "/proc/%d/status", init_pid); + status = fopen(filename, "r"); + if (!status) { + continue; + } + fgets(buffer, 256, status); + fclose(status); + + if ((strstr(buffer, "init\n") != NULL)) { + return init_pid; + } } - } - return 0; + return 0; } -#endif /* BB_INIT || BB_HALT || BB_REBOOT */ +#endif /* BB_INIT || BB_HALT || BB_REBOOT */ #if defined BB_GUNZIP \ || defined BB_GZIP \ || defined BB_PRINTF \ || defined BB_TAIL -extern void *xmalloc (size_t size) +extern void *xmalloc(size_t size) { - void *cp = malloc (size); + void *cp = malloc(size); - if (cp == NULL) { - error("out of memory"); - } - return cp; + if (cp == NULL) { + error("out of memory"); + } + return cp; } extern void error(char *msg) { - fprintf(stderr, "\n%s\n", msg); - exit(1); + fprintf(stderr, "\n%s\n", msg); + exit(1); } -#endif /* BB_GUNZIP || BB_GZIP || BB_PRINTF || BB_TAIL */ +#endif /* BB_GUNZIP || BB_GZIP || BB_PRINTF || BB_TAIL */ #if (__GLIBC__ < 2) && (defined BB_SYSLOGD || defined BB_INIT) extern int vdprintf(int d, const char *format, va_list ap) { - char buf[BUF_SIZE]; - int len; + char buf[BUF_SIZE]; + int len; - len = vsprintf(buf, format, ap); - return write(d, buf, len); + len = vsprintf(buf, format, ap); + return write(d, buf, len); } -#endif /* BB_SYSLOGD */ +#endif /* BB_SYSLOGD */ #if defined BB_FEATURE_MOUNT_LOOP extern int del_loop(const char *device) { - int fd; - - if ((fd = open(device, O_RDONLY)) < 0) { - perror(device); - return( FALSE); - } - if (ioctl(fd, LOOP_CLR_FD, 0) < 0) { - perror("ioctl: LOOP_CLR_FD"); - return( FALSE); - } - close(fd); - return( TRUE); + int fd; + + if ((fd = open(device, O_RDONLY)) < 0) { + perror(device); + return (FALSE); + } + if (ioctl(fd, LOOP_CLR_FD, 0) < 0) { + perror("ioctl: LOOP_CLR_FD"); + return (FALSE); + } + close(fd); + return (TRUE); } -extern int set_loop(const char *device, const char *file, int offset, int *loopro) +extern int set_loop(const char *device, const char *file, int offset, + int *loopro) { struct loop_info loopinfo; - int fd, ffd, mode; - + int fd, ffd, mode; + mode = *loopro ? O_RDONLY : O_RDWR; - if ((ffd = open (file, mode)) < 0 && !*loopro - && (errno != EROFS || (ffd = open (file, mode = O_RDONLY)) < 0)) { - perror (file); - return 1; + if ((ffd = open(file, mode)) < 0 && !*loopro + && (errno != EROFS || (ffd = open(file, mode = O_RDONLY)) < 0)) { + perror(file); + return 1; } - if ((fd = open (device, mode)) < 0) { - close(ffd); - perror (device); - return 1; + if ((fd = open(device, mode)) < 0) { + close(ffd); + perror(device); + return 1; } *loopro = (mode == O_RDONLY); memset(&loopinfo, 0, sizeof(loopinfo)); strncpy(loopinfo.lo_name, file, LO_NAME_SIZE); - loopinfo.lo_name[LO_NAME_SIZE-1] = 0; + loopinfo.lo_name[LO_NAME_SIZE - 1] = 0; loopinfo.lo_offset = offset; @@ -1275,30 +1273,30 @@ extern int set_loop(const char *device, const char *file, int offset, int *loopr return 0; } -extern char *find_unused_loop_device (void) +extern char *find_unused_loop_device(void) { char dev[20]; int i, fd; struct stat statbuf; struct loop_info loopinfo; - for(i = 0; i <= 7; i++) { - sprintf(dev, "/dev/loop%d", i); - if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) { - if ((fd = open (dev, O_RDONLY)) >= 0) { - if(ioctl (fd, LOOP_GET_STATUS, &loopinfo) == -1) { - if (errno == ENXIO) { /* probably free */ - close (fd); - return strdup(dev); + for (i = 0; i <= 7; i++) { + sprintf(dev, "/dev/loop%d", i); + if (stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) { + if ((fd = open(dev, O_RDONLY)) >= 0) { + if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == -1) { + if (errno == ENXIO) { /* probably free */ + close(fd); + return strdup(dev); + } + } + close(fd); } - } - close (fd); } - } } - return NULL; + return NULL; } -#endif /* BB_FEATURE_MOUNT_LOOP */ +#endif /* BB_FEATURE_MOUNT_LOOP */ /* END CODE */ @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini wc implementation for busybox * @@ -23,78 +24,82 @@ #include <stdio.h> static const char wc_usage[] = "wc [OPTION]... [FILE]...\n\n" -"Print line, word, and byte counts for each FILE, and a total line if\n" -"more than one FILE is specified. With no FILE, read standard input.\n" -"\t-c\tprint the byte counts\n" -"\t-l\tprint the newline counts\n" -"\t-L\tprint the length of the longest line\n" -"\t-w\tprint the word counts\n"; + "Print line, word, and byte counts for each FILE, and a total line if\n" + "more than one FILE is specified. With no FILE, read standard input.\n" + "\t-c\tprint the byte counts\n" + "\t-l\tprint the newline counts\n" + + "\t-L\tprint the length of the longest line\n" + "\t-w\tprint the word counts\n"; static int total_lines, total_words, total_chars, max_length; static int print_lines, print_words, print_chars, print_length; -void print_counts (int lines, int words, int chars, int length, - const char *name) { +void print_counts(int lines, int words, int chars, int length, + const char *name) +{ char const *space = ""; + if (print_lines) { - printf ("%7d", lines); + printf("%7d", lines); space = " "; } if (print_words) { - printf ("%s%7d", space, words); + printf("%s%7d", space, words); space = " "; } if (print_chars) { - printf ("%s%7d", space, chars); + printf("%s%7d", space, chars); space = " "; } if (print_length) - printf ("%s%7d", space, length); + printf("%s%7d", space, length); if (*name) - printf (" %s", name); - putchar ('\n'); + printf(" %s", name); + putchar('\n'); } -static void wc_file(FILE *file, const char *name) +static void wc_file(FILE * file, const char *name) { int lines, words, chars, length; int in_word = 0, linepos = 0; int c; + lines = words = chars = length = 0; while ((c = getc(file)) != EOF) { chars++; switch (c) { - case '\n': - lines++; - case '\r': - case '\f': - if (linepos > length) - length = linepos; - linepos = 0; - goto word_separator; - case '\t': - linepos += 8 - (linepos % 8); - goto word_separator; - case ' ': - linepos++; - case '\v': - word_separator: - if (in_word) { - in_word = 0; - words++; - } - break; - default: - linepos++; - in_word = 1; - break; + case '\n': + lines++; + case '\r': + case '\f': + if (linepos > length) + length = linepos; + linepos = 0; + goto word_separator; + case '\t': + linepos += 8 - (linepos % 8); + goto word_separator; + case ' ': + linepos++; + case '\v': + word_separator: + if (in_word) { + in_word = 0; + words++; + } + break; + default: + linepos++; + in_word = 1; + break; } } if (linepos > length) length = linepos; if (in_word) words++; - print_counts (lines, words, chars, length, name); + print_counts(lines, words, chars, length, name); total_lines += lines; total_words += words; total_chars += chars; @@ -104,28 +109,30 @@ static void wc_file(FILE *file, const char *name) fflush(stdout); } -int wc_main(int argc, char **argv) { +int wc_main(int argc, char **argv) +{ FILE *file; + total_lines = total_words = total_chars = max_length = 0; print_lines = print_words = print_chars = print_length = 0; while (--argc && **(++argv) == '-') { while (*++(*argv)) switch (**argv) { - case 'c': - print_chars = 1; - break; - case 'l': - print_lines = 1; - break; - case 'L': - print_length = 1; - break; - case 'w': - print_words = 1; - break; - default: - usage (wc_usage); + case 'c': + print_chars = 1; + break; + case 'l': + print_lines = 1; + break; + case 'L': + print_length = 1; + break; + case 'w': + print_words = 1; + break; + default: + usage(wc_usage); } } @@ -135,16 +142,14 @@ int wc_main(int argc, char **argv) { if (argc == 0) { wc_file(stdin, ""); exit(TRUE); - } - else if (argc == 1) { + } else if (argc == 1) { file = fopen(*argv, "r"); if (file == NULL) { perror(*argv); exit(FALSE); } wc_file(file, *argv); - } - else { + } else { while (argc-- > 0 && *argv != '\0' && strlen(*argv)) { file = fopen(*argv, "r"); if (file == NULL) { @@ -154,8 +159,8 @@ int wc_main(int argc, char **argv) { wc_file(file, *argv); argv++; } - print_counts (total_lines, total_words, total_chars, - max_length, "total"); + print_counts(total_lines, total_words, total_chars, + max_length, "total"); } exit(TRUE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini whoami implementation for busybox * @@ -24,21 +25,25 @@ #include <pwd.h> static const char whoami_usage[] = "whoami\n\n" -"Print the user name associated with the current effective user id.\n" -"Same as id -un.\n"; + "Print the user name associated with the current effective user id.\n" -extern int whoami_main(int argc, char **argv) { + "Same as id -un.\n"; + +extern int whoami_main(int argc, char **argv) +{ struct passwd *pw; uid_t uid; - if (argc > 1) usage (whoami_usage); + if (argc > 1) + usage(whoami_usage); - uid = geteuid (); - pw = getpwuid (uid); + uid = geteuid(); + pw = getpwuid(uid); if (pw) { - puts (pw->pw_name); - exit (TRUE); - } - fprintf (stderr, "%s: cannot find username for UID %u\n", argv[0], (unsigned) uid); - exit (FALSE); + puts(pw->pw_name); + exit(TRUE); + } + fprintf(stderr, "%s: cannot find username for UID %u\n", argv[0], + (unsigned) uid); + exit(FALSE); } @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini yes implementation for busybox * @@ -22,19 +23,22 @@ #include "internal.h" #include <stdio.h> -extern int yes_main(int argc, char **argv) { +extern int yes_main(int argc, char **argv) +{ int i; + if (argc == 1) while (1) - if (puts ("y") == EOF) { - perror ("yes"); + if (puts("y") == EOF) { + perror("yes"); exit(FALSE); } while (1) for (i = 1; i < argc; i++) - if (fputs (argv[i], stdout) == EOF || putchar (i == argc - 1 ? '\n' : ' ') == EOF) { - perror ("yes"); + if (fputs(argv[i], stdout) == EOF + || putchar(i == argc - 1 ? '\n' : ' ') == EOF) { + perror("yes"); exit(FALSE); } exit(TRUE); |