fix up file discrepancies in my git tree

diff --git a/amandad-src/amandad.h b/amandad-src/amandad.h
new file mode 100644 (file)
index 0000000..471f73c
--- /dev/null
+++ b/amandad-src/amandad.h
@@ -0,0 +1,56 @@
+/*
+ * Amanda, The Advanced Maryland Automatic Network Disk Archiver
+ * Copyright (c) 1991-1998 University of Maryland at College Park
+ * All Rights Reserved.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of U.M. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  U.M. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * U.M. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL U.M.
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: the Amanda Development Team.  Its members are listed in a
+ * file named AUTHORS, in the root directory of this distribution.
+ */
+/* 
+ * $Id: amandad.h,v 1.5 2006/07/19 17:46:07 martinea Exp $
+ *
+ */
+
+#ifndef AMANDAD_UTIL_H
+#define AMANDAD_UTIL_H
+
+#include "amanda.h"
+#include "amfeatures.h"
+#include "sl.h"
+#include "util.h"              /* for bstrncmp() */
+
+#define DATA_FD_COUNT   3               /* number of general-use pipes */
+#define DATA_FD_OFFSET  50  
+
+typedef struct g_option_s {
+    char *str;
+    am_feature_t *features;
+    char *hostname;
+    char *auth;
+    int maxdumps;
+    char *config;
+} g_option_t;
+
+
+void init_g_options(g_option_t *g_options);
+g_option_t *parse_g_options(char *str, int verbose);
+void free_g_options(g_option_t *);
+
+#endif

diff --git a/config/gnulib.m4i b/config/gnulib.m4i
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/config/gnulib/longdouble.m4 b/config/gnulib/longdouble.m4
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/Appendix.txt b/docs/Appendix.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amadmin.8.txt b/docs/amadmin.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amaespipe.8.txt b/docs/amaespipe.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amanda-client.conf.5.txt b/docs/amanda-client.conf.5.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amanda.8.txt b/docs/amanda.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amanda.conf.5.txt b/docs/amanda.conf.5.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amcheck.8.txt b/docs/amcheck.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amcheckdb.8.txt b/docs/amcheckdb.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amcleanup.8.txt b/docs/amcleanup.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amcrypt-asym-ossl.8.txt b/docs/amcrypt-asym-ossl.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amcrypt-ossl.8.txt b/docs/amcrypt-ossl.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amcrypt.8.txt b/docs/amcrypt.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amdd.8.txt b/docs/amdd.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amdump.8.txt b/docs/amdump.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amfetchdump.8.txt b/docs/amfetchdump.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amflush.8.txt b/docs/amflush.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amgetconf.8.txt b/docs/amgetconf.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amlabel.8.txt b/docs/amlabel.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/ammt.8.txt b/docs/ammt.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amoverview.8.txt b/docs/amoverview.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amplot.8.txt b/docs/amplot.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amrecover.8.txt b/docs/amrecover.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amreport.8.txt b/docs/amreport.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amrestore.8.txt b/docs/amrestore.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amrmtape.8.txt b/docs/amrmtape.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amstatus.8.txt b/docs/amstatus.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amtape.8.txt b/docs/amtape.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amtapetype.8.txt b/docs/amtapetype.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amtoc.8.txt b/docs/amtoc.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amverify.8.txt b/docs/amverify.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/amverifyrun.8.txt b/docs/amverifyrun.8.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/chgscsi.txt b/docs/chgscsi.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/dumperapi.txt b/docs/dumperapi.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/eventapi.txt b/docs/eventapi.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/exclude.txt b/docs/exclude.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/faq.txt b/docs/faq.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/historical.txt b/docs/historical.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/howto-afs.txt b/docs/howto-afs.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/howto-auth.txt b/docs/howto-auth.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/howto-cygwin.txt b/docs/howto-cygwin.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/howto-filedriver.txt b/docs/howto-filedriver.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/howto-wrapper.txt b/docs/howto-wrapper.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/howtos.txt b/docs/howtos.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/index.txt b/docs/index.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/indexing.txt b/docs/indexing.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/install.txt b/docs/install.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/internals.txt b/docs/internals.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/introduction.txt b/docs/introduction.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/ix01.txt b/docs/ix01.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/kerberos.txt b/docs/kerberos.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/labelprinting.txt b/docs/labelprinting.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/links.txt b/docs/links.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/manpages.txt b/docs/manpages.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/multitape.txt b/docs/multitape.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/portusage.txt b/docs/portusage.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/pr01.txt b/docs/pr01.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/pr02.txt b/docs/pr02.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/pr03.txt b/docs/pr03.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/pr04.txt b/docs/pr04.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/rait.txt b/docs/rait.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/references.txt b/docs/references.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/restore.txt b/docs/restore.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/samba.txt b/docs/samba.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/security-api.txt b/docs/security-api.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/security.txt b/docs/security.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/strategy-api.txt b/docs/strategy-api.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/survey.txt b/docs/survey.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/systemnotes.txt b/docs/systemnotes.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/tapechangers.txt b/docs/tapechangers.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/tapesnchangers.txt b/docs/tapesnchangers.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/tapetypes.txt b/docs/tapetypes.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/technical.txt b/docs/technical.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/topten.txt b/docs/topten.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/upgrade.txt b/docs/upgrade.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/using.txt b/docs/using.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/various.txt b/docs/various.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/vtape-api.txt b/docs/vtape-api.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/whatwasnew.txt b/docs/whatwasnew.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/wishlist.txt b/docs/wishlist.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/y2k.txt b/docs/y2k.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/zftape.txt b/docs/zftape.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/dumper-src/amgtar.pl.in b/dumper-src/amgtar.pl.in
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/dumper-src/generic-dumper.pl.in b/dumper-src/generic-dumper.pl.in
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/gnulib/regenerate/no-error.patch.BACKUP.7723.patch b/gnulib/regenerate/no-error.patch.BACKUP.7723.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/gnulib/regenerate/no-error.patch.LOCAL.7723.patch b/gnulib/regenerate/no-error.patch.LOCAL.7723.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/gnulib/regenerate/no-error.patch.REMOTE.7723.patch b/gnulib/regenerate/no-error.patch.REMOTE.7723.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/gnulib/snprintf.h b/gnulib/snprintf.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/gnulib/socket_.h b/gnulib/socket_.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/man/amaespipe.8.BACKUP.16324.8 b/man/amaespipe.8.BACKUP.16324.8
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/man/amaespipe.8.LOCAL.16324.8 b/man/amaespipe.8.LOCAL.16324.8
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/man/amaespipe.8.REMOTE.16324.8 b/man/amaespipe.8.REMOTE.16324.8
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/man/xslt/man.xsl b/man/xslt/man.xsl
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/server-src/amaespipe.sh.in b/server-src/amaespipe.sh.in
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/server-src/amcrypt-ossl-asym.sh.in b/server-src/amcrypt-ossl-asym.sh.in
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/server-src/amcrypt-ossl.sh.in b/server-src/amcrypt-ossl.sh.in
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/server-src/amcrypt.sh.in b/server-src/amcrypt.sh.in
deleted file mode 100755 (executable)
index e69de29..0000000