From 64d2f73f72a44d5cc536043a2a9270edc5de82da Mon Sep 17 00:00:00 2001 From: Apple Date: Tue, 8 Jan 2008 23:33:35 +0000 Subject: [PATCH] file_cmds-188.tar.gz --- Makefile | 71 +++-------- Makefile.postamble | 1 - Makefile.preamble | 1 - PB.project | 51 -------- PROJECT | 10 -- chflags/Makefile | 60 ++-------- chflags/Makefile.postamble | 1 - chflags/Makefile.preamble | 1 - chflags/PB.project | 25 ---- chmod/Makefile | 61 ++-------- chmod/Makefile.postamble | 1 - chmod/Makefile.preamble | 1 - chmod/PB.project | 25 ---- chown/Makefile | 65 +++------- chown/Makefile.postamble | 4 - chown/Makefile.preamble | 1 - chown/PB.project | 26 ---- cksum/Makefile | 68 +++-------- cksum/Makefile.postamble | 5 - cksum/Makefile.preamble | 1 - cksum/PB.project | 26 ---- compress/Makefile | 62 +++------- compress/Makefile.postamble | 5 - compress/Makefile.preamble | 1 - compress/PB.project | 32 ----- compress/doc/NOTES | 142 ++++++++++++++++++++++ compress/doc/README | 284 ++++++++++++++++++++++++++++++++++++++++++++ compress/doc/revision.log | 124 +++++++++++++++++++ compress/zcat.sh | 38 ++++++ cp/Makefile | 64 ++-------- cp/Makefile.postamble | 1 - cp/Makefile.preamble | 1 - cp/PB.project | 27 ----- cp/cp.c | 2 +- cp/utils.c | 16 ++- csh/strpct.c | 99 +++++++++++++++ dd/Makefile | 61 ++-------- dd/Makefile.postamble | 1 - dd/Makefile.preamble | 1 - dd/PB.project | 26 ---- df/Makefile | 64 +++------- df/Makefile.postamble | 2 - df/Makefile.preamble | 3 - df/PB.project | 25 ---- df/df.1 | 2 +- df/df.c | 2 +- du/Makefile | 60 ++-------- du/Makefile.postamble | 1 - du/Makefile.preamble | 1 - du/PB.project | 25 ---- du/du.1 | 4 +- du/du.c | 8 +- install/Makefile | 62 ++-------- install/Makefile.postamble | 1 - install/Makefile.preamble | 1 - install/PB.project | 26 ---- install/xinstall.c | 2 +- ipcrm/Makefile | 60 ++-------- ipcrm/Makefile.postamble | 1 - ipcrm/Makefile.preamble | 1 - ipcrm/PB.project | 25 ---- ipcs/Makefile | 62 +++------- ipcs/Makefile.postamble | 4 - ipcs/Makefile.preamble | 1 - ipcs/PB.project | 25 ---- ln/Makefile | 67 +++-------- ln/Makefile.postamble | 7 -- ln/Makefile.preamble | 1 - ln/PB.project | 25 ---- ls/Makefile | 68 +++-------- ls/Makefile.postamble | 1 - ls/Makefile.preamble | 1 - ls/PB.project | 26 ---- mkdir/Makefile | 59 ++------- mkdir/Makefile.postamble | 1 - mkdir/Makefile.preamble | 1 - mkdir/PB.project | 25 ---- mkfifo/Makefile | 59 ++------- mkfifo/Makefile.postamble | 1 - mkfifo/Makefile.preamble | 1 - mkfifo/PB.project | 25 ---- mknod/Makefile | 59 ++------- mknod/Makefile.postamble | 1 - mknod/Makefile.preamble | 1 - mknod/PB.project | 25 ---- mtree/Makefile | 68 +++-------- mtree/Makefile.postamble | 1 - mtree/Makefile.preamble | 5 - mtree/PB.project | 26 ---- mtree/test/test00.sh | 67 +++++++++++ mtree/test/test01.sh | 40 +++++++ mtree/test/test02.sh | 36 ++++++ mtree/test/test03.sh | 60 ++++++++++ mtree/test/test04.sh | 51 ++++++++ mv/Makefile | 62 ++-------- mv/Makefile.postamble | 1 - mv/Makefile.preamble | 1 - mv/PB.project | 26 ---- pathchk/Makefile | 59 ++------- pathchk/Makefile.postamble | 1 - pathchk/Makefile.preamble | 1 - pathchk/PB.project | 25 ---- pax/Makefile | 69 +++-------- pax/Makefile.postamble | 4 - pax/Makefile.preamble | 1 - pax/PB.project | 54 --------- pax/file_subs.c | 4 +- pax/pax_format.h | 153 ++++++++++++++++++++++++ rm/Makefile | 65 +++------- rm/Makefile.postamble | 6 - rm/Makefile.preamble | 1 - rm/PB.project | 25 ---- rmdir/Makefile | 59 ++------- rmdir/Makefile.postamble | 1 - rmdir/Makefile.preamble | 1 - rmdir/PB.project | 25 ---- rmt/Makefile | 59 ++------- rmt/Makefile.postamble | 1 - rmt/Makefile.preamble | 1 - rmt/PB.project | 25 ---- shar/Makefile | 58 ++------- shar/Makefile.postamble | 1 - shar/Makefile.preamble | 3 - shar/PB.project | 25 ---- stat/Makefile | 67 +++-------- stat/Makefile.postamble | 6 - stat/Makefile.preamble | 1 - stat/PB.project | 25 ---- touch/Makefile | 59 ++------- touch/Makefile.postamble | 1 - touch/Makefile.preamble | 1 - touch/PB.project | 25 ---- 132 files changed, 1493 insertions(+), 2277 deletions(-) rewrite Makefile (97%) delete mode 100644 Makefile.postamble delete mode 100644 Makefile.preamble delete mode 100644 PB.project delete mode 100644 PROJECT rewrite chflags/Makefile (97%) delete mode 100644 chflags/Makefile.postamble delete mode 100644 chflags/Makefile.preamble delete mode 100644 chflags/PB.project rewrite chmod/Makefile (97%) delete mode 100644 chmod/Makefile.postamble delete mode 100644 chmod/Makefile.preamble delete mode 100644 chmod/PB.project rewrite chown/Makefile (98%) delete mode 100644 chown/Makefile.postamble delete mode 100644 chown/Makefile.preamble delete mode 100644 chown/PB.project rewrite cksum/Makefile (94%) delete mode 100644 cksum/Makefile.postamble delete mode 100644 cksum/Makefile.preamble delete mode 100644 cksum/PB.project rewrite compress/Makefile (97%) delete mode 100644 compress/Makefile.postamble delete mode 100644 compress/Makefile.preamble delete mode 100644 compress/PB.project create mode 100644 compress/doc/NOTES create mode 100644 compress/doc/README create mode 100644 compress/doc/revision.log create mode 100644 compress/zcat.sh rewrite cp/Makefile (97%) delete mode 100644 cp/Makefile.postamble delete mode 100644 cp/Makefile.preamble delete mode 100644 cp/PB.project create mode 100644 csh/strpct.c rewrite dd/Makefile (94%) delete mode 100644 dd/Makefile.postamble delete mode 100644 dd/Makefile.preamble delete mode 100644 dd/PB.project rewrite df/Makefile (97%) delete mode 100644 df/Makefile.postamble delete mode 100644 df/Makefile.preamble delete mode 100644 df/PB.project rewrite du/Makefile (98%) delete mode 100644 du/Makefile.postamble delete mode 100644 du/Makefile.preamble delete mode 100644 du/PB.project rewrite install/Makefile (97%) delete mode 100644 install/Makefile.postamble delete mode 100644 install/Makefile.preamble delete mode 100644 install/PB.project rewrite ipcrm/Makefile (98%) delete mode 100644 ipcrm/Makefile.postamble delete mode 100644 ipcrm/Makefile.preamble delete mode 100644 ipcrm/PB.project rewrite ipcs/Makefile (98%) delete mode 100644 ipcs/Makefile.postamble delete mode 100644 ipcs/Makefile.preamble delete mode 100644 ipcs/PB.project rewrite ln/Makefile (98%) delete mode 100644 ln/Makefile.postamble delete mode 100644 ln/Makefile.preamble delete mode 100644 ln/PB.project rewrite ls/Makefile (95%) delete mode 100644 ls/Makefile.postamble delete mode 100644 ls/Makefile.preamble delete mode 100644 ls/PB.project rewrite mkdir/Makefile (98%) delete mode 100644 mkdir/Makefile.postamble delete mode 100644 mkdir/Makefile.preamble delete mode 100644 mkdir/PB.project rewrite mkfifo/Makefile (98%) delete mode 100644 mkfifo/Makefile.postamble delete mode 100644 mkfifo/Makefile.preamble delete mode 100644 mkfifo/PB.project rewrite mknod/Makefile (98%) delete mode 100644 mknod/Makefile.postamble delete mode 100644 mknod/Makefile.preamble delete mode 100644 mknod/PB.project rewrite mtree/Makefile (94%) delete mode 100644 mtree/Makefile.postamble delete mode 100644 mtree/Makefile.preamble delete mode 100644 mtree/PB.project create mode 100644 mtree/test/test00.sh create mode 100644 mtree/test/test01.sh create mode 100644 mtree/test/test02.sh create mode 100644 mtree/test/test03.sh create mode 100644 mtree/test/test04.sh rewrite mv/Makefile (98%) delete mode 100644 mv/Makefile.postamble delete mode 100644 mv/Makefile.preamble delete mode 100644 mv/PB.project rewrite pathchk/Makefile (97%) delete mode 100644 pathchk/Makefile.postamble delete mode 100644 pathchk/Makefile.preamble delete mode 100644 pathchk/PB.project rewrite pax/Makefile (85%) delete mode 100644 pax/Makefile.postamble delete mode 100644 pax/Makefile.preamble delete mode 100644 pax/PB.project create mode 100644 pax/pax_format.h rewrite rm/Makefile (98%) delete mode 100644 rm/Makefile.postamble delete mode 100644 rm/Makefile.preamble delete mode 100644 rm/PB.project rewrite rmdir/Makefile (98%) delete mode 100644 rmdir/Makefile.postamble delete mode 100644 rmdir/Makefile.preamble delete mode 100644 rmdir/PB.project rewrite rmt/Makefile (98%) delete mode 100644 rmt/Makefile.postamble delete mode 100644 rmt/Makefile.preamble delete mode 100644 rmt/PB.project rewrite shar/Makefile (99%) delete mode 100644 shar/Makefile.postamble delete mode 100644 shar/Makefile.preamble delete mode 100644 shar/PB.project rewrite stat/Makefile (98%) delete mode 100644 stat/Makefile.postamble delete mode 100644 stat/Makefile.preamble delete mode 100644 stat/PB.project rewrite touch/Makefile (98%) delete mode 100644 touch/Makefile.postamble delete mode 100644 touch/Makefile.preamble delete mode 100644 touch/PB.project diff --git a/Makefile b/Makefile dissimilarity index 97% index 4b7ee0b..f240add 100644 --- a/Makefile +++ b/Makefile @@ -1,56 +1,15 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = file_cmds - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Aggregate -ifneq ($(shell tconf --test TARGET_OS_EMBEDDED),YES) -#libcrypto missing -MTREE=mtree -endif - -TOOLS = chflags chmod chown cksum compress cp dd df du install ipcrm ipcs ln ls\ - mkdir mkfifo mknod $(MTREE) mv pathchk pax rm rmdir rmt shar stat\ - touch - -OTHERSRCS = PROJECT Makefile.preamble Makefile Makefile.postamble - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = aggregate.make -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - -OTHER_LDFLAGS += -dead_strip -NEXTSTEP_PB_CFLAGS = -mdynamic-no-pic -no-cpp-precomp -I "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" -include TargetConditionals.h -ifneq ($(SDKROOT),) -OTHER_CFLAGS += -isysroot "$(SDKROOT)" -OTHER_LDFLAGS += -Wl,-syslibroot,"$(SDKROOT)" -endif - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = file_cmds + +Embedded = $(shell tconf --test TARGET_OS_EMBEDDED) + +SubProjects = chflags chmod chown cksum compress cp dd df du install \ + ipcrm ipcs ln ls\ + mkdir mkfifo mknod mv pathchk pax rm rmdir rmt shar stat\ + touch + +ifeq ($(Embedded),NO) +#libcrypto missing +SubProjects += mtree +endif + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/Makefile.postamble b/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/Makefile.preamble b/Makefile.preamble deleted file mode 100644 index 8f8a3bd..0000000 --- a/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(MAKEFILEPATH)/CoreOS/ProjectBuilder/Makefile.Preamble.Common diff --git a/PB.project b/PB.project deleted file mode 100644 index 5ab9509..0000000 --- a/PB.project +++ /dev/null @@ -1,51 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - OTHER_SOURCES = (PROJECT, Makefile.preamble, Makefile, Makefile.postamble); - SUBPROJECTS = ( - chflags, - chmod, - chown, - compress, - cp, - dd, - df, - du, - install, - ipcrm, - ipcs, - ln, - ls, - mkdir, - mkfifo, - mknod, - mtree, - mv, - pax, - rm, - rmdir, - rmt, - shar, - tcopy, - touch - ); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_COMPILEROPTIONS = "-Wall -Werror"; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = file_cmds; - PROJECTTYPE = Aggregate; - PROJECTVERSION = 2.8; - TARGETS = (); - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/PROJECT b/PROJECT deleted file mode 100644 index 6c7fd2c..0000000 --- a/PROJECT +++ /dev/null @@ -1,10 +0,0 @@ -Project : file_cmds -Description : File Commands -Distribution : NetBSD Tue Oct 6 14:50:43 PDT 1998 -Source : NetBSD Foundation, Inc. -Location : cvs.netbsd.org:/cvsroot -Owner : wsanchez -Releases : Titan -Dependancies : - -Some file commands in NetBSD implement the -h flag and can otherwise charge permissions on symlinks. But this requires lchmod(2) from NetBSD and we don't currently have that, so it is disabled with -D__APPLE__. diff --git a/chflags/Makefile b/chflags/Makefile dissimilarity index 97% index aeeabe4..46cdbe1 100644 --- a/chflags/Makefile +++ b/chflags/Makefile @@ -1,49 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = chflags - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = chflags.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble chflags.1 - -OTHER_CFLAGS = -D__FBSDID=__RCSID - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = chflags +Install_Dir = /usr/bin + +CFILES = chflags.c +MANPAGES = chflags.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/chflags/Makefile.postamble b/chflags/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/chflags/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/chflags/Makefile.preamble b/chflags/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/chflags/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/chflags/PB.project b/chflags/PB.project deleted file mode 100644 index bf7e967..0000000 --- a/chflags/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (chflags.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, chflags.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = chflags; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/chmod/Makefile b/chmod/Makefile dissimilarity index 97% index e46896c..49f5bbc 100644 --- a/chmod/Makefile +++ b/chmod/Makefile @@ -1,50 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = chmod - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -HFILES = chmod_acl.h - -CFILES = chmod.c chmod_acl.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble chmod.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = chmod +Install_Dir = /bin + +CFILES = chmod.c chmod_acl.c +MANPAGES = chmod.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/chmod/Makefile.postamble b/chmod/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/chmod/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/chmod/Makefile.preamble b/chmod/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/chmod/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/chmod/PB.project b/chmod/PB.project deleted file mode 100644 index 644371e..0000000 --- a/chmod/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (chmod.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, chmod.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = chmod; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/chown/Makefile b/chown/Makefile dissimilarity index 98% index eb0029c..9d811a0 100644 --- a/chown/Makefile +++ b/chown/Makefile @@ -1,50 +1,15 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = chown - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = chown.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble chgrp.1\ - chown.8 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/sbin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - -NEXTSTEP_PB_CFLAGS = -DSUPPORT_DOT - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = chown +Install_Dir = /usr/sbin + +CFILES = chown.c +MANPAGES = chgrp.1 chown.8 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + +after_install: + $(LN) -f $(DSTROOT)$(Install_Dir)/chown \ + $(DSTROOT)/usr/bin/chgrp diff --git a/chown/Makefile.postamble b/chown/Makefile.postamble deleted file mode 100644 index 4da9b62..0000000 --- a/chown/Makefile.postamble +++ /dev/null @@ -1,4 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common - -after_install:: - $(LINKPRODUCT) $(DSTROOT)/usr/bin/chgrp diff --git a/chown/Makefile.preamble b/chown/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/chown/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/chown/PB.project b/chown/PB.project deleted file mode 100644 index d716382..0000000 --- a/chown/PB.project +++ /dev/null @@ -1,26 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (chown.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, chgrp.1, chown.8); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_COMPILEROPTIONS = "-DSUPPORT_DOT"; - NEXTSTEP_INSTALLDIR = /usr/sbin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = chown; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/cksum/Makefile b/cksum/Makefile dissimilarity index 94% index 24e3168..a43c0ec 100644 --- a/cksum/Makefile +++ b/cksum/Makefile @@ -1,51 +1,17 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = cksum - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -HFILES = extern.h - -CFILES = cksum.c crc.c print.c sum1.c sum2.c crc32.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble cksum.1 - -OTHER_CFLAGS=-D__FBSDID=__RCSID - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/doc_cmds/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(JDKBINDIR)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = cksum +Install_Dir = /usr/bin + +CFILES = cksum.c crc.c print.c sum1.c sum2.c crc32.c +MANPAGES = cksum.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + +after_install: + $(LN) -f $(DSTROOT)$(Install_Dir)/cksum \ + $(DSTROOT)$(Install_Dir)/sum + $(LN) -f $(DSTROOT)/usr/share/man/man1/cksum.1 \ + $(DSTROOT)/usr/share/man/man1/sum.1 diff --git a/cksum/Makefile.postamble b/cksum/Makefile.postamble deleted file mode 100644 index a0b1af9..0000000 --- a/cksum/Makefile.postamble +++ /dev/null @@ -1,5 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common - -after_install:: - $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/sum - $(LN) -f $(DSTROOT)/usr/share/man/man1/cksum.1 $(DSTROOT)/usr/share/man/man1/sum.1 diff --git a/cksum/Makefile.preamble b/cksum/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/cksum/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/cksum/PB.project b/cksum/PB.project deleted file mode 100644 index 63b0f64..0000000 --- a/cksum/PB.project +++ /dev/null @@ -1,26 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - H_FILES = (extern.h); - OTHER_LINKED = (cksum.c, crc.c, print.c, sum1.c, sum2.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, cksum.1, sum.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = /tmp/doc_cmds/Build; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(JDKBINDIR)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = cksum; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/compress/Makefile b/compress/Makefile dissimilarity index 97% index f312cf5..11660d0 100644 --- a/compress/Makefile +++ b/compress/Makefile @@ -1,47 +1,15 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = compress - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = compress.c zopen.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble compress.1\ - zopen.3 uncompress.1 zopen.h - -NEXTSTEP_PB_CFLAGS += -D__FBSDID=__RCSID - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/file_cmds/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = compress +Install_Dir = /usr/bin + +CFILES = compress.c zopen.c +MANPAGES = compress.1 uncompress.1 zopen.3 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + +after_install: + $(LN) -f $(DSTROOT)$(Install_Dir)/compress \ + $(DSTROOT)$(Install_Dir)/uncompress diff --git a/compress/Makefile.postamble b/compress/Makefile.postamble deleted file mode 100644 index cb8937b..0000000 --- a/compress/Makefile.postamble +++ /dev/null @@ -1,5 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common - -after_install:: - $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/uncompress -# $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/zcat diff --git a/compress/Makefile.preamble b/compress/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/compress/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/compress/PB.project b/compress/PB.project deleted file mode 100644 index d9c8269..0000000 --- a/compress/PB.project +++ /dev/null @@ -1,32 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (compress.c, zopen.c); - OTHER_SOURCES = ( - Makefile, - Makefile.preamble, - Makefile.postamble, - compress.1, - zopen.3, - uncompress.1 - ); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = compress; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/compress/doc/NOTES b/compress/doc/NOTES new file mode 100644 index 0000000..aec6b75 --- /dev/null +++ b/compress/doc/NOTES @@ -0,0 +1,142 @@ + + $FreeBSD: src/usr.bin/compress/doc/NOTES,v 1.2 2002/10/16 12:42:15 charnier Exp $ + +From: James A. Woods + +>From vn Fri Dec 2 18:05:27 1988 +Subject: Re: Looking for C source for RSA +Newsgroups: sci.crypt + +# Illegitimi noncarborundum + +Patents are a tar pit. + +A good case can be made that most are just a license to sue, and nothing +is illegal until a patent is upheld in court. + +For example, if you receive netnews by means other than 'nntp', +these very words are being modulated by 'compress', +a variation on the patented Lempel-Ziv-Welch algorithm. + +Original Ziv-Lempel is patent number 4,464,650, and the more powerful +LZW method is #4,558,302. Yet despite any similarities between 'compress' +and LZW (the public-domain 'compress' code was designed and given to the +world before the ink on the Welch patent was dry), no attorneys from Sperry +(the assignee) have asked you to unplug your Usenet connection. + +Why? I can't speak for them, but it is possible the claims are too broad, +or, just as bad, not broad enough. ('compress' does things not mentioned +in the Welch patent.) Maybe they realize that they can commercialize +LZW better by selling hardware implementations rather than by licensing +software. Again, the LZW software delineated in the patent is *not* +the same as that of 'compress'. + +At any rate, court-tested software patents are a different animal; +corporate patents in a portfolio are usually traded like baseball cards +to shut out small fry rather than actually be defended before +non-technical juries. Perhaps RSA will undergo this test successfully, +although the grant to "exclude others from making, using, or selling" +the invention would then only apply to the U.S. (witness the +Genentech patent of the TPA molecule in the U.S. but struck down +in Great Britain as too broad.) + +The concept is still exotic for those who learned in school the rule of thumb +that one may patent "apparatus" but not an "idea". +Apparently this all changed in Diamond v. Diehr (1981) when the U. S. Supreme +Court reversed itself. + +Scholars should consult the excellent article in the Washington and Lee +Law Review (fall 1984, vol. 41, no. 4) by Anthony and Colwell for a +comprehensive survey of an area which will remain murky for some time. + +Until the dust clears, how you approach ideas which are patented depends +on how paranoid you are of a legal onslaught. Arbitrary? Yes. But +the patent bar the the CCPA (Court of Customs and Patent Appeals) +thanks you for any uncertainty as they, at least, stand to gain +from any trouble. + +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +From: James A. Woods +Subject: Re: Looking for C source for RSA (actually 'compress' patents) + + In article <2042@eos.UUCP> you write: + >The concept is still exotic for those who learned in school the rule of thumb + >that one may patent "apparatus" but not an "idea". + +A rule of thumb that has never been completely valid, as any chemical +engineer can tell you. (Chemical processes were among the earliest patents, +as I recall.) + + ah yes -- i date myself when relaying out-of-date advice from elderly + attorneys who don't even specialize in patents. one other interesting + class of patents include the output of optical lens design programs, + which yield formulae which can then fairly directly can be molded + into glass. although there are restrictions on patenting equations, + the "embedded systems" seem to fly past the legal gauntlets. + + anyway, I'm still learning about intellectual property law after + several conversations from a Unisys (nee sperry) lawyer re 'compress'. + + it's more complicated than this, but they're letting (oral + communication only) software versions of 'compress' slide + as far as licensing fees go. this includes 'arc', 'stuffit', + and other commercial wrappers for 'compress'. yet they are + signing up licensees for hardware chips. Hewlett-Packard + supposedly has an active vlsi project, and Unisys has + board-level LZW-based tape controllers. (to build LZW into + a disk controller would be strange, as you'd have to build + in a filesystem too!) + + it's byzantine + that Unisys is in a tiff with HP regarding the patents, + after discovering some sort of "compress" button on some + HP terminal product. why? well, professor Abraham Lempel jumped + from being department chairman of computer science at technion in + Israel to sperry (where he got the first patent), but then to work + at Hewlett-Packard on sabbatical. the second Welch patent + is only weakly derivative of the first, so they want chip + licenses and HP relented. however, everyone agrees something + like the current Unix implementation is the way to go with + software, so HP (and UCB) long ago asked spencer Thomas and i to sign + off on copyright permission (although they didn't need to, it being pd). + Lempel, HP, and Unisys grumbles they can't make money off the + software since a good free implementation (not the best -- + i have more ideas!) escaped via Usenet. (Lempel's own pascal + code was apparently horribly slow.) + i don't follow the IBM 'arc' legal bickering; my impression + is that the pc folks are making money off the archiver/wrapper + look/feel of the thing [if ms-dos can be said to have a look and feel]. + + now where is telebit with the compress firmware? in a limbo + netherworld, probably, with sperry still welcoming outfits + to sign patent licenses, a common tactic to bring other small fry + into the fold. the guy who crammed 12-bit compress into the modem + there left. also what is transpiring with 'compress' and sys 5 rel 4? + beats me, but if sperry got a hold of them on these issues, + at&t would likely re-implement another algorithm if they + thought 'compress' infringes. needful to say, i don't think + it does after the above mentioned legal conversation. + my own beliefs on whether algorithms should be patentable at all + change with the weather. if the courts finally nail down + patent protection for algorithms, academic publication in + textbooks will be somewhat at odds with the engineering world, + where the textbook codes will simply be a big tease to get + money into the patent holder coffers... + + oh, if you implement LZW from the patent, you won't get + good rates because it doesn't mention adaptive table reset, + lack thereof being *the* serious deficiency of Thomas' first version. + + now i know that patent law generally protects against independent + re-invention (like the 'xor' hash function pleasantly mentioned + in the patent [but not the paper]). + but the upshot is that if anyone ever wanted to sue us, + we're partially covered with + independently-developed twists, plus the fact that some of us work + in a bureaucratic morass (as contractor to a public agency in my case). + + quite a mess, huh? I've wanted to tell someone this stuff + for a long time, for posterity if nothing else. + +james + diff --git a/compress/doc/README b/compress/doc/README new file mode 100644 index 0000000..0828cdf --- /dev/null +++ b/compress/doc/README @@ -0,0 +1,284 @@ + + @(#)README 8.1 (Berkeley) 6/9/93 + $FreeBSD: src/usr.bin/compress/doc/README,v 1.3 2002/12/30 21:18:11 schweikh Exp $ + +Compress version 4.0 improvements over 3.0: + o compress() speedup (10-50%) by changing division hash to xor + o decompress() speedup (5-10%) + o Memory requirements reduced (3-30%) + o Stack requirements reduced to less than 4kb + o Removed 'Big+Fast' compress code (FBITS) because of compress speedup + o Portability mods for Z8000 and PC/XT (but not zeus 3.2) + o Default to 'quiet' mode + o Unification of 'force' flags + o Manual page overhaul + o Portability enhancement for M_XENIX + o Removed text on #else and #endif + o Added "-V" switch to print version and options + o Added #defines for SIGNED_COMPARE_SLOW + o Added Makefile and "usermem" program + o Removed all floating point computations + o New programs: [deleted] + +The "usermem" script attempts to determine the maximum process size. Some +editing of the script may be necessary (see the comments). [It should work +fine on 4.3 BSD.] If you can't get it to work at all, just create file +"USERMEM" containing the maximum process size in decimal. + +The following preprocessor symbols control the compilation of "compress.c": + + o USERMEM Maximum process memory on the system + o SACREDMEM Amount to reserve for other processes + o SIGNED_COMPARE_SLOW Unsigned compare instructions are faster + o NO_UCHAR Don't use "unsigned char" types + o BITS Overrules default set by USERMEM-SACREDMEM + o vax Generate inline assembler + o interdata Defines SIGNED_COMPARE_SLOW + o M_XENIX Makes arrays < 65536 bytes each + o pdp11 BITS=12, NO_UCHAR + o z8000 BITS=12 + o pcxt BITS=12 + o BSD4_2 Allow long filenames ( > 14 characters) & + Call setlinebuf(stderr) + +The difference "usermem-sacredmem" determines the maximum BITS that can be +specified with the "-b" flag. + +memory: at least BITS +------ -- ----- ---- + 433,484 16 + 229,600 15 + 127,536 14 + 73,464 13 + 0 12 + +The default is BITS=16. + +The maximum bits can be overruled by specifying "-DBITS=bits" at +compilation time. + +WARNING: files compressed on a large machine with more bits than allowed by +a version of compress on a smaller machine cannot be decompressed! Use the +"-b12" flag to generate a file on a large machine that can be uncompressed +on a 16-bit machine. + +The output of compress 4.0 is fully compatible with that of compress 3.0. +In other words, the output of compress 4.0 may be fed into uncompress 3.0 or +the output of compress 3.0 may be fed into uncompress 4.0. + +The output of compress 4.0 not compatible with that of +compress 2.0. However, compress 4.0 still accepts the output of +compress 2.0. To generate output that is compatible with compress +2.0, use the undocumented "-C" flag. + + -from mod.sources, submitted by vax135!petsd!joe (Joe Orost), 8/1/85 +-------------------------------- + +Enclosed is compress version 3.0 with the following changes: + +1. "Block" compression is performed. After the BITS run out, the + compression ratio is checked every so often. If it is decreasing, + the table is cleared and a new set of substrings are generated. + + This makes the output of compress 3.0 not compatible with that of + compress 2.0. However, compress 3.0 still accepts the output of + compress 2.0. To generate output that is compatible with compress + 2.0, use the undocumented "-C" flag. + +2. A quiet "-q" flag has been added for use by the news system. + +3. The character chaining has been deleted and the program now uses + hashing. This improves the speed of the program, especially + during decompression. Other speed improvements have been made, + such as using putc() instead of fwrite(). + +4. A large table is used on large machines when a relatively small + number of bits is specified. This saves much time when compressing + for a 16-bit machine on a 32-bit virtual machine. Note that the + speed improvement only occurs when the input file is > 30000 + characters, and the -b BITS is less than or equal to the cutoff + described below. + +Most of these changes were made by James A. Woods (ames!jaw). Thank you +James! + +To compile compress: + + cc -O -DUSERMEM=usermem -o compress compress.c + +Where "usermem" is the amount of physical user memory available (in bytes). +If any physical memory is to be reserved for other processes, put in +"-DSACREDMEM sacredmem", where "sacredmem" is the amount to be reserved. + +The difference "usermem-sacredmem" determines the maximum BITS that can be +specified, and the cutoff bits where the large+fast table is used. + +memory: at least BITS cutoff +------ -- ----- ---- ------ + 4,718,592 16 13 + 2,621,440 16 12 + 1,572,864 16 11 + 1,048,576 16 10 + 631,808 16 -- + 329,728 15 -- + 178,176 14 -- + 99,328 13 -- + 0 12 -- + +The default memory size is 750,000 which gives a maximum BITS=16 and no +large+fast table. + +The maximum bits can be overruled by specifying "-DBITS=bits" at +compilation time. + +If your machine doesn't support unsigned characters, define "NO_UCHAR" +when compiling. + +If your machine has "int" as 16-bits, define "SHORT_INT" when compiling. + +After compilation, move "compress" to a standard executable location, such +as /usr/local. Then: + cd /usr/local + ln compress uncompress + ln compress zcat + +On machines that have a fixed stack size (such as Perkin-Elmer), set the +stack to at least 12kb. ("setstack compress 12" on Perkin-Elmer). + +Next, install the manual (compress.l). + cp compress.l /usr/man/manl + cd /usr/man/manl + ln compress.l uncompress.l + ln compress.l zcat.l + + - or - + + cp compress.l /usr/man/man1/compress.1 + cd /usr/man/man1 + ln compress.1 uncompress.1 + ln compress.1 zcat.1 + + regards, + petsd!joe + +Here is a note from the net: + +>From hplabs!pesnta!amd!turtlevax!ken Sat Jan 5 03:35:20 1985 +Path: ames!hplabs!pesnta!amd!turtlevax!ken +From: ken@turtlevax.UUCP (Ken Turkowski) +Newsgroups: net.sources +Subject: Re: Compress release 3.0 : sample Makefile +Organization: CADLINC, Inc. @ Menlo Park, CA + +In the compress 3.0 source recently posted to mod.sources, there is a +#define variable which can be set for optimum performance on a machine +with a large amount of memory. A program (usermem) to calculate the +usable amount of physical user memory is enclosed, as well as a sample +4.2BSD Vax Makefile for compress. + +Here is the README file from the previous version of compress (2.0): + +>Enclosed is compress.c version 2.0 with the following bugs fixed: +> +>1. The packed files produced by compress are different on different +> machines and dependent on the vax sysgen option. +> The bug was in the different byte/bit ordering on the +> various machines. This has been fixed. +> +> This version is NOT compatible with the original vax posting +> unless the '-DCOMPATIBLE' option is specified to the C +> compiler. The original posting has a bug which I fixed, +> causing incompatible files. I recommend you NOT to use this +> option unless you already have a lot of packed files from +> the original posting by Thomas. +>2. The exit status is not well defined (on some machines) causing the +> scripts to fail. +> The exit status is now 0,1 or 2 and is documented in +> compress.l. +>3. The function getopt() is not available in all C libraries. +> The function getopt() is no longer referenced by the +> program. +>4. Error status is not being checked on the fwrite() and fflush() calls. +> Fixed. +> +>The following enhancements have been made: +> +>1. Added facilities of "compact" into the compress program. "Pack", +> "Unpack", and "Pcat" are no longer required (no longer supplied). +>2. Installed work around for C compiler bug with "-O". +>3. Added a magic number header (\037\235). Put the bits specified +> in the file. +>4. Added "-f" flag to force overwrite of output file. +>5. Added "-c" flag and "zcat" program. 'ln compress zcat' after you +> compile. +>6. The 'uncompress' script has been deleted; simply +> 'ln compress uncompress' after you compile and it will work. +>7. Removed extra bit masking for machines that support unsigned +> characters. If your machine doesn't support unsigned characters, +> define "NO_UCHAR" when compiling. +> +>Compile "compress.c" with "-O -o compress" flags. Move "compress" to a +>standard executable location, such as /usr/local. Then: +> cd /usr/local +> ln compress uncompress +> ln compress zcat +> +>On machines that have a fixed stack size (such as Perkin-Elmer), set the +>stack to at least 12kb. ("setstack compress 12" on Perkin-Elmer). +> +>Next, install the manual (compress.l). +> cp compress.l /usr/man/manl - or - +> cp compress.l /usr/man/man1/compress.1 +> +>Here is the README that I sent with my first posting: +> +>>Enclosed is a modified version of compress.c, along with scripts to make it +>>run identically to pack(1), unpack(1), and pcat(1). Here is what I +>>(petsd!joe) and a colleague (petsd!peora!srd) did: +>> +>>1. Removed VAX dependencies. +>>2. Changed the struct to separate arrays; saves mucho memory. +>>3. Did comparisons in unsigned, where possible. (Faster on Perkin-Elmer.) +>>4. Sorted the character next chain and changed the search to stop +>>prematurely. This saves a lot on the execution time when compressing. +>> +>>This version is totally compatible with the original version. Even though +>>lint(1) -p has no complaints about compress.c, it won't run on a 16-bit +>>machine, due to the size of the arrays. +>> +>>Here is the README file from the original author: +>> +>>>Well, with all this discussion about file compression (for news batching +>>>in particular) going around, I decided to implement the text compression +>>>algorithm described in the June Computer magazine. The author claimed +>>>blinding speed and good compression ratios. It's certainly faster than +>>>compact (but, then, what wouldn't be), but it's also the same speed as +>>>pack, and gets better compression than both of them. On 350K bytes of +>>>Unix-wizards, compact took about 8 minutes of CPU, pack took about 80 +>>>seconds, and compress (herein) also took 80 seconds. But, compact and +>>>pack got about 30% compression, whereas compress got over 50%. So, I +>>>decided I had something, and that others might be interested, too. +>>> +>>>As is probably true of compact and pack (although I haven't checked), +>>>the byte order within a word is probably relevant here, but as long as +>>>you stay on a single machine type, you should be ok. (Can anybody +>>>elucidate on this?) There are a couple of asm's in the code (extv and +>>>insv instructions), so anyone porting it to another machine will have to +>>>deal with this anyway (and could probably make it compatible with Vax +>>>byte order at the same time). Anyway, I've linted the code (both with +>>>and without -p), so it should run elsewhere. Note the longs in the +>>>code, you can take these out if you reduce BITS to <= 15. +>>> +>>>Have fun, and as always, if you make good enhancements, or bug fixes, +>>>I'd like to see them. +>>> +>>>=Spencer (thomas@utah-20, {harpo,hplabs,arizona}!utah-cs!thomas) +>> +>> regards, +>> joe +>> +>>-- +>>Full-Name: Joseph M. Orost +>>UUCP: ..!{decvax,ucbvax,ihnp4}!vax135!petsd!joe +>>US Mail: MS 313; Perkin-Elmer; 106 Apple St; Tinton Falls, NJ 07724 +>>Phone: (201) 870-5844 diff --git a/compress/doc/revision.log b/compress/doc/revision.log new file mode 100644 index 0000000..fb23b08 --- /dev/null +++ b/compress/doc/revision.log @@ -0,0 +1,124 @@ +/* $FreeBSD: src/usr.bin/compress/doc/revision.log,v 1.4 2001/08/13 14:06:30 ru Exp $ */ + +/* + * $Header: /Users/Shared/file_cmds/file_cmds/compress/doc/revision.log,v 1.3 2005/04/12 23:51:24 nicolai Exp $ + * $Log: revision.log,v $ + * Revision 1.3 2005/04/12 23:51:24 nicolai + * merging Tiger back to head + * + * Revision 1.1.1.2 2004/07/21 04:59:15 llattanz + * Freshen source for standards conformance + * + * Revision 4.0 85/07/30 12:50:00 joe + * Removed ferror() calls in output routine on every output except first. + * Prepared for release to the world. + * + * Revision 3.6 85/07/04 01:22:21 joe + * Remove much wasted storage by overlaying hash table with the tables + * used by decompress: tab_suffix[1<putc] and + * added signal catcher [plus beef in writeerr()] to delete effluvia. + * + * Revision 2.0 84/08/28 22:00:00 petsd!joe + * Add check for foreground before prompting user. Insert maxbits into + * compressed file. Force file being uncompressed to end with ".Z". + * Added "-c" flag and "zcat". Prepared for release. + * + * Revision 1.10 84/08/24 18:28:00 turtlevax!ken + * Will only compress regular files (no directories), added a magic number + * header (plus an undocumented -n flag to handle old files without headers), + * added -f flag to force overwriting of possibly existing destination file, + * otherwise the user is prompted for a response. Will tack on a .Z to a + * filename if it doesn't have one when decompressing. Will only replace + * file if it was compressed. + * + * Revision 1.9 84/08/16 17:28:00 turtlevax!ken + * Removed scanargs(), getopt(), added .Z extension and unlimited number of + * filenames to compress. Flags may be clustered (-Ddvb12) or separated + * (-D -d -v -b 12), or combination thereof. Modes and other status is + * copied with copystat(). -O bug for 4.2 seems to have disappeared with + * 1.8. + * + * Revision 1.8 84/08/09 23:15:00 joe + * Made it compatible with vax version, installed jim's fixes/enhancements + * + * Revision 1.6 84/08/01 22:08:00 joe + * Sped up algorithm significantly by sorting the compress chain. + * + * Revision 1.5 84/07/13 13:11:00 srd + * Added C version of vax asm routines. Changed structure to arrays to + * save much memory. Do unsigned compares where possible (faster on + * Perkin-Elmer) + * + * Revision 1.4 84/07/05 03:11:11 thomas + * Clean up the code a little and lint it. (Lint complains about all + * the regs used in the asm, but I'm not going to "fix" this.) + * + * Revision 1.3 84/07/05 02:06:54 thomas + * Minor fixes. + * + * Revision 1.2 84/07/05 00:27:27 thomas + * Add variable bit length output. + * + */ + +static char rcs_ident[] = + "$Header: /Users/Shared/file_cmds/file_cmds/compress/doc/revision.log,v 1.3 2005/04/12 23:51:24 nicolai Exp $"; diff --git a/compress/zcat.sh b/compress/zcat.sh new file mode 100644 index 0000000..6799f46 --- /dev/null +++ b/compress/zcat.sh @@ -0,0 +1,38 @@ +#!/bin/sh - +# $NetBSD: zcat.sh,v 1.4 1995/03/26 19:54:37 glass Exp $ +# +# Copyright (c) 1992, 1993 +# The Regents of the University of California. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. All advertising materials mentioning features or use of this software +# must display the following acknowledgement: +# This product includes software developed by the University of +# California, Berkeley and its contributors. +# 4. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# @(#)zcat.sh 8.1 (Berkeley) 6/6/93 +# + +uncompress -c $* diff --git a/cp/Makefile b/cp/Makefile dissimilarity index 97% index aba3cc8..7ca7ec8 100644 --- a/cp/Makefile +++ b/cp/Makefile @@ -1,53 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = cp - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -HFILES = extern.h - -CFILES = cp.c utils.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble cp.1 - -OTHER_CFLAGS = -D__FBSDID=__RCSID - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - -NEXTSTEP_PB_CFLAGS = - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies - +Project = cp +Install_Dir = /bin + +CFILES = cp.c utils.c +MANPAGES = cp.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/cp/Makefile.postamble b/cp/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/cp/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/cp/Makefile.preamble b/cp/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/cp/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/cp/PB.project b/cp/PB.project deleted file mode 100644 index f0014c5..0000000 --- a/cp/PB.project +++ /dev/null @@ -1,27 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - H_FILES = (extern.h); - OTHER_LINKED = (cp.c, utils.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, cp.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_COMPILEROPTIONS = ""; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = cp; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/cp/cp.c b/cp/cp.c index f421cc9..c08ec23 100644 --- a/cp/cp.c +++ b/cp/cp.c @@ -290,7 +290,7 @@ copy(char *argv[], enum op type, int fts_options) mask = ~umask(0777); umask(~mask); - if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL) + if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL) err(1, "fts_open"); for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) { switch (curr->fts_info) { diff --git a/cp/utils.c b/cp/utils.c index 2235939..75d53d6 100644 --- a/cp/utils.c +++ b/cp/utils.c @@ -79,6 +79,8 @@ copy_file(const FTSENT *entp, int dne) #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED char *p; #endif + mode_t mode = 0; + struct stat to_stat; if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) { warn("%s", entp->fts_path); @@ -171,6 +173,16 @@ copy_file(const FTSENT *entp, int dne) } #endif /* __APPLE__ */ + if (fstat(to_fd, &to_stat) != -1) { + mode = to_stat.st_mode; + if ((mode & (S_IRWXG|S_IRWXO)) + && fchmod(to_fd, mode & ~(S_IRWXG|S_IRWXO))) { + warn("%s: fchmod failed", to.p_path); + mode = 0; + } + } else { + warn("%s", to.p_path); + } /* * Mmap and write if less than 8M (the limit is so we don't totally * trash memory on big files. This is really a minor hack, but it @@ -248,7 +260,9 @@ copy_file(const FTSENT *entp, int dne) * or its contents might be irreplaceable. It would only be safe * to remove it if we created it and its length is 0. */ - + if (mode != 0) + if (fchmod(to_fd, mode)) + warn("%s: fchmod failed", to.p_path); #ifdef __APPLE__ /* do these before setfile in case copyfile changes mtime */ if (!Xflag && S_ISREG(fs->st_mode)) { /* skip devices, etc */ diff --git a/csh/strpct.c b/csh/strpct.c new file mode 100644 index 0000000..ac3b32d --- /dev/null +++ b/csh/strpct.c @@ -0,0 +1,99 @@ +/* $NetBSD: strpct.c,v 1.2 1998/05/08 18:43:54 fair Exp $ */ + +/*- + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Erik E. Fair + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Calculate a percentage without resorting to floating point + * and return a pointer to a string + * + * "digits" is the number of digits past the decimal place you want + * (zero being the straight percentage with no decimals) + * + * Erik E. Fair , May 8, 1997 + */ + +#include +#include + +#include + +char * strpct __P((u_long, u_long, u_int)); + +char * +strpct(numerator, denominator, digits) + u_long numerator, denominator; + u_int digits; +{ + int i; + u_long result, factor; + static char percent[32]; + + /* I should check for digit overflow here, too XXX */ + factor = 100L; + for(i = 0; i < digits; i++) { + factor *= 10; + } + + /* watch out for overflow! */ + if (numerator < (ULONG_MAX / factor)) { + numerator *= factor; + } else { + /* toss some of the bits of lesser significance */ + denominator /= factor; + } + + if (denominator == 0L) + denominator = 1L; + + result = numerator / denominator; + + if (digits == 0) { + (void) snprintf(percent, sizeof(percent), "%lu%%", result); + } else { + char fmt[32]; + + /* indirection to produce the right output format */ + (void) snprintf(fmt, sizeof(fmt), "%%lu.%%0%ulu%%%%", digits); + + factor /= 100L; /* undo initialization */ + + (void) snprintf(percent, sizeof(percent), + fmt, result / factor, result % factor); + } + + return(percent); +} diff --git a/dd/Makefile b/dd/Makefile dissimilarity index 94% index 323723a..4b9c70f 100644 --- a/dd/Makefile +++ b/dd/Makefile @@ -1,50 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = dd - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -HFILES = dd.h extern.h - -CFILES = args.c conv.c conv_tab.c dd.c misc.c position.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble dd.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = dd +Install_Dir = /bin + +CFILES = args.c conv.c conv_tab.c dd.c misc.c position.c +MANPAGES = dd.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/dd/Makefile.postamble b/dd/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/dd/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/dd/Makefile.preamble b/dd/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/dd/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/dd/PB.project b/dd/PB.project deleted file mode 100644 index db89643..0000000 --- a/dd/PB.project +++ /dev/null @@ -1,26 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - H_FILES = (dd.h, extern.h); - OTHER_LINKED = (args.c, conv.c, conv_tab.c, dd.c, misc.c, position.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, dd.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = dd; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/df/Makefile b/df/Makefile dissimilarity index 97% index 36d8c06..67896b1 100644 --- a/df/Makefile +++ b/df/Makefile @@ -1,50 +1,14 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = df - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = df.c vfslist.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble df.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -lutil -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies - -ALL_CFLAGS += -I "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" -D_DARWIN_USE_64_BIT_INODE +Project = df +Install_Dir = /bin + +CFILES = df.c vfslist.c +MANPAGES = df.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID \ + "-I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" \ + -D_DARWIN_USE_64_BIT_INODE +Extra_LD_Flags = -dead_strip \ + -lutil + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/df/Makefile.postamble b/df/Makefile.postamble deleted file mode 100644 index a480e49..0000000 --- a/df/Makefile.postamble +++ /dev/null @@ -1,2 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common - diff --git a/df/Makefile.preamble b/df/Makefile.preamble deleted file mode 100644 index 6fcac4e..0000000 --- a/df/Makefile.preamble +++ /dev/null @@ -1,3 +0,0 @@ -vpath strpct.c ../csh - -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/df/PB.project b/df/PB.project deleted file mode 100644 index b036be4..0000000 --- a/df/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (df.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, df.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = df; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/df/df.1 b/df/df.1 index 7dd8624..9067fcb 100644 --- a/df/df.1 +++ b/df/df.1 @@ -42,7 +42,7 @@ .Nm df .Oo .Fl b | h | H | k | -.Fl m | P +.Fl m | g | P .Oc .Op Fl ailn .Op Fl t diff --git a/df/df.c b/df/df.c index 3438bca..e83cb39 100644 --- a/df/df.c +++ b/df/df.c @@ -562,7 +562,7 @@ usage(void) char *t_flag = COMPAT_MODE("bin/df", "unix2003") ? "[-t]" : "[-t type]"; (void)fprintf(stderr, - "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-T type] %s [filesystem ...]\n", t_flag); + "usage: df [-b | -H | -h | -k | -m | -g | -P] [-ailn] [-T type] %s [filesystem ...]\n", t_flag); exit(EX_USAGE); } diff --git a/du/Makefile b/du/Makefile dissimilarity index 98% index c6c7ead..637be1b 100644 --- a/du/Makefile +++ b/du/Makefile @@ -1,49 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = du - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = du.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble du.1 - -OTHER_CFLAGS = -D__FBSDID=__RCSID - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/file_cmds/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = du +Install_Dir = /usr/bin + +CFILES = du.c +MANPAGES = du.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/du/Makefile.postamble b/du/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/du/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/du/Makefile.preamble b/du/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/du/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/du/PB.project b/du/PB.project deleted file mode 100644 index 6334025..0000000 --- a/du/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (du.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, du.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = du; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/du/du.1 b/du/du.1 index 51427a8..993a5ab 100644 --- a/du/du.1 +++ b/du/du.1 @@ -43,7 +43,7 @@ .Op Fl H | L | P .Op Fl a | s | d Ar depth .Op Fl c -.Op Fl h | k | m +.Op Fl h | k | m | g .Op Fl x .Op Fl I Ar mask .Op Ar @@ -76,6 +76,8 @@ Gigabyte, Terabyte and Petabyte. .It Fl I Ar mask Ignore files and directories matching the specified .Ar mask . +.It Fl g +Display block counts in 1073741824-byte (1-Gbyte) blocks. .It Fl k Display block counts in 1024-byte (1-Kbyte) blocks. .It Fl L diff --git a/du/du.c b/du/du.c index 4a426ee..99564da 100644 --- a/du/du.c +++ b/du/du.c @@ -138,7 +138,7 @@ main(int argc, char *argv[]) depth = INT_MAX; SLIST_INIT(&ignores); - while ((ch = getopt(argc, argv, "HI:LPasd:chkmrx")) != -1) + while ((ch = getopt(argc, argv, "HI:LPasd:cghkmrx")) != -1) switch (ch) { case 'H': Lflag = Pflag = 0; @@ -186,6 +186,10 @@ main(int argc, char *argv[]) hflag = 0; putenv("BLOCKSIZE=1048576"); break; + case 'g': + hflag = 0; + putenv("BLOCKSIZE=1g"); + break; case 'r': /* Compatibility. */ break; case 'x': @@ -537,7 +541,7 @@ static void usage(void) { (void)fprintf(stderr, - "usage: du [-H | -L | -P] [-a | -s | -d depth] [-c] [-h | -k | -m] [-x] [-I mask] [file ...]\n"); + "usage: du [-H | -L | -P] [-a | -s | -d depth] [-c] [-h | -k | -m | -g] [-x] [-I mask] [file ...]\n"); exit(EX_USAGE); } diff --git a/install/Makefile b/install/Makefile dissimilarity index 97% index d36083c..8b29738 100644 --- a/install/Makefile +++ b/install/Makefile @@ -1,50 +1,12 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = install - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -HFILES = pathnames.h - -CFILES = xinstall.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble install.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = install +Install_Dir = /usr/bin + +CFILES = xinstall.c +MANPAGES = install.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID \ + -include TargetConditionals.h +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/install/Makefile.postamble b/install/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/install/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/install/Makefile.preamble b/install/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/install/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/install/PB.project b/install/PB.project deleted file mode 100644 index 519a9e7..0000000 --- a/install/PB.project +++ /dev/null @@ -1,26 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - H_FILES = (pathnames.h); - OTHER_LINKED = (xinstall.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, install.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = install; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/install/xinstall.c b/install/xinstall.c index e6d732f..0b3e567 100644 --- a/install/xinstall.c +++ b/install/xinstall.c @@ -730,7 +730,7 @@ strip(to_name) errno = serrno; err(EX_TEMPFAIL, "fork"); case 0: - execlp("strip", "strip", to_name, NULL); + execlp("strip", "strip", "-", to_name, NULL); err(EX_OSERR, "exec(strip)"); default: if (wait(&status) == -1 || status) { diff --git a/ipcrm/Makefile b/ipcrm/Makefile dissimilarity index 98% index c14dc3e..eedfdbb 100644 --- a/ipcrm/Makefile +++ b/ipcrm/Makefile @@ -1,49 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = ipcrm - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = ipcrm.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ipcrm.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - -NEXTSTEP_PB_CFLAGS = - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = ipcrm +Install_Dir = /usr/bin + +CFILES = ipcrm.c +MANPAGES = ipcrm.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/ipcrm/Makefile.postamble b/ipcrm/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/ipcrm/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/ipcrm/Makefile.preamble b/ipcrm/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/ipcrm/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/ipcrm/PB.project b/ipcrm/PB.project deleted file mode 100644 index 6304e07..0000000 --- a/ipcrm/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (ipcrm.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, ipcrm.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = ipcrm; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/ipcs/Makefile b/ipcs/Makefile dissimilarity index 98% index f2ac495..0d77995 100644 --- a/ipcs/Makefile +++ b/ipcs/Makefile @@ -1,45 +1,17 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = ipcs - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = ipcs.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ipcs.1 - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - -NEXTSTEP_PB_CFLAGS = -iquote "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" -iquote "$(SDKROOT)/System/Library/Frameworks/Kernel.framework/PrivateHeaders" -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = ipcs +Install_Dir = /usr/bin + +CFILES = ipcs.c +MANPAGES = ipcs.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID \ + -iquote \ + "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" \ + -iquote \ + "$(SDKROOT)/System/Library/Frameworks/Kernel.framework/PrivateHeaders" +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + +Install_Program_Mode = 04511 diff --git a/ipcs/Makefile.postamble b/ipcs/Makefile.postamble deleted file mode 100644 index 54e0481..0000000 --- a/ipcs/Makefile.postamble +++ /dev/null @@ -1,4 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common - -INSTALL_AS_USER = root -INSTALL_PERMISSIONS = 4511 diff --git a/ipcs/Makefile.preamble b/ipcs/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/ipcs/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/ipcs/PB.project b/ipcs/PB.project deleted file mode 100644 index 3caab57..0000000 --- a/ipcs/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (ipcs.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, ipcs.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = ipcs; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/ln/Makefile b/ln/Makefile dissimilarity index 98% index db22a08..8716c95 100644 --- a/ln/Makefile +++ b/ln/Makefile @@ -1,50 +1,17 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = ln - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = ln.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ln.1\ - symlink.7 - -OTHER_CFLAGS = -D__FBSDID=__RCSID - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = ln +Install_Dir = /bin + +CFILES = ln.c +MANPAGES = ln.1 symlink.7 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + +after_install: + $(LN) -f $(DSTROOT)$(Install_Dir)/ln \ + $(DSTROOT)$(Install_Dir)/link + $(LN) -f $(DSTROOT)/usr/share/man/man1/ln.1 \ + $(DSTROOT)/usr/share/man/man1/link.1 diff --git a/ln/Makefile.postamble b/ln/Makefile.postamble deleted file mode 100644 index b347e1a..0000000 --- a/ln/Makefile.postamble +++ /dev/null @@ -1,7 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common - -after_install:: - $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/link - mkdir -p "$(DSTROOT)/usr/share/man/man1" - ln -f "$(DSTROOT)/usr/share/man/man1/ln.1" "$(DSTROOT)/usr/share/man/man1/link.1" - diff --git a/ln/Makefile.preamble b/ln/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/ln/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/ln/PB.project b/ln/PB.project deleted file mode 100644 index fe1d0a7..0000000 --- a/ln/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (ln.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, ln.1, symlink.7); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = ln; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/ls/Makefile b/ls/Makefile dissimilarity index 95% index f593549..8523d35 100644 --- a/ls/Makefile +++ b/ls/Makefile @@ -1,52 +1,16 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = ls - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -HFILES = extern.h ls.h - -CFILES = cmp.c ls.c print.c util.c humanize_number.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ls.1 - -OTHER_CFLAGS = -DCOLORLS -I/System/Library/Frameworks/System.framework/PrivateHeaders -D__FBSDID=__RCSID -D_DARWIN_USE_64_BIT_INODE -OTHER_LDFLAGS = -lncurses - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = ls +Install_Dir = /bin + +CFILES = cmp.c ls.c print.c util.c humanize_number.c +MANPAGES = ls.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID \ + "-I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" \ + -DCOLORLS \ + -D_DARWIN_USE_64_BIT_INODE \ + -include TargetConditionals.h +Extra_LD_Flags = -dead_strip \ + -lncurses + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/ls/Makefile.postamble b/ls/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/ls/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/ls/Makefile.preamble b/ls/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/ls/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/ls/PB.project b/ls/PB.project deleted file mode 100644 index 32e2a56..0000000 --- a/ls/PB.project +++ /dev/null @@ -1,26 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - H_FILES = (extern.h, ls.h); - OTHER_LINKED = (cmp.c, ls.c, print.c, stat_flags.c, util.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, ls.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = ls; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/mkdir/Makefile b/mkdir/Makefile dissimilarity index 98% index d26e5ad..bf85a88 100644 --- a/mkdir/Makefile +++ b/mkdir/Makefile @@ -1,48 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = mkdir - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = mkdir.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mkdir.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = mkdir +Install_Dir = /bin + +CFILES = mkdir.c +MANPAGES = mkdir.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/mkdir/Makefile.postamble b/mkdir/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/mkdir/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/mkdir/Makefile.preamble b/mkdir/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/mkdir/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/mkdir/PB.project b/mkdir/PB.project deleted file mode 100644 index 0d6316a..0000000 --- a/mkdir/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (mkdir.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mkdir.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = mkdir; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/mkfifo/Makefile b/mkfifo/Makefile dissimilarity index 98% index ed49dbe..9cd7b57 100644 --- a/mkfifo/Makefile +++ b/mkfifo/Makefile @@ -1,48 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = mkfifo - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = mkfifo.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mkfifo.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = mkfifo +Install_Dir = /usr/bin + +CFILES = mkfifo.c +MANPAGES = mkfifo.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/mkfifo/Makefile.postamble b/mkfifo/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/mkfifo/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/mkfifo/Makefile.preamble b/mkfifo/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/mkfifo/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/mkfifo/PB.project b/mkfifo/PB.project deleted file mode 100644 index b348276..0000000 --- a/mkfifo/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (mkfifo.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mkfifo.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = mkfifo; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/mknod/Makefile b/mknod/Makefile dissimilarity index 98% index b91bcdc..e764c7b 100644 --- a/mknod/Makefile +++ b/mknod/Makefile @@ -1,48 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = mknod - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = mknod.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mknod.8 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /sbin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = mknod +Install_Dir = /sbin + +CFILES = mknod.c +MANPAGES = mknod.8 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/mknod/Makefile.postamble b/mknod/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/mknod/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/mknod/Makefile.preamble b/mknod/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/mknod/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/mknod/PB.project b/mknod/PB.project deleted file mode 100644 index db5f15a..0000000 --- a/mknod/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (mknod.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mknod.8); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /sbin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = mknod; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/mtree/Makefile b/mtree/Makefile dissimilarity index 94% index dbee24e..0f859bd 100644 --- a/mtree/Makefile +++ b/mtree/Makefile @@ -1,51 +1,17 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = mtree - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -HFILES = extern.h mtree.h - -CFILES = compare.c create.c excludes.c misc.c mtree.c spec.c specspec.c verify.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mtree.8 - -OTHER_CFLAGS = -D__FBSDID=__RCSID -DENABLE_MD5 -DENABLE_RMD160 -DENABLE_SHA1 - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/sbin -LIBS = -lmd -lcrypto -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = mtree +Install_Dir = /usr/sbin + +CFILES = compare.c create.c excludes.c misc.c mtree.c spec.c specspec.c \ + verify.c \ + ../cksum/crc.c +MANPAGES = mtree.8 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID \ + -DENABLE_MD5 \ + -DENABLE_RMD160 \ + -DENABLE_SHA1 +Extra_LD_Flags = -dead_strip \ + -lmd -lcrypto + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/mtree/Makefile.postamble b/mtree/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/mtree/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/mtree/Makefile.preamble b/mtree/Makefile.preamble deleted file mode 100644 index 65868da..0000000 --- a/mtree/Makefile.preamble +++ /dev/null @@ -1,5 +0,0 @@ -vpath crc.c ../cksum - -CFILES += crc.c - -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/mtree/PB.project b/mtree/PB.project deleted file mode 100644 index 22cc839..0000000 --- a/mtree/PB.project +++ /dev/null @@ -1,26 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - H_FILES = (extern.h, mtree.h); - OTHER_LINKED = (compare.c, create.c, misc.c, mtree.c, spec.c, verify.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mtree.8); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/sbin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = mtree; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/mtree/test/test00.sh b/mtree/test/test00.sh new file mode 100644 index 0000000..a2e4b28 --- /dev/null +++ b/mtree/test/test00.sh @@ -0,0 +1,67 @@ +#!/bin/sh +# +# Copyright (c) 2003 Poul-Henning Kamp +# All rights reserved. +# +# Please see src/share/examples/etc/bsd-style-copyright. +# +# $FreeBSD: src/usr.sbin/mtree/test/test00.sh,v 1.3 2003/11/05 22:26:08 phk Exp $ +# + +set -e + +TMP=/tmp/mtree.$$ + +rm -rf ${TMP} +mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt + + +mkdir ${TMP}/mt/foo +mkdir ${TMP}/mr/\* +mtree -c -p ${TMP}/mr | mtree -U -r -p ${TMP}/mt > /dev/null 2>&1 +if [ -d ${TMP}/mt/foo ] ; then + echo "ERROR Mtree create fell for filename with '*' char" 1>&2 + rm -rf ${TMP} + exit 1 +fi +rmdir ${TMP}/mr/\* + +mkdir -p ${TMP}/mt/foo +mkdir ${TMP}/mr/\[f\]oo +mtree -c -p ${TMP}/mr | mtree -U -r -p ${TMP}/mt > /dev/null 2>&1 +if [ -d ${TMP}/mt/foo ] ; then + echo "ERROR Mtree create fell for filename with '[' char" 1>&2 + rm -rf ${TMP} + exit 1 +fi +rmdir ${TMP}/mr/\[f\]oo + +mkdir -p ${TMP}/mt/foo +mkdir ${TMP}/mr/\?oo +mtree -c -p ${TMP}/mr | mtree -U -r -p ${TMP}/mt > /dev/null 2>&1 +if [ -d ${TMP}/mt/foo ] ; then + echo "ERROR Mtree create fell for filename with '?' char" 1>&2 + rm -rf ${TMP} + exit 1 +fi +rmdir ${TMP}/mr/\?oo + +mkdir ${TMP}/mr/\# +mtree -c -p ${TMP}/mr > ${TMP}/_ +if mtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null 2>&1 ; then + true +else + echo "ERROR Mtree create fell for filename with '#' char" 1>&2 + rm -rf ${TMP} + exit 1 +fi + +if [ ! -d ${TMP}/mt/\# ] ; then + echo "ERROR Mtree update failed to create name with '#' char" 1>&2 + rm -rf ${TMP} + exit 1 +fi +rmdir ${TMP}/mr/\# + +rm -rf ${TMP} +exit 0 diff --git a/mtree/test/test01.sh b/mtree/test/test01.sh new file mode 100644 index 0000000..d056b91 --- /dev/null +++ b/mtree/test/test01.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# +# Copyright (c) 2003 Poul-Henning Kamp +# All rights reserved. +# +# Please see src/share/examples/etc/bsd-style-copyright. +# +# $FreeBSD: src/usr.sbin/mtree/test/test01.sh,v 1.1 2003/10/30 12:01:32 phk Exp $ +# + +set -e + +TMP=/tmp/mtree.$$ + +rm -rf ${TMP} +mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt + + +ln -s "xx this=is=wrong" ${TMP}/mr/foo +mtree -c -p ${TMP}/mr > ${TMP}/_ + +if mtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null 2>&1 ; then + true +else + echo "ERROR Mtree failed on symlink with space char" 1>&2 + rm -rf ${TMP} + exit 1 +fi + +x=x`(cd ${TMP}/mr ; ls -l foo 2>&1) || true` +y=x`(cd ${TMP}/mt ; ls -l foo 2>&1) || true` + +if [ "$x" != "$y" ] ; then + echo "ERROR Recreation of spaced symlink failed" 1>&2 + rm -rf ${TMP} + exit 1 +fi + +rm -rf ${TMP} +exit 0 diff --git a/mtree/test/test02.sh b/mtree/test/test02.sh new file mode 100644 index 0000000..450ebb3 --- /dev/null +++ b/mtree/test/test02.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# +# Copyright (c) 2003 Dan Nelson +# All rights reserved. +# +# Please see src/share/examples/etc/bsd-style-copyright. +# +# $FreeBSD: src/usr.sbin/mtree/test/test02.sh,v 1.1 2003/10/31 13:39:19 phk Exp $ +# + +set -e + +TMP=/tmp/mtree.$$ + +rm -rf ${TMP} +mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt + +touch -t 199901020304 ${TMP}/mr/oldfile +touch ${TMP}/mt/oldfile + +mtree -c -p ${TMP}/mr > ${TMP}/_ + +mtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null + +x=x`(cd ${TMP}/mr ; ls -l 2>&1) || true` +y=x`(cd ${TMP}/mt ; ls -l 2>&1) || true` + +if [ "$x" != "$y" ] ; then + echo "ERROR Update of mtime failed" 1>&2 + rm -rf ${TMP} + exit 1 +fi + +rm -rf ${TMP} +exit 0 + diff --git a/mtree/test/test03.sh b/mtree/test/test03.sh new file mode 100644 index 0000000..52e08c3 --- /dev/null +++ b/mtree/test/test03.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# +# Copyright (c) 2003 Poul-Henning Kamp +# All rights reserved. +# +# Please see src/share/examples/etc/bsd-style-copyright. +# +# $FreeBSD: src/usr.sbin/mtree/test/test03.sh,v 1.2 2005/03/29 11:44:17 tobez Exp $ +# + +set -e + +TMP=/tmp/mtree.$$ + +rm -rf ${TMP} +mkdir -p ${TMP} + +K=uid,uname,gid,gname,flags,md5digest,size,ripemd160digest,sha1digest,sha256digest,cksum + +rm -rf _FOO +mkdir _FOO +touch _FOO/_uid +touch _FOO/_size +touch _FOO/zztype + +touch _FOO/_bar +mtree -c -K $K -p .. > ${TMP}/_r +mtree -c -K $K -p .. > ${TMP}/_r2 +rm -rf _FOO/_bar + +rm -rf _FOO/zztype +mkdir _FOO/zztype + +date > _FOO/_size + +chown nobody _FOO/_uid + +touch _FOO/_foo +mtree -c -K $K -p .. > ${TMP}/_t + +rm -fr _FOO + +if mtree -f ${TMP}/_r -f ${TMP}/_r2 ; then + true +else + echo "ERROR Compare identical failed" 1>&2 + exit 1 +fi + +if mtree -f ${TMP}/_r -f ${TMP}/_t > ${TMP}/_ ; then + echo "ERROR Compare different succeeded" 1>&2 + exit 1 +fi + +if [ `wc -l < ${TMP}/_` -ne 10 ] ; then + echo "ERROR wrong number of lines: `wc -l ${TMP}/_`" 1>&2 + exit 1 +fi + +exit 0 diff --git a/mtree/test/test04.sh b/mtree/test/test04.sh new file mode 100644 index 0000000..453d146 --- /dev/null +++ b/mtree/test/test04.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# +# Copyright (c) 2003 Dan Nelson +# All rights reserved. +# +# Please see src/share/examples/etc/bsd-style-copyright. +# +# $FreeBSD: src/usr.sbin/mtree/test/test04.sh,v 1.1 2003/11/13 11:02:57 phk Exp $ +# + +set -e + +TMP=/tmp/mtree.$$ + +rm -rf ${TMP} +mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt + +mkdir ${TMP}/mr/a +mkdir ${TMP}/mr/b +mkdir ${TMP}/mt/a +mkdir ${TMP}/mt/b +touch ${TMP}/mt/z + +mtree -c -p ${TMP}/mr > ${TMP}/_r +mtree -c -p ${TMP}/mt > ${TMP}/_t + +if mtree -f ${TMP}/_r -f ${TMP}/_t > ${TMP}/_ ; then + echo "ERROR wrong exit on difference" 1>&2 + exit 1 +fi + +if [ `wc -l < ${TMP}/_` -ne 1 ] ; then + echo "ERROR spec/spec compare generated wrong output" 1>&2 + rm -rf ${TMP} + exit 1 +fi + +if mtree -f ${TMP}/_t -f ${TMP}/_r > ${TMP}/_ ; then + echo "ERROR wrong exit on difference" 1>&2 + exit 1 +fi + +if [ `wc -l < ${TMP}/_` -ne 1 ] ; then + echo "ERROR spec/spec compare generated wrong output" 1>&2 + rm -rf ${TMP} + exit 1 +fi + +rm -rf ${TMP} +exit 0 + diff --git a/mv/Makefile b/mv/Makefile dissimilarity index 98% index 52e16a4..635b9ab 100644 --- a/mv/Makefile +++ b/mv/Makefile @@ -1,50 +1,12 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = mv - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -HFILES = pathnames.h - -CFILES = mv.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mv.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = mv +Install_Dir = /bin + +CFILES = mv.c +MANPAGES = mv.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + diff --git a/mv/Makefile.postamble b/mv/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/mv/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/mv/Makefile.preamble b/mv/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/mv/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/mv/PB.project b/mv/PB.project deleted file mode 100644 index 626c69c..0000000 --- a/mv/PB.project +++ /dev/null @@ -1,26 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - H_FILES = (pathnames.h); - OTHER_LINKED = (mv.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mv.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = mv; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/pathchk/Makefile b/pathchk/Makefile dissimilarity index 97% index afd7d69..c32e972 100644 --- a/pathchk/Makefile +++ b/pathchk/Makefile @@ -1,48 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = pathchk - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = pathchk.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble pathchk.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = pathchk +Install_Dir = /usr/bin + +CFILES = pathchk.c +MANPAGES = pathchk.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/pathchk/Makefile.postamble b/pathchk/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/pathchk/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/pathchk/Makefile.preamble b/pathchk/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/pathchk/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/pathchk/PB.project b/pathchk/PB.project deleted file mode 100644 index 2ba4aa7..0000000 --- a/pathchk/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (pathchk.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, pathchk.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = pathchk; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/pax/Makefile b/pax/Makefile dissimilarity index 85% index 85168df..1176049 100644 --- a/pax/Makefile +++ b/pax/Makefile @@ -1,53 +1,16 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = pax - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -HFILES = cache.h cpio.h extern.h ftree.h options.h pat_rep.h pax.h\ - sel_subs.h tables.h tar.h - -CFILES = ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c\ - ftree.c gen_subs.c getoldopt.c options.c pat_rep.c pax.c\ - sel_subs.c tables.c tar.c tty_subs.c pax_format.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble pax.1 cpio.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = pax +Install_Dir = /bin + +CFILES = ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c\ + ftree.c gen_subs.c getoldopt.c options.c pat_rep.c pax.c\ + sel_subs.c tables.c tar.c tty_subs.c pax_format.c +MANPAGES = pax.1 cpio.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + +after_install: + $(LN) -f $(DSTROOT)$(Install_Dir)/pax $(DSTROOT)/usr/bin/cpio diff --git a/pax/Makefile.postamble b/pax/Makefile.postamble deleted file mode 100644 index 43c51ec..0000000 --- a/pax/Makefile.postamble +++ /dev/null @@ -1,4 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common - -after_install:: - $(LINKPRODUCT) $(DSTROOT)$(USRBINDIR)/cpio diff --git a/pax/Makefile.preamble b/pax/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/pax/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/pax/PB.project b/pax/PB.project deleted file mode 100644 index 834db59..0000000 --- a/pax/PB.project +++ /dev/null @@ -1,54 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - H_FILES = ( - cache.h, - cpio.h, - extern.h, - ftree.h, - options.h, - pat_rep.h, - pax.h, - sel_subs.h, - tables.h, - tar.h - ); - OTHER_LINKED = ( - ar_io.c, - ar_subs.c, - buf_subs.c, - cache.c, - cpio.c, - file_subs.c, - ftree.c, - gen_subs.c, - getoldopt.c, - options.c, - pat_rep.c, - pax.c, - sel_subs.c, - tables.c, - tar.c, - tty_subs.c - ); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, pax.1, cpio.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = pax; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/pax/file_subs.c b/pax/file_subs.c index 02058f6..c8e4ee5 100644 --- a/pax/file_subs.c +++ b/pax/file_subs.c @@ -227,12 +227,12 @@ lnk_creat(ARCHD *arcn) if (S_ISLNK(sb.st_mode)) { int res; - char buff[NAME_MAX+1]; + char buff[PATH_MAX+1]; /* * Conformance: cannot make hard link to symlink - just make a * symlink to the target of the symlink */ - if ((res = readlink(arcn->ln_name, buff, sizeof(buff))) < 0) { + if ((res = readlink(arcn->ln_name, buff, sizeof(buff)-1)) < 0) { syswarn(1,errno,"Unable to symlink to %s from %s", arcn->ln_name, arcn->name); return(-1); diff --git a/pax/pax_format.h b/pax/pax_format.h new file mode 100644 index 0000000..506ce58 --- /dev/null +++ b/pax/pax_format.h @@ -0,0 +1,153 @@ +/* $OpenBSD: tar.h,v 1.7 2003/06/02 23:32:09 millert Exp $ */ +/* $NetBSD: tar.h,v 1.3 1995/03/21 09:07:51 cgd Exp $ */ + +/*- + * Copyright (c) 1992 Keith Muller. + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Keith Muller of the University of California, San Diego. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)tar.h 8.2 (Berkeley) 4/18/94 + */ + +/* + * defines and data structures common to all tar formats + */ +#define CHK_LEN 8 /* length of checksum field */ +#define TNMSZ 100 /* size of name field */ +#ifdef _PAX_ +#define NULLCNT 2 /* number of null blocks in trailer */ +#define CHK_OFFSET 148 /* start of chksum field */ +#define BLNKSUM 256L /* sum of checksum field using ' ' */ +#endif /* _PAX_ */ + +/* + * Values used in typeflag field in all tar formats + * (only REGTYPE, LNKTYPE and SYMTYPE are used in old bsd tar headers) + */ +#define REGTYPE '0' /* Regular File */ +#define AREGTYPE '\0' /* Regular File */ +#define LNKTYPE '1' /* Link */ +#define SYMTYPE '2' /* Symlink */ +#define CHRTYPE '3' /* Character Special File */ +#define BLKTYPE '4' /* Block Special File */ +#define DIRTYPE '5' /* Directory */ +#define FIFOTYPE '6' /* FIFO */ +#define CONTTYPE '7' /* high perf file */ + +/* + * GNU tar compatibility; + */ +#define LONGLINKTYPE 'K' /* Long Symlink */ +#define LONGNAMETYPE 'L' /* Long File */ + +/* + * Mode field encoding of the different file types - values in octal + */ +#define TSUID 04000 /* Set UID on execution */ +#define TSGID 02000 /* Set GID on execution */ +#define TSVTX 01000 /* Reserved */ +#define TUREAD 00400 /* Read by owner */ +#define TUWRITE 00200 /* Write by owner */ +#define TUEXEC 00100 /* Execute/Search by owner */ +#define TGREAD 00040 /* Read by group */ +#define TGWRITE 00020 /* Write by group */ +#define TGEXEC 00010 /* Execute/Search by group */ +#define TOREAD 00004 /* Read by other */ +#define TOWRITE 00002 /* Write by other */ +#define TOEXEC 00001 /* Execute/Search by other */ + +#ifdef _PAX_ +/* + * Pad with a bit mask, much faster than doing a mod but only works on powers + * of 2. Macro below is for block of 512 bytes. + */ +#define TAR_PAD(x) ((512 - ((x) & 511)) & 511) +#endif /* _PAX_ */ + +/* + * structure of an old tar header as it appeared in BSD releases + */ +typedef struct { + char name[TNMSZ]; /* name of entry */ + char mode[8]; /* mode */ + char uid[8]; /* uid */ + char gid[8]; /* gid */ + char size[12]; /* size */ + char mtime[12]; /* modification time */ + char chksum[CHK_LEN]; /* checksum */ + char linkflag; /* norm, hard, or sym. */ + char linkname[TNMSZ]; /* linked to name */ +} HD_TAR; + +#ifdef _PAX_ +/* + * -o options for BSD tar to not write directories to the archive + */ +#define TAR_NODIR "nodir" +#define TAR_OPTION "write_opt" + +/* + * default device names + */ +#define DEV_0 "/dev/rst0" +#define DEV_1 "/dev/rst1" +#define DEV_4 "/dev/rst4" +#define DEV_5 "/dev/rst5" +#define DEV_7 "/dev/rst7" +#define DEV_8 "/dev/rst8" +#endif /* _PAX_ */ + +/* + * Data Interchange Format - Extended tar header format - POSIX 1003.1-1990 + */ +#define TPFSZ 155 +#define TMAGIC "ustar" /* ustar and a null */ +#define TMAGLEN 6 +#define TVERSION "00" /* 00 and no null */ +#define TVERSLEN 2 + +typedef struct { + char name[TNMSZ]; /* name of entry */ + char mode[8]; /* mode */ + char uid[8]; /* uid */ + char gid[8]; /* gid */ + char size[12]; /* size */ + char mtime[12]; /* modification time */ + char chksum[CHK_LEN]; /* checksum */ + char typeflag; /* type of file. */ + char linkname[TNMSZ]; /* linked to name */ + char magic[TMAGLEN]; /* magic cookie */ + char version[TVERSLEN]; /* version */ + char uname[32]; /* ascii owner name */ + char gname[32]; /* ascii group name */ + char devmajor[8]; /* major device number */ + char devminor[8]; /* minor device number */ + char prefix[TPFSZ]; /* linked to name */ +} HD_USTAR; diff --git a/rm/Makefile b/rm/Makefile dissimilarity index 98% index f557347..d37084b 100644 --- a/rm/Makefile +++ b/rm/Makefile @@ -1,48 +1,17 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = rm - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = rm.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble rm.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = rm +Install_Dir = /bin + +CFILES = rm.c +MANPAGES = rm.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + +after_install: + $(LN) -f $(DSTROOT)$(Install_Dir)/rm \ + $(DSTROOT)$(Install_Dir)/unlink + $(LN) -f $(DSTROOT)/usr/share/man/man1/rm.1 \ + $(DSTROOT)/usr/share/man/man1/unlink.1 diff --git a/rm/Makefile.postamble b/rm/Makefile.postamble deleted file mode 100644 index bc9f08f..0000000 --- a/rm/Makefile.postamble +++ /dev/null @@ -1,6 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common - -after_install:: - $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/unlink - mkdir -p "$(DSTROOT)/usr/share/man/man1" - ln -f "$(DSTROOT)/usr/share/man/man1/rm.1" "$(DSTROOT)/usr/share/man/man1/unlink.1" diff --git a/rm/Makefile.preamble b/rm/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/rm/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/rm/PB.project b/rm/PB.project deleted file mode 100644 index 9eb1a48..0000000 --- a/rm/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (rm.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, rm.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = rm; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/rmdir/Makefile b/rmdir/Makefile dissimilarity index 98% index 9eb48aa..3e0b933 100644 --- a/rmdir/Makefile +++ b/rmdir/Makefile @@ -1,48 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = rmdir - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = rmdir.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble rmdir.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = rmdir +Install_Dir = /bin + +CFILES = rmdir.c +MANPAGES = rmdir.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/rmdir/Makefile.postamble b/rmdir/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/rmdir/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/rmdir/Makefile.preamble b/rmdir/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/rmdir/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/rmdir/PB.project b/rmdir/PB.project deleted file mode 100644 index 8475318..0000000 --- a/rmdir/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (rmdir.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, rmdir.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = rmdir; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/rmt/Makefile b/rmt/Makefile dissimilarity index 98% index 805eda7..f372506 100644 --- a/rmt/Makefile +++ b/rmt/Makefile @@ -1,48 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = rmt - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = rmt.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble rmt.8 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/sbin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = rmt +Install_Dir = /usr/sbin + +CFILES = rmt.c +MANPAGES = rmt.8 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/rmt/Makefile.postamble b/rmt/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/rmt/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/rmt/Makefile.preamble b/rmt/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/rmt/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/rmt/PB.project b/rmt/PB.project deleted file mode 100644 index 08efaea..0000000 --- a/rmt/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (rmt.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, rmt.8); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/sbin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = rmt; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/shar/Makefile b/shar/Makefile dissimilarity index 99% index b7a027d..ce27106 100644 --- a/shar/Makefile +++ b/shar/Makefile @@ -1,49 +1,9 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = shar - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -OTHERLINKED = shar.sh - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble shar.1 - -OTHERLINKEDOFILES = shar.o - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = shar +Install_Dir = /usr/bin + +MANPAGES = shar.1 + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + +after_install: + $(INSTALL_SCRIPT) shar.sh $(DSTROOT)/$(Install_Dir)/shar diff --git a/shar/Makefile.postamble b/shar/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/shar/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/shar/Makefile.preamble b/shar/Makefile.preamble deleted file mode 100644 index eaa3b46..0000000 --- a/shar/Makefile.preamble +++ /dev/null @@ -1,3 +0,0 @@ -SHELLTOOL = shar.sh - -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/shar/PB.project b/shar/PB.project deleted file mode 100644 index ed6df54..0000000 --- a/shar/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (shar.sh); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, shar.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = shar; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/stat/Makefile b/stat/Makefile dissimilarity index 98% index 5bad274..9afcd22 100644 --- a/stat/Makefile +++ b/stat/Makefile @@ -1,50 +1,17 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = stat - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = stat.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble stat.1 - -OTHER_CFLAGS = -D__FBSDID=__RCSID - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - -NEXTSTEP_PB_CFLAGS = - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = stat +Install_Dir = /usr/bin + +CFILES = stat.c +MANPAGES = stat.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make + +after_install: + $(LN) -f $(DSTROOT)$(Install_Dir)/stat \ + $(DSTROOT)$(Install_Dir)/readlink + $(LN) -f $(DSTROOT)/usr/share/man/man1/stat.1 \ + $(DSTROOT)/usr/share/man/man1/readlink.1 diff --git a/stat/Makefile.postamble b/stat/Makefile.postamble deleted file mode 100644 index 9d53ad2..0000000 --- a/stat/Makefile.postamble +++ /dev/null @@ -1,6 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common - -after_install:: - $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/readlink - mkdir -p "$(DSTROOT)/usr/share/man/man1" - ln -f "$(DSTROOT)/usr/share/man/man1/stat.1" "$(DSTROOT)/usr/share/man/man1/readlink.1" diff --git a/stat/Makefile.preamble b/stat/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/stat/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/stat/PB.project b/stat/PB.project deleted file mode 100644 index 0d40a66..0000000 --- a/stat/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (stat.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, stat.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = stat; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} diff --git a/touch/Makefile b/touch/Makefile dissimilarity index 98% index 774770c..ad77a26 100644 --- a/touch/Makefile +++ b/touch/Makefile @@ -1,48 +1,11 @@ -# -# Generated by the NeXT Project Builder. -# -# NOTE: Do NOT change this file -- Project Builder maintains it. -# -# Put all of your customizations in files called Makefile.preamble -# and Makefile.postamble (both optional), and Makefile will include them. -# - -NAME = touch - -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool - -CFILES = touch.c - -OTHERSRCS = Makefile Makefile.preamble Makefile.postamble touch.1 - - -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /usr/bin -LIBS = -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) - - - - -NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build - -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac - -include $(MAKEFILEDIR)/platform.make - --include Makefile.preamble - -include $(MAKEFILEDIR)/$(MAKEFILE) - --include Makefile.postamble - --include Makefile.dependencies +Project = touch +Install_Dir = /usr/bin + +CFILES = touch.c +MANPAGES = touch.1 + +Extra_CC_Flags = -Wall -mdynamic-no-pic \ + -D__FBSDID=__RCSID +Extra_LD_Flags = -dead_strip + +include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make diff --git a/touch/Makefile.postamble b/touch/Makefile.postamble deleted file mode 100644 index 013b558..0000000 --- a/touch/Makefile.postamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common diff --git a/touch/Makefile.preamble b/touch/Makefile.preamble deleted file mode 100644 index 9e10e90..0000000 --- a/touch/Makefile.preamble +++ /dev/null @@ -1 +0,0 @@ -include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common diff --git a/touch/PB.project b/touch/PB.project deleted file mode 100644 index 0f39cfd..0000000 --- a/touch/PB.project +++ /dev/null @@ -1,25 +0,0 @@ -{ - DYNAMIC_CODE_GEN = YES; - FILESTABLE = { - FRAMEWORKS = (); - OTHER_LINKED = (touch.c); - OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, touch.1); - }; - LANGUAGE = English; - LOCALIZABLE_FILES = {}; - MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; - NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; - NEXTSTEP_BUILDTOOL = /bin/gnumake; - NEXTSTEP_INSTALLDIR = /usr/bin; - NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; - NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; - PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; - PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; - PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; - PROJECTNAME = touch; - PROJECTTYPE = Tool; - PROJECTVERSION = 2.8; - WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; - WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; - WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; -} -- 2.7.4