Do not include trailing slash for directory string literals

This makes it more natural to manage the directory names, and avoids
some doubled slashes.

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

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);
 }

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);
 

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);

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');
 

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);