[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-309-g2ccd37b

[Guillem Jover]

The following commit has been merged in the master branch:
commit 0e63ea3ee1a247e581eef0fdee453d09f7a358f7
Author: Guillem Jover <guil...@debian.org>
Date:   Wed Sep 7 06:20:43 2011 +0200

    Do not include trailing slash for directory string literals
    
    This makes it more natural to manage the directory names, and avoids
    some doubled slashes.

diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h
index 3bfbd7a..a242606 100644
--- a/lib/dpkg/dpkg.h
+++ b/lib/dpkg/dpkg.h
@@ -64,12 +64,12 @@ DPKG_BEGIN_DECLS
 #define DIVERSIONSFILE    "diversions"
 #define STATOVERRIDEFILE  "statoverride"
 #define UPDATESDIR        "updates/"
-#define INFODIR           "info/"
-#define TRIGGERSDIR       "triggers/"
+#define INFODIR           "info"
+#define TRIGGERSDIR       "triggers"
 #define TRIGGERSFILEFILE  "File"
 #define TRIGGERSDEFERREDFILE "Unincorp"
 #define TRIGGERSLOCKFILE  "Lock"
-#define CONTROLDIRTMP     "tmp.ci/"
+#define CONTROLDIRTMP     "tmp.ci"
 #define IMPORTANTTMP      "tmp.i"
 #define REASSEMBLETMP     "reassemble" DEBEXT
 #define IMPORTANTMAXLEN    10
diff --git a/lib/dpkg/trigdeferred.l b/lib/dpkg/trigdeferred.l
index 2fa8e2d..31e8e63 100644
--- a/lib/dpkg/trigdeferred.l
+++ b/lib/dpkg/trigdeferred.l
@@ -101,6 +101,7 @@ constructfn(struct varbuf *vb, const char *dir, const char 
*tail)
 {
        varbuf_reset(vb);
        varbuf_add_str(vb, dir);
+       varbuf_add_char(vb, '/');
        varbuf_add_str(vb, tail);
        varbuf_end_str(vb);
 }
diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c
index 324ba57..13280d2 100644
--- a/lib/dpkg/triglib.c
+++ b/lib/dpkg/triglib.c
@@ -253,6 +253,7 @@ trk_explicit_start(const char *trig)
 
        varbuf_reset(&trk_explicit_fn);
        varbuf_add_str(&trk_explicit_fn, triggersdir);
+       varbuf_add_char(&trk_explicit_fn, '/');
        varbuf_add_str(&trk_explicit_fn, trig);
        varbuf_end_str(&trk_explicit_fn);
 
diff --git a/src/filesdb.c b/src/filesdb.c
index efe860b..990a488 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -82,6 +82,7 @@ pkgadminfile(struct pkginfo *pkg, const char *filetype)
 
   varbuf_reset(&vb);
   varbuf_add_str(&vb, infodir);
+  varbuf_add_char(&vb, '/');
   varbuf_add_str(&vb, pkg->name);
   varbuf_add_char(&vb, '.');
   varbuf_add_str(&vb, filetype);
diff --git a/src/infodb.c b/src/infodb.c
index e02d78c..bd4f7b4 100644
--- a/src/infodb.c
+++ b/src/infodb.c
@@ -61,6 +61,7 @@ pkg_infodb_foreach(struct pkginfo *pkg, pkg_infodb_file_func 
*func)
        size_t db_path_len;
 
        varbuf_add_str(&db_path, pkgadmindir());
+       varbuf_add_char(&db_path, '/');
        db_path_len = db_path.used;
        varbuf_add_char(&db_path, '\0');
 
diff --git a/src/processarc.c b/src/processarc.c
index 250c38c..811b5f2 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -406,12 +406,10 @@ void process_archive(const char *filename) {
     strcpy(cidir,admindir);
     strcat(cidir, "/" CONTROLDIRTMP);
 
-    cidirrest = cidir + strlen(cidir);
-
-    assert(*cidir && cidirrest[-1] == '/');
-    cidirrest[-1] = '\0';
     ensure_pathname_nonexisting(cidir);
-    cidirrest[-1] = '/';
+
+    strcat(cidir, "/");
+    cidirrest = cidir + strlen(cidir);
   }
 
   push_cleanup(cu_cidir, ~0, NULL, 0, 2, (void *)cidir, (void *)cidirrest);

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org