Add --assert-longfilenames

diff --git a/ChangeLog b/ChangeLog
index 16a315a438700d9f095a55194c972bfb7613a327..69c255d6753a86070a520ad761e23de8070bfd9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Thu Oct 21 13:22:42 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
   * Update copyright (taken from dpkg-iwj tree, with Ben added)
   * Add support for long filenames in tarfiles. Based on a patch
     from Andrew Hobson <ahobson@eng.mindspring.net>
+  * Add a --assert-longfilenames option
 
 Thu Oct 21 06:37:24 EDT 1999 Ben Collins <bcollins.debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index a4cb39e826adac189c6a6b4556b3a1fcc2073e86..82527e474bc375c9194e1cd2af7da4224832fab7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 dpkg (1.4.1.17) unstable; urgency=low
 
-  * Add support for long filenames
+  * Add support for long filenames, along with --assert-longfilenames
   * Added --chuid option to start-stop-daemon to allow switching to
     a different uid when starting a process
   * Add mipseb and mipsel to the archtable too, since mips and mipseb are

diff --git a/main/enquiry.c b/main/enquiry.c
index 65c19e5cdb8846ddebec370a0f1bca8dfc032224..cc600f7408b209da4e287736fc356c8f83c3dba4 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -506,6 +506,11 @@ void assertepoch(const char *const *argv) {
   assertversion(argv,&epochversion,"1.4.0.7");
 }
 
+void assertlongfilenames(const char *const *argv) {
+  static struct versionrevision epochversion = {~0UL,0,0};
+  assertversion(argv,&epochversion,"1.4.1.17");
+}
+
 void predeppackage(const char *const *argv) {
   /* Print a single package which:
    *  (a) is the target of one or more relevant predependencies.

diff --git a/main/main.c b/main/main.c
index 86e3ecca8c9f7c1b2eee0cab3d5a43e4c22641e2..a273d1ca492c061a7b0acae1ff44f715a870e2e3 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -86,7 +86,7 @@ Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n\
  -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help.)\n\
 \n\
 For internal use: dpkg --assert-support-predepends | --predep-package |\n\
-  --assert-working-epoch\n\
+  --assert-working-epoch | --assert-longfilenames\n\
 \n\
 Options:\n\
   --admindir=<directory>     Use <directory> instead of %s\n\
@@ -320,32 +320,33 @@ static const struct cmdinfo cmdinfos[]= {
    */
 #define ACTION(longopt,shortopt,code,function) \
  { longopt, shortopt, 0,0,0, setaction, code, 0, (voidfnp)function }
-  ACTION( "install",                        'i', act_install,       archivefiles    ),
-  ACTION( "unpack",                          0,  act_unpack,        archivefiles    ),
-  ACTION( "record-avail",                   'A', act_avail,         archivefiles    ),
-  ACTION( "configure",                       0,  act_configure,     packages        ),
-  ACTION( "remove",                         'r', act_remove,        packages        ),
-  ACTION( "purge",                          'P', act_purge,         packages        ),
+  ACTION( "install",                        'i', act_install,              archivefiles    ),
+  ACTION( "unpack",                          0,  act_unpack,               archivefiles    ),
+  ACTION( "record-avail",                   'A', act_avail,                archivefiles    ),
+  ACTION( "configure",                       0,  act_configure,            packages        ),
+  ACTION( "remove",                         'r', act_remove,               packages        ),
+  ACTION( "purge",                          'P', act_purge,                packages        ),
   ACTION( "listfiles",                      'L', act_listfiles,     enqperpackage   ),
-  ACTION( "status",                         's', act_status,        enqperpackage   ),
-  ACTION( "get-selections",                  0,  act_getselections, getselections   ),
-  ACTION( "set-selections",                  0,  act_setselections, setselections   ),
-  ACTION( "print-avail",                    'p', act_printavail,    enqperpackage   ),
-  ACTION( "update-avail",                    0,  act_avreplace,     updateavailable ),
-  ACTION( "merge-avail",                     0,  act_avmerge,       updateavailable ),
-  ACTION( "clear-avail",                     0,  act_avclear,       updateavailable ),
-  ACTION( "forget-old-unavail",              0,  act_forgetold,     forgetold       ),
-  ACTION( "audit",                          'C', act_audit,         audit           ),
-  ACTION( "yet-to-unpack",                   0,  act_unpackchk,     unpackchk       ),
-  ACTION( "list",                           'l', act_listpackages,  listpackages    ),
-  ACTION( "search",                         'S', act_searchfiles,   searchfiles     ),
-  ACTION( "print-architecture",              0,  act_printarch,     printarch       ),
-  ACTION( "print-gnu-build-architecture",    0,  act_printgnuarch,  printarch       ),
-  ACTION( "assert-support-predepends",       0,  act_assertpredep,  assertpredep    ),
-  ACTION( "assert-working-epoch",            0,  act_assertepoch,   assertepoch     ),
-  ACTION( "print-installation-architecture", 0,  act_printinstarch, printinstarch   ),
-  ACTION( "predep-package",                  0,  act_predeppackage, predeppackage   ),
-  ACTION( "compare-versions",                0,  act_cmpversions,   cmpversions     ),
+  ACTION( "status",                         's', act_status,               enqperpackage   ),
+  ACTION( "get-selections",                  0,  act_getselections,        getselections   ),
+  ACTION( "set-selections",                  0,  act_setselections,        setselections   ),
+  ACTION( "print-avail",                    'p', act_printavail,           enqperpackage   ),
+  ACTION( "update-avail",                    0,  act_avreplace,            updateavailable ),
+  ACTION( "merge-avail",                     0,  act_avmerge,              updateavailable ),
+  ACTION( "clear-avail",                     0,  act_avclear,              updateavailable ),
+  ACTION( "forget-old-unavail",              0,  act_forgetold,            forgetold       ),
+  ACTION( "audit",                          'C', act_audit,                audit           ),
+  ACTION( "yet-to-unpack",                   0,  act_unpackchk,            unpackchk       ),
+  ACTION( "list",                           'l', act_listpackages,         listpackages    ),
+  ACTION( "search",                         'S', act_searchfiles,          searchfiles     ),
+  ACTION( "print-architecture",              0,  act_printarch,            printarch       ),
+  ACTION( "print-gnu-build-architecture",    0,  act_printgnuarch,         printarch       ),
+  ACTION( "assert-support-predepends",       0,  act_assertpredep,         assertpredep    ),
+  ACTION( "assert-working-epoch",            0,  act_assertepoch,          assertepoch     ),
+  ACTION( "assert-long-filenames",           0,  act_assertlongfilenames,  assertlongfilenames ),
+  ACTION( "print-installation-architecture", 0,  act_printinstarch,        printinstarch   ),
+  ACTION( "predep-package",                  0,  act_predeppackage,        predeppackage   ),
+  ACTION( "compare-versions",                0,  act_cmpversions,          cmpversions     ),
   
   { "pending",           'a',  0,  &f_pending,     0,  0,             1              },
   { "recursive",         'R',  0,  &f_recursive,   0,  0,             1              },

diff --git a/main/main.h b/main/main.h
index f41b51aba7b7963ee4fbf797a4be1b2d6a02a22c..03ad1f9d1ca848b562603096890b1d5246e462e4 100644 (file)
--- a/main/main.h
+++ b/main/main.h
@@ -54,7 +54,7 @@ enum action { act_unset, act_install, act_unpack, act_avail, act_configure,
               act_assertpredep, act_printarch, act_predeppackage, act_cmpversions,
               act_printinstarch, act_compareversions, act_printavail, act_avclear,
               act_forgetold, act_getselections, act_setselections, act_printgnuarch,
-              act_assertepoch };
+              act_assertepoch, act_assertlongfilenames };
 
 enum conffopt {
   cfof_prompt        =     001,
@@ -116,6 +116,7 @@ void searchfiles(const char *const *argv);
 void enqperpackage(const char *const *argv);
 void assertepoch(const char *const *argv);
 void assertpredep(const char *const *argv);
+void assertlongfilenames(const char *const *argv);
 void predeppackage(const char *const *argv);
 void printarch(const char *const *argv);
 void printinstarch(const char *const *argv);