patch: dpkg on HP-UX
Hi,
In my new job, I seem to be stuck with HP-UX, tools from the era of
gcc-2.6, and missing man pages. So, I've installed quite some stuff
at $HOME. In an effort to make this more maintainable, I've tried
to port dpkg-* to HP-UX, and break the circular dependencies in
configuration (very nasty) and build.
Also, I've hacked a --disable-doc option to configure; this has to
be cleaned up, but I first would like to hear from you.
Anyway, here it is.
Greetings,
Jan
dpkg-1.4.1.1.jcn2.diff:
diff -urN ../dpkg-1.4.1.1/INSTALL ./INSTALL
--- ../dpkg-1.4.1.1/INSTALL Sun Nov 1 17:01:16 1998
+++ ./INSTALL Tue Apr 27 15:45:43 1999
@@ -3,6 +3,14 @@
These are generic installation instructions.
+
+yes, and they're of no much use; try:
+
+ make -f debian/rules
+
+to get started. --- jcn
+
+
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
diff -urN ../dpkg-1.4.1.1/INSTALL.HP-UX ./INSTALL.HP-UX
--- ../dpkg-1.4.1.1/INSTALL.HP-UX Thu Jan 1 01:00:00 1970
+++ ./INSTALL.HP-UX Wed Apr 28 10:32:28 1999
@@ -0,0 +1,93 @@
+# INSTALL.HP-UX
+
+I've made fixes to the configure and build process, so that now you can
+build the dpkg tools on hp-ux, without dpkg installed, and without being
+root. You'll have do something like
+
+ make -f debian/rules binary EMACS=no CONFIG_FLAGS='--disable-shared --disable-doc'
+
+probably three times.
+
+A new problem is that dpkg/dpkg-deb uses chroot (), which is (on HP-UX)
+only available for the superuser. Thus, it seems that dpkg is not an
+easy option for package management at $HOME. Perhaps I'll first try
+rpm now.
+
+
+Build and Install instructions for
+
+ dpkg-1.4.1.1.jcn2
+
+that's dpkg-1.4.1.1 + dpkg-1.4.1.1.jcn2.diff (see below)
+
+as built on
+
+ HP-UX hp156a A.09.07 A 9000/712 unknown
+
+using, amongst others:
+
+ binutils-2.9.1.tar.gz
+ egcs-1.1.2 (--with-gnu-as)
+ perl-5.005_03
+ automake-1.4
+ autoconf-1.13
+ libtool-1.2
+ ncurses-4.2
+ gettext-0.10.35
+ gawk 2.15, patchlevel 4
+
+
+installed in $HOME/usr.
+
+Some wrappers for broken tools/or broken usage:
+
+$HOME/script/mv:
+----------
+#!/bin/ksh
+# dpkg libtool hack / mv wrapper
+
+OPTIONS=
+for i in $*; do
+ case $i in
+ -lc)
+ ;;
+ *)
+ OPTIONS="$OPTIONS $i"
+ ;;
+ esac
+done
+/usr/local/gnu/bin/mv $OPTIONS
+----------
+
+$HOME/script/install:
+----------
+#!/bin/ksh
+# dpkg hack / install wrapper
+
+OPTIONS=
+for i in $*; do
+ case $i in
+ -p)
+ ;;
+ *)
+ OPTIONS="$OPTIONS $i"
+ ;;
+ esac
+done
+/usr/local/gnu/bin/install $OPTIONS
+----------
+
+
+added to my environment:
+
+ PATH=$HOME/script:$PATH
+ export C_INCLUDE_PATH=$HOME/usr/include
+ export CPLUS_INCLUDE_PATH=$HOME/usr/include
+ export LIBRARY_PATH=$HOME/usr/lib
+
+
+build command:
+
+ make -f debian/rules binary EMACS=no CONFIG_FLAGS='--disable-shared --disable-doc'
+
+issue again when it stops...
diff -urN ../dpkg-1.4.1.1/Makefile.am ./Makefile.am
--- ../dpkg-1.4.1.1/Makefile.am Sun Nov 1 18:34:27 1998
+++ ./Makefile.am Tue Apr 27 15:45:44 1999
@@ -8,8 +8,14 @@
CPPSUBDIRS =
endif
+if DOC
+DOC = doc
+else
+DOC =
+endif
+
SUBDIRS = po intl include lib main dpkg-deb split \
- md5sum scripts $(CPPSUBDIRS) doc
+ md5sum scripts $(CPPSUBDIRS) $(DOC)
## Directory definitions
diff -urN ../dpkg-1.4.1.1/acconfig.h ./acconfig.h
--- ../dpkg-1.4.1.1/acconfig.h Sun Nov 1 17:01:24 1998
+++ ./acconfig.h Tue Apr 27 15:45:44 1999
@@ -56,3 +56,15 @@
/* Define as 1 if you have the stpcpy function. */
#undef HAVE_STPCPY
+
+/* Define if you have flock */
+#undef HAVE_FLOCK
+
+/* Define if you have getopt_long */
+#undef HAVE_GETOPT_LONG
+
+/* Define if you have snprintf */
+#undef HAVE_SNPRINTF
+
+/* Define if you have sys_siglist */
+#undef HAVE_SYS_SIGLIST_DECLARED
diff -urN ../dpkg-1.4.1.1/archtable ./archtable
--- ../dpkg-1.4.1.1/archtable Sun Nov 1 17:01:27 1998
+++ ./archtable Tue Apr 27 15:45:44 1999
@@ -24,3 +24,5 @@
arm arm arm
ppc powerpc powerpc
powerpc powerpc powerpc
+hppa1.1 hppa1.1 hppa1.1
+
diff -urN ../dpkg-1.4.1.1/automake/tl_canon.m4 ./automake/tl_canon.m4
--- ../dpkg-1.4.1.1/automake/tl_canon.m4 Sun Nov 1 17:32:40 1998
+++ ./automake/tl_canon.m4 Tue Apr 27 15:45:44 1999
@@ -115,20 +115,24 @@
dnl Set target_alias.
target_alias=$target
+changequote(<<, >>)dnl
case "$target_alias" in
NONE)
case $nonopt in
NONE)
- target_cpu="`dpkg --print-architecture`"
+ dnl urg, circular dependency
+ dnl target_cpu="`dpkg --print-architecture`"
+ target_cpu="`expr \`gcc -dumpmachine\` : '\([^-]*\).*'`"
if test "$target_cpu" = ""; then
target_alias=$host_alias
else
- target_alias="`echo ${host_alias} | sed 's/[^-]*-/${target_cpu}-/'`"
+ target_alias="`echo ${host_alias} | sed \"s/[^-]*-/${target_cpu}-/\"`"
fi
;;
*) target_alias=$nonopt ;;
esac ;;
esac
+changequote([, ])dnl
dnl Set the other target vars.
if test $target_alias = $host_alias; then
diff -urN ../dpkg-1.4.1.1/configure.in ./configure.in
--- ../dpkg-1.4.1.1/configure.in Sun Nov 1 18:34:28 1998
+++ ./configure.in Tue Apr 27 15:55:59 1999
@@ -14,12 +14,24 @@
tl_PROG_CXX
AC_PROG_CXX
AM_CONDITIONAL(HAVE_CPLUSPLUS, [test "$CXX" != ""])
+AC_ARG_ENABLE(doc,
+ [ --enable-doc Generate debian style doc],
+ [case "${enableval}" in
+ yes) doc=true ;;
+ no) doc=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+ esac],[doc=true])
+AM_CONDITIONAL(DOC, test x$doc = xtrue)
tl_CHECK_TOOL(LD, ld, ld)
-AM_INIT_AUTOMAKE(dpkg,[`sed -n '1s/dpkg (\([0-9.]\+\)).*/\1/p' ${srcdir}/debian/changelog`])
+# fix and allow x.y.z.jcn1
+changequote(<<, >>)dnl
+VERSION=`sed -n '1s/dpkg (\([0-9][^)]*[0-9]\)).*/\1/p' ${srcdir}/debian/changelog`
+changequote([, ])dnl
+AM_INIT_AUTOMAKE(dpkg,$VERSION)
ACLOCAL="$ACLOCAL -I automake"
-AC_MSG_CHECKING(dpkg version)
+# AC_MSG_CHECKING(dpkg version)
AC_MSG_RESULT($VERSION)
AC_PREFIX_DEFAULT(/usr)
@@ -32,7 +44,8 @@
AC_MSG_ERROR(--with-arch requires an architecture name)
fi
dpkg_archset="${with_arch}"
- dpkg_tmp="`awk '$1 == "'$target_cpu'" { print $2 }' $srcdir/archtable`"
+ dnl dpkg_tmp="`awk '$1 == "'$target_cpu'" { print $2 }' $srcdir/archtable`"
+ dpkg_tmp=`awk '$1 == "'$target_cpu'" { print $2 }' $srcdir/archtable`
if test "x$dpkg_tmp" = "x"; then
AC_MSG_WARN([unable to find specified architecture $dpkg_archset in archtable])
elif test "x$dpkg_tmp" != "x$dpkg_archset"; then
@@ -40,7 +53,8 @@
fi
],[
AC_MSG_CHECKING(system architecture)
- dpkg_archset="`awk '$1 == "'$target_cpu'" { print $2 }' $srcdir/archtable`"
+ dnl dpkg_archset="`awk '$1 == "'$target_cpu'" { print $2 }' $srcdir/archtable`"
+ dpkg_archset=`awk '$1 == "'$target_cpu'" { print $2 }' $srcdir/archtable`
# Finish off
if test "x$dpkg_archset" = "x"; then
AC_MSG_ERROR(failed: use --with-arch= or --target=)
@@ -124,6 +138,8 @@
AC_CHECK_SIZEOF(unsigned int)
AC_CHECK_FUNCS(unsetenv alphasort scandir strerror strsignal strtoul vsnprintf lchown)
AC_CHECK_HEADERS(sys/cdefs.h)
+AC_CHECK_FUNCS(flock getopt_long snprintf)
+AC_SYS_SIGLIST_DECLARED
AC_CHECK_FUNC(sysinfo,
AC_DEFINE(HAVE_SYSINFO),
@@ -159,7 +175,7 @@
DPKG_CACHED_TRY_COMPILE(alphasort declaration,dpkg_cv_header_alphasort,[
#include <sys/types.h>
-#include <sys/dir.h>
+#include <dirent.h>
], alphasort,
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_ALPHASORT_DECLARATION),
diff -urN ../dpkg-1.4.1.1/debian/README.compile ./debian/README.compile
--- ../dpkg-1.4.1.1/debian/README.compile Sun Nov 1 17:32:44 1998
+++ ./debian/README.compile Wed Apr 28 10:38:17 1999
@@ -1,21 +1,33 @@
To compile this package you need to have some less-then-standard packages
-installed. Here's a list:
+installed. Here's a list:
+
+perl (not 5.001)
+automake-1.4
+autoconf-2.13
+libtool-1.2
+gettext-0.10.35
+GNU make
+gcc > 2.6.x (egcs-1.1.2 is fine), and
+ binutils-2.9 (on broken platforms like HP-UX)
+ncurses (4.2 is fine)
+GNU awk (2.15, patchlevel 4 is fine)
+
+
+Unless you
+
+ configure --disable-doc
+
+for a full build and install, you'll also need:
-automake
-autoconf
debiandoc-sgml
-dpkg-perl
-gettext
-libtool
-libpaperg
-lout
-psutils
sgml-base
sgml-data
sgml-tools
sgmlspm
-sp
tetex-base
tetex-bin
+This is all *very* silly, IMO. I would very much like a bootstrapping
+utility like a package manager to have little as possible requirements
+--jcn
diff -urN ../dpkg-1.4.1.1/debian/changelog ./debian/changelog
--- ../dpkg-1.4.1.1/debian/changelog Mon Feb 1 01:13:14 1999
+++ ./debian/changelog Tue Apr 27 17:06:27 1999
@@ -1,3 +1,24 @@
+dpkg (1.4.1.1.jcn2) unstable; urgency=low
+
+ * fixed circular dependency: use newly built dpkg-* tools for packaging
+ + dpkg-parsechangelog: fixed -L flag
+ + wrapper: ./dpkg-parsechangelog
+ * while trying and building encountered wierd hpux bug/behaviour,
+ mortal users can do
+ chown root.root
+ on a file!
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org> Tue, 26 Apr 1999 11:55:31 +0100
+
+dpkg (1.4.1.1.jcn1) unstable; urgency=low
+
+ * configure and build fixes:
+ + don't depend on dpkg for build
+ + don't depend on dpkg for configure
+ * fixes and instructions for hpux build
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org> Fri, 23 Apr 1999 14:29:01 +0100
+
dpkg (1.4.1.1) unstable; urgency=low
* Non-maintainer upload
diff -urN ../dpkg-1.4.1.1/debian/rules ./debian/rules
--- ../dpkg-1.4.1.1/debian/rules Mon Feb 1 01:11:02 1999
+++ ./debian/rules Wed Apr 28 10:19:37 1999
@@ -2,15 +2,16 @@
SHELL=bash
-.PHONY: clean build binary binary-trees binary-arch binary-indep
+.PHONY: clean build binary binary-trees binary-arch binary-indep test-new
BUILD := $(shell pwd)/debian/build
DIR := $(shell pwd)
-arch=$(shell dpkg --print-architecture)
+# urg: circular dependency in dpkg
+# arch=$(shell dpkg --print-architecture)
+arch=$(shell expr `gcc -dumpmachine` : '\([^-]*\).*')
mcidir=debian/tmp-main/DEBIAN
-
Makefile.in: Makefile.am
$(checkdir)
$(RM) config.status
@@ -34,7 +35,7 @@
--datadir=/usr/share \
--sysconfdir=/etc \
--sharedstatedir=/var/lib \
- --localstatedir=/var/lib
+ --localstatedir=/var/lib $(CONFIG_FLAGS)
# libtool -rpath workaround based on a suggestion by Yann Dirson
# <dirson@debian.org>
#
@@ -111,28 +112,58 @@
rm debian/tmp-main/usr/man/man1/$$f.1; \
ln -s dpkg-source.1.gz debian/tmp-main/usr/man/man1/$$f.1.gz ; \
done
- ln -s ../man7/undocumented.7.gz debian/tmp-main/usr/man/man1/dpkg-divert.1.gz
+ # urg: don't fail if documentation has not been built
+ # should have decent switch
+ -ln -s ../man7/undocumented.7.gz debian/tmp-main/usr/man/man1/dpkg-divert.1.gz
+ -cp -f debian/changelog* debian/tmp-main/usr/doc/dpkg
gzip -9vf debian/tmp-main/usr/doc/dpkg/changelog*
cp debian/copyright debian/tmp-main/usr/doc/dpkg/copyright
cp debian/copyright debian/tmp-dev/usr/doc/dpkg-dev/copyright
cp debian/dev-README debian/tmp-dev/usr/doc/dpkg-dev/README
- set -e; for f in \
- usr/doc/dpkg/{internals.html,changelog.manuals.gz} \
+ -set -e; for f in \
usr/bin/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,parsechangelog} \
usr/bin/{dpkg-distaddfile,822-date,dpkg-scanpackages,dpkg-name} \
usr/man/man1/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage}.1.gz \
usr/man/man1/{dpkg-parsechangelog,dpkg-distaddfile,822-date,dpkg-name}.1.gz \
usr/man/man5 usr/man/man8/dpkg-scanpackages.8.gz \
usr/lib/dpkg/parsechangelog usr/lib/dpkg/controllib.pl \
+ usr/doc/dpkg/{internals.html,changelog.manuals.gz} \
; do mv debian/tmp-main/$$f debian/tmp-dev/$$f; done
+
+# break circular dependency: use newly built tools
+# iso depending on installed ones
+# this should be cleaned-up
+# urg: TMP_EXISTS hack: automake chokes on invalid path
+# urg: make will have to be restarted
+TMP_EXISTS = $(wildcard debian/tmp-dev/usr/bin/*)
+ifneq ($(TMP_EXISTS),)
+DEV_BIN=$(DIR)/./debian/tmp-dev/usr/bin
+MAIN_BIN=$(DIR)/./debian/tmp-main/usr/bin
+PATH:=$(DIR):$(DEV_BIN):$(MAIN_BIN):$(PATH)
+PERLLIB=$(DIR)/./debian/tmp-main/usr/lib/dpkg
+export PATH PERLLIB
+endif
+
+test-new:
+ echo tmp: $(TMP_EXISTS)
+ echo path:$(PATH)
+ echo perllib:$(PERLLIB)
+ if test x`id -u` = x0; then echo root; else echo user; fi
+ dpkg-shlibdeps $(DIR)/debian/tmp-main/usr/bin/dpkg
+ dpkg-parsechangelog
+
binary-indep: binary-trees
$(checkdir)
dpkg-gencontrol -pdpkg-dev -Pdebian/tmp-dev
- chown -R root.root debian/tmp-dev
- chmod -R g-ws,a+r,u+w debian/tmp-dev
+ if test x`id -u` = x0; then \
+ -chown -R root.root debian/tmp-dev \
+ fi
+ -chmod -R g-ws,a+r,u+w debian/tmp-dev
dpkg-deb --build debian/tmp-dev ..
- set -e -x; for f in internals; do \
+ # urg: don't fail if documentation has not been built
+ # should have decent switch
+ -set -e -x; for f in internals; do \
if test -f $(BUILD)/doc/$$f.ps; then \
cp -p $(BUILD)/doc/$$f.ps $(DIR)/..; \
elif test -f $(DIR)/doc/$$f.ps; then \
@@ -165,8 +196,10 @@
-strip --strip-debug debian/tmp-main/usr/lib/libdpkg.a
dpkg-shlibdeps -dPre-Depends debian/tmp-main/usr/{bin,sbin}/*
dpkg-gencontrol -pdpkg -Pdebian/tmp-main
- chown -R root.root debian/tmp-main
- chmod -R g-ws,a+r,u+w debian/tmp-main
+ if test x`id -u` = x0; then \
+ -chown -R root.root debian/tmp-main \
+ fi
+ -chmod -R g-ws,a+r,u+w debian/tmp-main
set -e; \
version=`sed -n 's/^Version: //p' $(DIR)/debian/tmp-main/DEBIAN/control`; \
file=dpkg_$${version}_$(arch).nondebbin.tar; \
@@ -178,3 +211,4 @@
define checkdir
test -f include/dpkg.h.in
endef
+
diff -urN ../dpkg-1.4.1.1/doc/manuals-version ./doc/manuals-version
--- ../dpkg-1.4.1.1/doc/manuals-version Mon Feb 1 00:47:23 1999
+++ ./doc/manuals-version Thu Jan 1 01:00:00 1970
@@ -1,2 +0,0 @@
-<!entity manuals-version "1.4.1.1">
-<!entity dpkg-version "1.4.1.1">
diff -urN ../dpkg-1.4.1.1/dpkg-parsechangelog ./dpkg-parsechangelog
--- ../dpkg-1.4.1.1/dpkg-parsechangelog Thu Jan 1 01:00:00 1970
+++ ./dpkg-parsechangelog Wed Apr 28 10:05:03 1999
@@ -0,0 +1,3 @@
+#!/bin/ksh
+# dpkg build hack / dpkg-parsechangelog wrapper
+debian/tmp-dev/usr/bin/dpkg-parsechangelog -L`pwd`/debian/tmp-main/usr/lib/dpkg/parsechangelog
diff -urN ../dpkg-1.4.1.1/dselect/baselist.cc ./dselect/baselist.cc
--- ../dpkg-1.4.1.1/dselect/baselist.cc Sun Nov 1 17:04:21 1998
+++ ./dselect/baselist.cc Tue Apr 27 15:45:45 1999
@@ -62,6 +62,10 @@
delete oblockedp;
}
+#ifndef SA_INTERRUPT
+#define SA_INTERRUPT SIGINT
+#endif
+
void baselist::setupsigwinch() {
sigemptyset(&sigwinchset);
sigaddset(&sigwinchset,SIGWINCH);
diff -urN ../dpkg-1.4.1.1/dselect/curkeys.cc ./dselect/curkeys.cc
--- ../dpkg-1.4.1.1/dselect/curkeys.cc Sun Nov 1 17:04:26 1998
+++ ./dselect/curkeys.cc Tue Apr 27 15:45:45 1999
@@ -20,7 +20,7 @@
*/
extern "C" {
-#include <ncurses/curses.h>
+#include <ncurses.h>
#include <config.h>
#include <dpkg.h>
#include <dpkg-db.h>
diff -urN ../dpkg-1.4.1.1/dselect/method.cc ./dselect/method.cc
--- ../dpkg-1.4.1.1/dselect/method.cc Sun Nov 1 17:04:41 1998
+++ ./dselect/method.cc Tue Apr 27 15:45:45 1999
@@ -38,6 +38,7 @@
#include <curses.h>
+
extern "C" {
#include <config.h>
#include <dpkg.h>
@@ -45,6 +46,13 @@
}
#include "dselect.h"
#include "method.h"
+
+#ifndef HAVE_FLOCK
+#define LOCK_UN F_UNLCK
+#define LOCK_EX O_EXCL
+#define LOCK_NB O_NONBLOCK
+#define flock(a,b) fcntl(a,b)
+#endif
static const char *const methoddirectories[]= {
LIBDIR "/" METHODSDIR,
diff -urN ../dpkg-1.4.1.1/include/getopt.h ./include/getopt.h
--- ../dpkg-1.4.1.1/include/getopt.h Thu Jan 1 01:00:00 1970
+++ ./include/getopt.h Tue Apr 27 15:45:45 1999
@@ -0,0 +1,133 @@
+/* Declarations for getopt.
+ Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library. Its master source is NOT part of
+ the C library, however. The master source lives in /gd/gnu/lib.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _GETOPT_H
+#define _GETOPT_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+ When `getopt' finds an option that takes an argument,
+ the argument value is returned here.
+ Also, when `ordering' is RETURN_IN_ORDER,
+ each non-option ARGV-element is returned here. */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+ This is used for communication to and from the caller
+ and for communication between successive calls to `getopt'.
+
+ On entry to `getopt', zero means this is the first call; initialize.
+
+ When `getopt' returns -1, this is the index of the first of the
+ non-option elements that the caller should itself scan.
+
+ Otherwise, `optind' communicates from one call to the next
+ how much of ARGV has been scanned so far. */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+ for unrecognized options. */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized. */
+
+extern int optopt;
+
+/* Describe the long-named options requested by the application.
+ The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+ of `struct option' terminated by an element containing a name which is
+ zero.
+
+ The field `has_arg' is:
+ no_argument (or 0) if the option does not take an argument,
+ required_argument (or 1) if the option requires an argument,
+ optional_argument (or 2) if the option takes an optional argument.
+
+ If the field `flag' is not NULL, it points to a variable that is set
+ to the value given in the field `val' when the option is found, but
+ left unchanged if the option is not found.
+
+ To have a long-named option do something other than set an `int' to
+ a compiled-in constant, such as set a value from `optarg', set the
+ option's `flag' field to zero and its `val' field to a nonzero
+ value (the equivalent single-letter option character, if there is
+ one). For long options that have a zero `flag' field, `getopt'
+ returns the contents of the `val' field. */
+
+struct option
+{
+#if defined (__STDC__) && __STDC__
+ const char *name;
+#else
+ char *name;
+#endif
+ /* has_arg can't be an enum because some compilers complain about
+ type mismatches in all the code that assumes it is an int. */
+ int has_arg;
+ int *flag;
+ int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'. */
+
+#define no_argument 0
+#define required_argument 1
+#define optional_argument 2
+
+#if defined (__STDC__) && __STDC__
+#ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+ differences in the consts, in stdlib.h. To avoid compilation
+ errors, only prototype getopt for the GNU C library. */
+extern int getopt (int argc, char *const *argv, const char *shortopts);
+#else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+#endif /* __GNU_LIBRARY__ */
+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+ const struct option *longopts, int *longind);
+extern int getopt_long_only (int argc, char *const *argv,
+ const char *shortopts,
+ const struct option *longopts, int *longind);
+
+/* Internal only. Users should not call this directly. */
+extern int _getopt_internal (int argc, char *const *argv,
+ const char *shortopts,
+ const struct option *longopts, int *longind,
+ int long_only);
+#else /* not __STDC__ */
+extern int getopt ();
+extern int getopt_long ();
+extern int getopt_long_only ();
+
+extern int _getopt_internal ();
+#endif /* __STDC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GETOPT_H */
diff -urN ../dpkg-1.4.1.1/lib/compat.c ./lib/compat.c
--- ../dpkg-1.4.1.1/lib/compat.c Sun Nov 1 17:05:46 1998
+++ ./lib/compat.c Tue Apr 27 15:45:46 1999
@@ -138,3 +138,56 @@
strcpy(q,p); strcat(q,"="); putenv(q);
}
#endif
+
+
+#ifndef HAVE_SNPRINTF
+int
+snprintf (char *str, size_t n, char const *format, ...)
+{
+ va_list ap;
+ int i;
+ (void)n;
+ va_start (ap, format);
+ i = vsprintf (str, format, ap);
+ va_end (ap);
+ return i;
+}
+#endif
+
+#ifndef HAVE_SYS_SIGLIST_DECLARED
+const char *const sys_siglist[32] = {
+"SIGHUP", /*1*/
+"SIGINT", /*2*/
+"SIGQUIT", /*3*/
+"SIGILL", /*4*/
+"SIGTRAP", /*5*/
+"SIGABRT", /*6*/
+"SIGEMT", /*7*/
+"SIGFPE", /*8*/
+"SIGKILL", /*9*/
+"SIGUSR1", /*10*/
+"SIGSEGV", /*11*/
+"SIGUSR2", /*12*/
+"SIGPIPE", /*13*/
+"SIGALRM", /*14*/
+"SIGTERM", /*15*/
+"SIGSTKFLT", /*16*/
+"SIGCHLD", /*17*/
+"SIGCONT", /*18*/
+"SIGSTOP", /*19*/
+"SIGTSTP", /*20*/
+"SIGTTIN", /*21*/
+"SIGTTOU", /*22*/
+"SIGXXX", /*23*/
+"SIGXXX", /*24*/
+"SIGXXX", /*25*/
+"SIGXXX", /*26*/
+"SIGXXX", /*27*/
+"SIGXXX", /*28*/
+"SIGXXX", /*29*/
+"SIGXXX", /*30*/
+"SIGXXX", /*31*/
+"SIGXXX" /*32*/
+};
+#endif
+
diff -urN ../dpkg-1.4.1.1/main/Makefile.am ./main/Makefile.am
--- ../dpkg-1.4.1.1/main/Makefile.am Sun Nov 1 17:06:12 1998
+++ ./main/Makefile.am Tue Apr 27 15:45:46 1999
@@ -49,7 +49,7 @@
archtable.h: $(top_srcdir)/archtable
expand $(top_srcdir)/archtable | \
perl -ne 'print " { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \
- if m/^\s*(\w+)(\s+)(\w+)(\s+)(\w+)\s*$$/' \
+ if m/^\s*([\w.]+)(\s+)([\w.]+)(\s+)([\w.]+)\s*$$/' \
>$@.new
mv $@.new $@
diff -urN ../dpkg-1.4.1.1/main/enquiry.c ./main/enquiry.c
--- ../dpkg-1.4.1.1/main/enquiry.c Sun Nov 1 17:06:27 1998
+++ ./main/enquiry.c Tue Apr 27 15:45:46 1999
@@ -36,6 +36,10 @@
#include "filesdb.h"
#include "main.h"
+#ifndef PTRDIFF_T
+typedef void* ptrdiff_t;
+#endif
+
int pkglistqsortcmp(const void *a, const void *b) {
struct pkginfo *pa= *(struct pkginfo**)a;
struct pkginfo *pb= *(struct pkginfo**)b;
diff -urN ../dpkg-1.4.1.1/main/filesdb.c ./main/filesdb.c
--- ../dpkg-1.4.1.1/main/filesdb.c Mon Feb 1 00:39:38 1999
+++ ./main/filesdb.c Tue Apr 27 15:45:46 1999
@@ -485,6 +485,22 @@
free(i);
}
+#ifndef HAVE_SYSINFO
+#define sysinfo linux_sysinfo
+struct sysinfo {
+ int freeram;
+ int sharedram;
+ int bufferram;
+ int totalram;
+};
+void*
+sysinfo(struct sysinfo* s)
+{
+ (void*)s;
+ return 0;
+}
+#endif
+
void filesdbinit(void) {
struct filenamenode *fnn;
struct sysinfo info;
diff -urN ../dpkg-1.4.1.1/main/help.c ./main/help.c
--- ../dpkg-1.4.1.1/main/help.c Sun Nov 1 17:35:22 1998
+++ ./main/help.c Tue Apr 27 15:45:46 1999
@@ -36,6 +36,11 @@
#include "filesdb.h"
#include "main.h"
+#include "limits.h"
+#ifndef PATH_MAX
+#define PATH_MAX 1023
+#endif
+
const char *const statusstrings[]= {
N_("not installed"), N_("unpacked but not configured"),
N_("broken due to postinst failure"),
diff -urN ../dpkg-1.4.1.1/md5sum/Makefile.am ./md5sum/Makefile.am
--- ../dpkg-1.4.1.1/md5sum/Makefile.am Sun Nov 1 17:06:47 1998
+++ ./md5sum/Makefile.am Tue Apr 27 15:46:17 1999
@@ -8,7 +8,7 @@
## Various options
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/include
OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
diff -urN ../dpkg-1.4.1.1/scripts/Makefile.am ./scripts/Makefile.am
--- ../dpkg-1.4.1.1/scripts/Makefile.am Sun Nov 1 17:07:28 1998
+++ ./scripts/Makefile.am Tue Apr 27 15:46:25 1999
@@ -14,6 +14,7 @@
# This should be $(pkgsysconfdir), but uses $(sysconfdir) for backwards compatibility.
altssysconfdir = $(sysconfdir)/alternatives
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/include
## Automake variables
diff -urN ../dpkg-1.4.1.1/scripts/dpkg-parsechangelog.pl ./scripts/dpkg-parsechangelog.pl
--- ../dpkg-1.4.1.1/scripts/dpkg-parsechangelog.pl Sun Oct 25 23:26:19 1998
+++ ./scripts/dpkg-parsechangelog.pl Tue Apr 27 15:47:09 1999
@@ -56,7 +56,7 @@
close(P); $? && &subprocerr("tail of $changelogfile");
}
-for $pd (@parserpath) {
+for $pd ($libdir,@parserpath) {
$pa= "$pd/$format";
if (!stat("$pa")) {
$! == ENOENT || &syserr("failed to check for format parser $pa");
diff -urN ../dpkg-1.4.1.1/scripts/dpkg-shlibdeps.pl ./scripts/dpkg-shlibdeps.pl
--- ../dpkg-1.4.1.1/scripts/dpkg-shlibdeps.pl Sun Nov 1 17:07:43 1998
+++ ./scripts/dpkg-shlibdeps.pl Tue Apr 27 16:43:32 1999
@@ -81,6 +81,11 @@
return 0;
} elsif (unpack ('N', $d) == 0xcafebabe) { # JAVA binary
return 0;
+ # urg, where's 'ldd' on HP-UX?
+ # $ HP-UX s800 binary
+ # $ HP-UX PA-RISC1.1 binary
+ } elsif ($d =~ /^.$/) { # HP-UX (assume static ...:-) binary
+ return 0;
} else {
die("unrecognized file type for '$_[0]'");
}
diff -urN ../dpkg-1.4.1.1/scripts/getopt.c ./scripts/getopt.c
--- ../dpkg-1.4.1.1/scripts/getopt.c Thu Jan 1 01:00:00 1970
+++ ./scripts/getopt.c Tue Apr 27 15:45:48 1999
@@ -0,0 +1,1000 @@
+/* Getopt for GNU.
+ NOTE: getopt is now part of the C library, so if you don't know what
+ "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
+ before changing it!
+
+ Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
+ Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library. Its master source is NOT part of
+ the C library, however. The master source lives in /gd/gnu/lib.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+ Ditto for AIX 3.2 and <stdlib.h>. */
+#ifndef _NO_PROTO
+#define _NO_PROTO
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if !defined (__STDC__) || !__STDC__
+/* This is a separate conditional since some stdc systems
+ reject `defined (const)'. */
+#ifndef const
+#define const
+#endif
+#endif
+
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
+ Library, but also included in many other GNU distributions. Compiling
+ and linking in this code is a waste when using the GNU C library
+ (especially if it is a shared library). Rather than having every GNU
+ program understand `configure --with-gnu-libc' and omit the object files,
+ it is simpler to just do this in the source for each such file. */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+ to get __GNU_LIBRARY__ defined. */
+#ifdef __GNU_LIBRARY__
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+ contain conflicting prototypes for getopt. */
+#include <stdlib.h>
+#include <unistd.h>
+#endif /* GNU C library. */
+
+#ifdef VMS
+#include <unixlib.h>
+#if HAVE_STRING_H - 0
+#include <string.h>
+#endif
+#endif
+
+#if defined (WIN32) && !defined (__CYGWIN32__)
+/* It's not Unix, really. See? Capital letters. */
+#include <windows.h>
+#define getpid() GetCurrentProcessId()
+#endif
+
+#ifndef _
+/* This is for other GNU distributions with internationalized messages.
+ When compiling libc, the _ macro is predefined. */
+#ifdef HAVE_LIBINTL_H
+# include <libintl.h>
+# define _(msgid) gettext (msgid)
+#else
+# define _(msgid) (msgid)
+#endif
+#endif
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+ but it behaves differently for the user, since it allows the user
+ to intersperse the options with the other arguments.
+
+ As `getopt' works, it permutes the elements of ARGV so that,
+ when it is done, all the options precede everything else. Thus
+ all application programs are extended to handle flexible argument order.
+
+ Setting the environment variable POSIXLY_CORRECT disables permutation.
+ Then the behavior is completely standard.
+
+ GNU application programs can use a third alternative mode in which
+ they can distinguish the relative order of options and other arguments. */
+
+#include "getopt.h"
+
+/* For communication from `getopt' to the caller.
+ When `getopt' finds an option that takes an argument,
+ the argument value is returned here.
+ Also, when `ordering' is RETURN_IN_ORDER,
+ each non-option ARGV-element is returned here. */
+
+char *optarg = NULL;
+
+/* Index in ARGV of the next element to be scanned.
+ This is used for communication to and from the caller
+ and for communication between successive calls to `getopt'.
+
+ On entry to `getopt', zero means this is the first call; initialize.
+
+ When `getopt' returns -1, this is the index of the first of the
+ non-option elements that the caller should itself scan.
+
+ Otherwise, `optind' communicates from one call to the next
+ how much of ARGV has been scanned so far. */
+
+/* 1003.2 says this must be 1 before any call. */
+int optind = 1;
+
+/* Formerly, initialization of getopt depended on optind==0, which
+ causes problems with re-calling getopt as programs generally don't
+ know that. */
+
+int __getopt_initialized = 0;
+
+/* The next char to be scanned in the option-element
+ in which the last option character we returned was found.
+ This allows us to pick up the scan where we left off.
+
+ If this is zero, or a null string, it means resume the scan
+ by advancing to the next ARGV-element. */
+
+static char *nextchar;
+
+/* Callers store zero here to inhibit the error message
+ for unrecognized options. */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+ This must be initialized on some systems to avoid linking in the
+ system's own getopt implementation. */
+
+int optopt = '?';
+
+/* Describe how to deal with options that follow non-option ARGV-elements.
+
+ If the caller did not specify anything,
+ the default is REQUIRE_ORDER if the environment variable
+ POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+ REQUIRE_ORDER means don't recognize them as options;
+ stop option processing when the first non-option is seen.
+ This is what Unix does.
+ This mode of operation is selected by either setting the environment
+ variable POSIXLY_CORRECT, or using `+' as the first character
+ of the list of option characters.
+
+ PERMUTE is the default. We permute the contents of ARGV as we scan,
+ so that eventually all the non-options are at the end. This allows options
+ to be given in any order, even with programs that were not written to
+ expect this.
+
+ RETURN_IN_ORDER is an option available to programs that were written
+ to expect options and other ARGV-elements in any order and that care about
+ the ordering of the two. We describe each non-option ARGV-element
+ as if it were the argument of an option with character code 1.
+ Using `-' as the first character of the list of option characters
+ selects this mode of operation.
+
+ The special argument `--' forces an end of option-scanning regardless
+ of the value of `ordering'. In the case of RETURN_IN_ORDER, only
+ `--' can cause `getopt' to return -1 with `optind' != ARGC. */
+
+static enum
+{
+ REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+} ordering;
+
+/* Value of POSIXLY_CORRECT environment variable. */
+static char *posixly_correct;
+
+#ifdef __GNU_LIBRARY__
+/* We want to avoid inclusion of string.h with non-GNU libraries
+ because there are many ways it can cause trouble.
+ On some systems, it contains special magic macros that don't work
+ in GCC. */
+#include <string.h>
+#define my_index strchr
+#else
+
+/* Avoid depending on library functions or files
+ whose names are inconsistent. */
+
+char *getenv ();
+
+static char *
+my_index (str, chr)
+ const char *str;
+ int chr;
+{
+ while (*str)
+ {
+ if (*str == chr)
+ return (char *) str;
+ str++;
+ }
+ return 0;
+}
+
+/* If using GCC, we can safely declare strlen this way.
+ If not using GCC, it is ok not to declare it. */
+#ifdef __GNUC__
+/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+ That was relevant to code that was here before. */
+#if !defined (__STDC__) || !__STDC__
+/* gcc with -traditional declares the built-in strlen to return int,
+ and has done so at least since version 2.4.5. -- rms. */
+extern int strlen (const char *);
+#endif /* not __STDC__ */
+#endif /* __GNUC__ */
+
+#endif /* not __GNU_LIBRARY__ */
+
+/* Handle permutation of arguments. */
+
+/* Describe the part of ARGV that contains non-options that have
+ been skipped. `first_nonopt' is the index in ARGV of the first of them;
+ `last_nonopt' is the index after the last of them. */
+
+static int first_nonopt;
+static int last_nonopt;
+
+#ifdef _LIBC
+/* Bash 2.0 gives us an environment variable containing flags
+ indicating ARGV elements that should not be considered arguments. */
+
+static const char *nonoption_flags;
+static int nonoption_flags_len;
+
+static int original_argc;
+static char *const *original_argv;
+
+/* Make sure the environment variable bash 2.0 puts in the environment
+ is valid for the getopt call we must make sure that the ARGV passed
+ to getopt is that one passed to the process. */
+static void store_args (int argc, char *const *argv) __attribute__ ((unused));
+static void
+store_args (int argc, char *const *argv)
+{
+ /* XXX This is no good solution. We should rather copy the args so
+ that we can compare them later. But we must not use malloc(3). */
+ original_argc = argc;
+ original_argv = argv;
+}
+text_set_element (__libc_subinit, store_args);
+#endif
+
+/* Exchange two adjacent subsequences of ARGV.
+ One subsequence is elements [first_nonopt,last_nonopt)
+ which contains all the non-options that have been skipped so far.
+ The other is elements [last_nonopt,optind), which contains all
+ the options processed since those non-options were skipped.
+
+ `first_nonopt' and `last_nonopt' are relocated so that they describe
+ the new indices of the non-options in ARGV after they are moved. */
+
+#if defined (__STDC__) && __STDC__
+static void exchange (char **);
+#endif
+
+static void
+exchange (argv)
+ char **argv;
+{
+ int bottom = first_nonopt;
+ int middle = last_nonopt;
+ int top = optind;
+ char *tem;
+
+ /* Exchange the shorter segment with the far end of the longer segment.
+ That puts the shorter segment into the right place.
+ It leaves the longer segment in the right place overall,
+ but it consists of two parts that need to be swapped next. */
+
+ while (top > middle && middle > bottom)
+ {
+ if (top - middle > middle - bottom)
+ {
+ /* Bottom segment is the short one. */
+ int len = middle - bottom;
+ register int i;
+
+ /* Swap it with the top part of the top segment. */
+ for (i = 0; i < len; i++)
+ {
+ tem = argv[bottom + i];
+ argv[bottom + i] = argv[top - (middle - bottom) + i];
+ argv[top - (middle - bottom) + i] = tem;
+ }
+ /* Exclude the moved bottom segment from further swapping. */
+ top -= len;
+ }
+ else
+ {
+ /* Top segment is the short one. */
+ int len = top - middle;
+ register int i;
+
+ /* Swap it with the bottom part of the bottom segment. */
+ for (i = 0; i < len; i++)
+ {
+ tem = argv[bottom + i];
+ argv[bottom + i] = argv[middle + i];
+ argv[middle + i] = tem;
+ }
+ /* Exclude the moved top segment from further swapping. */
+ bottom += len;
+ }
+ }
+
+ /* Update records for the slots the non-options now occupy. */
+
+ first_nonopt += (optind - last_nonopt);
+ last_nonopt = optind;
+}
+
+/* Initialize the internal data when the first call is made. */
+
+#if defined (__STDC__) && __STDC__
+static const char *_getopt_initialize (int, char *const *, const char *);
+#endif
+static const char *
+_getopt_initialize (argc, argv, optstring)
+ int argc;
+ char *const *argv;
+ const char *optstring;
+{
+ /* Start processing options with ARGV-element 1 (since ARGV-element 0
+ is the program name); the sequence of previously skipped
+ non-option ARGV-elements is empty. */
+
+ first_nonopt = last_nonopt = optind = 1;
+
+ nextchar = NULL;
+
+ posixly_correct = getenv ("POSIXLY_CORRECT");
+
+ /* Determine how to handle the ordering of options and nonoptions. */
+
+ if (optstring[0] == '-')
+ {
+ ordering = RETURN_IN_ORDER;
+ ++optstring;
+ }
+ else if (optstring[0] == '+')
+ {
+ ordering = REQUIRE_ORDER;
+ ++optstring;
+ }
+ else if (posixly_correct != NULL)
+ ordering = REQUIRE_ORDER;
+ else
+ ordering = PERMUTE;
+
+#ifdef _LIBC
+ if (posixly_correct == NULL
+ && argc == original_argc && argv == original_argv)
+ {
+ /* Bash 2.0 puts a special variable in the environment for each
+ command it runs, specifying which ARGV elements are the results of
+ file name wildcard expansion and therefore should not be
+ considered as options. */
+ char var[100];
+ sprintf (var, "_%d_GNU_nonoption_argv_flags_", getpid ());
+ nonoption_flags = getenv (var);
+ if (nonoption_flags == NULL)
+ nonoption_flags_len = 0;
+ else
+ nonoption_flags_len = strlen (nonoption_flags);
+ }
+ else
+ nonoption_flags_len = 0;
+#endif
+
+ return optstring;
+}
+
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+ given in OPTSTRING.
+
+ If an element of ARGV starts with '-', and is not exactly "-" or "--",
+ then it is an option element. The characters of this element
+ (aside from the initial '-') are option characters. If `getopt'
+ is called repeatedly, it returns successively each of the option characters
+ from each of the option elements.
+
+ If `getopt' finds another option character, it returns that character,
+ updating `optind' and `nextchar' so that the next call to `getopt' can
+ resume the scan with the following option character or ARGV-element.
+
+ If there are no more option characters, `getopt' returns -1.
+ Then `optind' is the index in ARGV of the first ARGV-element
+ that is not an option. (The ARGV-elements have been permuted
+ so that those that are not options now come last.)
+
+ OPTSTRING is a string containing the legitimate option characters.
+ If an option character is seen that is not listed in OPTSTRING,
+ return '?' after printing an error message. If you set `opterr' to
+ zero, the error message is suppressed but we still return '?'.
+
+ If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+ so the following text in the same ARGV-element, or the text of the following
+ ARGV-element, is returned in `optarg'. Two colons mean an option that
+ wants an optional arg; if there is text in the current ARGV-element,
+ it is returned in `optarg', otherwise `optarg' is set to zero.
+
+ If OPTSTRING starts with `-' or `+', it requests different methods of
+ handling the non-option ARGV-elements.
+ See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+
+ Long-named options begin with `--' instead of `-'.
+ Their names may be abbreviated as long as the abbreviation is unique
+ or is an exact match for some defined option. If they have an
+ argument, it follows the option name in the same ARGV-element, separated
+ from the option name by a `=', or else the in next ARGV-element.
+ When `getopt' finds a long-named option, it returns 0 if that option's
+ `flag' field is nonzero, the value of the option's `val' field
+ if the `flag' field is zero.
+
+ The elements of ARGV aren't really const, because we permute them.
+ But we pretend they're const in the prototype to be compatible
+ with other systems.
+
+ LONGOPTS is a vector of `struct option' terminated by an
+ element containing a name which is zero.
+
+ LONGIND returns the index in LONGOPT of the long-named option found.
+ It is only valid when a long-named option has been found by the most
+ recent call.
+
+ If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+ long-named options. */
+
+int
+_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
+ int argc;
+ char *const *argv;
+ const char *optstring;
+ const struct option *longopts;
+ int *longind;
+ int long_only;
+{
+ optarg = NULL;
+
+ if (!__getopt_initialized || optind == 0)
+ {
+ optstring = _getopt_initialize (argc, argv, optstring);
+ optind = 1; /* Don't scan ARGV[0], the program name. */
+ __getopt_initialized = 1;
+ }
+
+ /* Test whether ARGV[optind] points to a non-option argument.
+ Either it does not have option syntax, or there is an environment flag
+ from the shell indicating it is not an option. The later information
+ is only used when the used in the GNU libc. */
+#ifdef _LIBC
+#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \
+ || (optind < nonoption_flags_len \
+ && nonoption_flags[optind] == '1'))
+#else
+#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#endif
+
+ if (nextchar == NULL || *nextchar == '\0')
+ {
+ /* Advance to the next ARGV-element. */
+
+ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+ moved back by the user (who may also have changed the arguments). */
+ if (last_nonopt > optind)
+ last_nonopt = optind;
+ if (first_nonopt > optind)
+ first_nonopt = optind;
+
+ if (ordering == PERMUTE)
+ {
+ /* If we have just processed some options following some non-options,
+ exchange them so that the options come first. */
+
+ if (first_nonopt != last_nonopt && last_nonopt != optind)
+ exchange ((char **) argv);
+ else if (last_nonopt != optind)
+ first_nonopt = optind;
+
+ /* Skip any additional non-options
+ and extend the range of non-options previously skipped. */
+
+ while (optind < argc && NONOPTION_P)
+ optind++;
+ last_nonopt = optind;
+ }
+
+ /* The special ARGV-element `--' means premature end of options.
+ Skip it like a null option,
+ then exchange with previous non-options as if it were an option,
+ then skip everything else like a non-option. */
+
+ if (optind != argc && !strcmp (argv[optind], "--"))
+ {
+ optind++;
+
+ if (first_nonopt != last_nonopt && last_nonopt != optind)
+ exchange ((char **) argv);
+ else if (first_nonopt == last_nonopt)
+ first_nonopt = optind;
+ last_nonopt = argc;
+
+ optind = argc;
+ }
+
+ /* If we have done all the ARGV-elements, stop the scan
+ and back over any non-options that we skipped and permuted. */
+
+ if (optind == argc)
+ {
+ /* Set the next-arg-index to point at the non-options
+ that we previously skipped, so the caller will digest them. */
+ if (first_nonopt != last_nonopt)
+ optind = first_nonopt;
+ return -1;
+ }
+
+ /* If we have come to a non-option and did not permute it,
+ either stop the scan or describe it to the caller and pass it by. */
+
+ if (NONOPTION_P)
+ {
+ if (ordering == REQUIRE_ORDER)
+ return -1;
+ optarg = argv[optind++];
+ return 1;
+ }
+
+ /* We have found another option-ARGV-element.
+ Skip the initial punctuation. */
+
+ nextchar = (argv[optind] + 1
+ + (longopts != NULL && argv[optind][1] == '-'));
+ }
+
+ /* Decode the current option-ARGV-element. */
+
+ /* Check whether the ARGV-element is a long option.
+
+ If long_only and the ARGV-element has the form "-f", where f is
+ a valid short option, don't consider it an abbreviated form of
+ a long option that starts with f. Otherwise there would be no
+ way to give the -f short option.
+
+ On the other hand, if there's a long option "fubar" and
+ the ARGV-element is "-fu", do consider that an abbreviation of
+ the long option, just like "--fu", and not "-f" with arg "u".
+
+ This distinction seems to be the most useful approach. */
+
+ if (longopts != NULL
+ && (argv[optind][1] == '-'
+ || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
+ {
+ char *nameend;
+ const struct option *p;
+ const struct option *pfound = NULL;
+ int exact = 0;
+ int ambig = 0;
+ int indfound = -1;
+ int option_index;
+
+ for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
+ /* Do nothing. */ ;
+
+ /* Test all long options for either exact match
+ or abbreviated matches. */
+ for (p = longopts, option_index = 0; p->name; p++, option_index++)
+ if (!strncmp (p->name, nextchar, nameend - nextchar))
+ {
+ if ((unsigned int) (nameend - nextchar)
+ == (unsigned int) strlen (p->name))
+ {
+ /* Exact match found. */
+ pfound = p;
+ indfound = option_index;
+ exact = 1;
+ break;
+ }
+ else if (pfound == NULL)
+ {
+ /* First nonexact match found. */
+ pfound = p;
+ indfound = option_index;
+ }
+ else
+ /* Second or later nonexact match found. */
+ ambig = 1;
+ }
+
+ if (ambig && !exact)
+ {
+ if (opterr)
+ fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+ argv[0], argv[optind]);
+ nextchar += strlen (nextchar);
+ optind++;
+ optopt = 0;
+ return '?';
+ }
+
+ if (pfound != NULL)
+ {
+ option_index = indfound;
+ optind++;
+ if (*nameend)
+ {
+ /* Don't test has_arg with >, because some C compilers don't
+ allow it to be used on enums. */
+ if (pfound->has_arg)
+ optarg = nameend + 1;
+ else
+ {
+ if (opterr)
+ if (argv[optind - 1][1] == '-')
+ /* --option */
+ fprintf (stderr,
+ _("%s: option `--%s' doesn't allow an argument\n"),
+ argv[0], pfound->name);
+ else
+ /* +option or -option */
+ fprintf (stderr,
+ _("%s: option `%c%s' doesn't allow an argument\n"),
+ argv[0], argv[optind - 1][0], pfound->name);
+
+ nextchar += strlen (nextchar);
+
+ optopt = pfound->val;
+ return '?';
+ }
+ }
+ else if (pfound->has_arg == 1)
+ {
+ if (optind < argc)
+ optarg = argv[optind++];
+ else
+ {
+ if (opterr)
+ fprintf (stderr,
+ _("%s: option `%s' requires an argument\n"),
+ argv[0], argv[optind - 1]);
+ nextchar += strlen (nextchar);
+ optopt = pfound->val;
+ return optstring[0] == ':' ? ':' : '?';
+ }
+ }
+ nextchar += strlen (nextchar);
+ if (longind != NULL)
+ *longind = option_index;
+ if (pfound->flag)
+ {
+ *(pfound->flag) = pfound->val;
+ return 0;
+ }
+ return pfound->val;
+ }
+
+ /* Can't find it as a long option. If this is not getopt_long_only,
+ or the option starts with '--' or is not a valid short
+ option, then it's an error.
+ Otherwise interpret it as a short option. */
+ if (!long_only || argv[optind][1] == '-'
+ || my_index (optstring, *nextchar) == NULL)
+ {
+ if (opterr)
+ {
+ if (argv[optind][1] == '-')
+ /* --option */
+ fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+ argv[0], nextchar);
+ else
+ /* +option or -option */
+ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+ argv[0], argv[optind][0], nextchar);
+ }
+ nextchar = (char *) "";
+ optind++;
+ optopt = 0;
+ return '?';
+ }
+ }
+
+ /* Look at and handle the next short option-character. */
+
+ {
+ char c = *nextchar++;
+ char *temp = my_index (optstring, c);
+
+ /* Increment `optind' when we start to process its last character. */
+ if (*nextchar == '\0')
+ ++optind;
+
+ if (temp == NULL || c == ':')
+ {
+ if (opterr)
+ {
+ if (posixly_correct)
+ /* 1003.2 specifies the format of this message. */
+ fprintf (stderr, _("%s: illegal option -- %c\n"),
+ argv[0], c);
+ else
+ fprintf (stderr, _("%s: invalid option -- %c\n"),
+ argv[0], c);
+ }
+ optopt = c;
+ return '?';
+ }
+ /* Convenience. Treat POSIX -W foo same as long option --foo */
+ if (temp[0] == 'W' && temp[1] == ';')
+ {
+ char *nameend;
+ const struct option *p;
+ const struct option *pfound = NULL;
+ int exact = 0;
+ int ambig = 0;
+ int indfound = 0;
+ int option_index;
+
+ /* This is an option that requires an argument. */
+ if (*nextchar != '\0')
+ {
+ optarg = nextchar;
+ /* If we end this ARGV-element by taking the rest as an arg,
+ we must advance to the next element now. */
+ optind++;
+ }
+ else if (optind == argc)
+ {
+ if (opterr)
+ {
+ /* 1003.2 specifies the format of this message. */
+ fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+ argv[0], c);
+ }
+ optopt = c;
+ if (optstring[0] == ':')
+ c = ':';
+ else
+ c = '?';
+ return c;
+ }
+ else
+ /* We already incremented `optind' once;
+ increment it again when taking next ARGV-elt as argument. */
+ optarg = argv[optind++];
+
+ /* optarg is now the argument, see if it's in the
+ table of longopts. */
+
+ for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
+ /* Do nothing. */ ;
+
+ /* Test all long options for either exact match
+ or abbreviated matches. */
+ for (p = longopts, option_index = 0; p->name; p++, option_index++)
+ if (!strncmp (p->name, nextchar, nameend - nextchar))
+ {
+ if ((unsigned int) (nameend - nextchar) == strlen (p->name))
+ {
+ /* Exact match found. */
+ pfound = p;
+ indfound = option_index;
+ exact = 1;
+ break;
+ }
+ else if (pfound == NULL)
+ {
+ /* First nonexact match found. */
+ pfound = p;
+ indfound = option_index;
+ }
+ else
+ /* Second or later nonexact match found. */
+ ambig = 1;
+ }
+ if (ambig && !exact)
+ {
+ if (opterr)
+ fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+ argv[0], argv[optind]);
+ nextchar += strlen (nextchar);
+ optind++;
+ return '?';
+ }
+ if (pfound != NULL)
+ {
+ option_index = indfound;
+ if (*nameend)
+ {
+ /* Don't test has_arg with >, because some C compilers don't
+ allow it to be used on enums. */
+ if (pfound->has_arg)
+ optarg = nameend + 1;
+ else
+ {
+ if (opterr)
+ fprintf (stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+ argv[0], pfound->name);
+
+ nextchar += strlen (nextchar);
+ return '?';
+ }
+ }
+ else if (pfound->has_arg == 1)
+ {
+ if (optind < argc)
+ optarg = argv[optind++];
+ else
+ {
+ if (opterr)
+ fprintf (stderr,
+ _("%s: option `%s' requires an argument\n"),
+ argv[0], argv[optind - 1]);
+ nextchar += strlen (nextchar);
+ return optstring[0] == ':' ? ':' : '?';
+ }
+ }
+ nextchar += strlen (nextchar);
+ if (longind != NULL)
+ *longind = option_index;
+ if (pfound->flag)
+ {
+ *(pfound->flag) = pfound->val;
+ return 0;
+ }
+ return pfound->val;
+ }
+ nextchar = NULL;
+ return 'W'; /* Let the application handle it. */
+ }
+ if (temp[1] == ':')
+ {
+ if (temp[2] == ':')
+ {
+ /* This is an option that accepts an argument optionally. */
+ if (*nextchar != '\0')
+ {
+ optarg = nextchar;
+ optind++;
+ }
+ else
+ optarg = NULL;
+ nextchar = NULL;
+ }
+ else
+ {
+ /* This is an option that requires an argument. */
+ if (*nextchar != '\0')
+ {
+ optarg = nextchar;
+ /* If we end this ARGV-element by taking the rest as an arg,
+ we must advance to the next element now. */
+ optind++;
+ }
+ else if (optind == argc)
+ {
+ if (opterr)
+ {
+ /* 1003.2 specifies the format of this message. */
+ fprintf (stderr,
+ _("%s: option requires an argument -- %c\n"),
+ argv[0], c);
+ }
+ optopt = c;
+ if (optstring[0] == ':')
+ c = ':';
+ else
+ c = '?';
+ }
+ else
+ /* We already incremented `optind' once;
+ increment it again when taking next ARGV-elt as argument. */
+ optarg = argv[optind++];
+ nextchar = NULL;
+ }
+ }
+ return c;
+ }
+}
+
+int
+getopt (argc, argv, optstring)
+ int argc;
+ char *const *argv;
+ const char *optstring;
+{
+ return _getopt_internal (argc, argv, optstring,
+ (const struct option *) 0,
+ (int *) 0,
+ 0);
+}
+
+#endif /* Not ELIDE_CODE. */
+
+#ifdef TEST
+
+/* Compile with -DTEST to make an executable for use in testing
+ the above definition of `getopt'. */
+
+int
+main (argc, argv)
+ int argc;
+ char **argv;
+{
+ int c;
+ int digit_optind = 0;
+
+ while (1)
+ {
+ int this_option_optind = optind ? optind : 1;
+
+ c = getopt (argc, argv, "abc:d:0123456789");
+ if (c == -1)
+ break;
+
+ switch (c)
+ {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ if (digit_optind != 0 && digit_optind != this_option_optind)
+ printf ("digits occur in two different argv-elements.\n");
+ digit_optind = this_option_optind;
+ printf ("option %c\n", c);
+ break;
+
+ case 'a':
+ printf ("option a\n");
+ break;
+
+ case 'b':
+ printf ("option b\n");
+ break;
+
+ case 'c':
+ printf ("option c with value `%s'\n", optarg);
+ break;
+
+ case '?':
+ break;
+
+ default:
+ printf ("?? getopt returned character code 0%o ??\n", c);
+ }
+ }
+
+ if (optind < argc)
+ {
+ printf ("non-option ARGV-elements: ");
+ while (optind < argc)
+ printf ("%s ", argv[optind++]);
+ printf ("\n");
+ }
+
+ exit (0);
+}
+
+#endif /* TEST */
diff -urN ../dpkg-1.4.1.1/scripts/getopt1.c ./scripts/getopt1.c
--- ../dpkg-1.4.1.1/scripts/getopt1.c Thu Jan 1 01:00:00 1970
+++ ./scripts/getopt1.c Tue Apr 27 15:45:48 1999
@@ -0,0 +1,189 @@
+/* getopt_long and getopt_long_only entry points for GNU getopt.
+ Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library. Its master source is NOT part of
+ the C library, however. The master source lives in /gd/gnu/lib.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "getopt.h"
+
+#if !defined (__STDC__) || !__STDC__
+/* This is a separate conditional since some stdc systems
+ reject `defined (const)'. */
+#ifndef const
+#define const
+#endif
+#endif
+
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
+ Library, but also included in many other GNU distributions. Compiling
+ and linking in this code is a waste when using the GNU C library
+ (especially if it is a shared library). Rather than having every GNU
+ program understand `configure --with-gnu-libc' and omit the object files,
+ it is simpler to just do this in the source for each such file. */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+ to get __GNU_LIBRARY__ defined. */
+#ifdef __GNU_LIBRARY__
+#include <stdlib.h>
+#endif
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+int
+getopt_long (argc, argv, options, long_options, opt_index)
+ int argc;
+ char *const *argv;
+ const char *options;
+ const struct option *long_options;
+ int *opt_index;
+{
+ return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
+}
+
+/* Like getopt_long, but '-' as well as '--' can indicate a long option.
+ If an option that starts with '-' (not '--') doesn't match a long option,
+ but does match a short option, it is parsed as a short option
+ instead. */
+
+int
+getopt_long_only (argc, argv, options, long_options, opt_index)
+ int argc;
+ char *const *argv;
+ const char *options;
+ const struct option *long_options;
+ int *opt_index;
+{
+ return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
+}
+
+
+#endif /* Not ELIDE_CODE. */
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int
+main (argc, argv)
+ int argc;
+ char **argv;
+{
+ int c;
+ int digit_optind = 0;
+
+ while (1)
+ {
+ int this_option_optind = optind ? optind : 1;
+ int option_index = 0;
+ static struct option long_options[] =
+ {
+ {"add", 1, 0, 0},
+ {"append", 0, 0, 0},
+ {"delete", 1, 0, 0},
+ {"verbose", 0, 0, 0},
+ {"create", 0, 0, 0},
+ {"file", 1, 0, 0},
+ {0, 0, 0, 0}
+ };
+
+ c = getopt_long (argc, argv, "abc:d:0123456789",
+ long_options, &option_index);
+ if (c == -1)
+ break;
+
+ switch (c)
+ {
+ case 0:
+ printf ("option %s", long_options[option_index].name);
+ if (optarg)
+ printf (" with arg %s", optarg);
+ printf ("\n");
+ break;
+
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ if (digit_optind != 0 && digit_optind != this_option_optind)
+ printf ("digits occur in two different argv-elements.\n");
+ digit_optind = this_option_optind;
+ printf ("option %c\n", c);
+ break;
+
+ case 'a':
+ printf ("option a\n");
+ break;
+
+ case 'b':
+ printf ("option b\n");
+ break;
+
+ case 'c':
+ printf ("option c with value `%s'\n", optarg);
+ break;
+
+ case 'd':
+ printf ("option d with value `%s'\n", optarg);
+ break;
+
+ case '?':
+ break;
+
+ default:
+ printf ("?? getopt returned character code 0%o ??\n", c);
+ }
+ }
+
+ if (optind < argc)
+ {
+ printf ("non-option ARGV-elements: ");
+ while (optind < argc)
+ printf ("%s ", argv[optind++]);
+ printf ("\n");
+ }
+
+ exit (0);
+}
+
+#endif /* TEST */
diff -urN ../dpkg-1.4.1.1/scripts/start-stop-daemon.c ./scripts/start-stop-daemon.c
--- ../dpkg-1.4.1.1/scripts/start-stop-daemon.c Sun Nov 1 17:07:56 1998
+++ ./scripts/start-stop-daemon.c Tue Apr 27 15:45:48 1999
@@ -23,6 +23,12 @@
#include <getopt.h>
#include <pwd.h>
+#include <config.h>
+#ifndef HAVE_GETOPT_LONG
+#include "getopt.c"
+#include "getopt1.c"
+#endif
+
#define VERSION "version 0.4.1, 1997-01-29"
static int testmode = 0;
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien/ | http://www.lilypond.org/
Reply to: