poldek: poldek/pkgiter.c - prefixing with / non prefixed paths only

mis mis at pld-linux.org
Sun Jan 27 19:43:10 CET 2008


Author: mis                          Date: Sun Jan 27 18:43:10 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- prefixing with / non prefixed paths only

---- Files affected:
poldek/poldek:
   pkgiter.c (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: poldek/poldek/pkgiter.c
diff -u poldek/poldek/pkgiter.c:1.2 poldek/poldek/pkgiter.c:1.3
--- poldek/poldek/pkgiter.c:1.2	Wed Jan 23 16:01:45 2008
+++ poldek/poldek/pkgiter.c	Sun Jan 27 19:43:05 2008
@@ -193,11 +193,18 @@
     if (it->ndir < n_array_size(it->requiredirs)) {
         const char *path = n_array_nth(it->requiredirs, it->ndir);
         char tmp[PATH_MAX];
-
-        n_snprintf(tmp, sizeof(tmp), "/%s", path);
+        const char *rname = tmp;
+        
+        if (*path == '/')
+            rname = path;
+        else
+            n_snprintf(tmp, sizeof(tmp), "/%s", path);
+        
         
         it->ndir++;
-        it->req = capreq_new(NULL, tmp, 0, NULL, NULL, 0,
+        DBGF("%s %s\n", pkg_id(it->pkg), rname);
+        
+        it->req = capreq_new(NULL, rname, 0, NULL, NULL, 0,
                              CAPREQ_BASTARD | CAPREQ_ISDIR);
         it->current_req_type = PKG_ITER_REQIN;/* autodirdeps are always REQIN */
         return it->req;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/pkgiter.c?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list