]> git.pld-linux.org Git - packages/rpm.git/blob - rpm-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch
- quiet -qa output, we're not interested in it here
[packages/rpm.git] / rpm-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch
1 --- rpm-5.4.9/lib/psm.c.slash~  2012-05-15 03:47:32.000000000 +0200
2 +++ rpm-5.4.9/lib/psm.c 2012-05-15 03:49:04.075347677 +0200
3 @@ -1463,11 +1463,15 @@ static rpmRC runTriggersLoop(rpmpsm psm,
4         ARGint_t vals;
5  
6         depName = _free(depName);
7 -       depName = (char *) xmalloc(nName + 1 + 1);
8 -       (void) stpcpy(depName, Name);
9 -       /* XXX re-add the pesky trailing '/' to dirnames. */
10 -       depName[nName] = (tagno == RPMTAG_DIRNAMES ? '/' : '\0');
11 -       depName[nName+1] = '\0';
12 +       if (!strcmp(Name, "/"))
13 +               depName = xstrdup(Name);
14 +       else {
15 +           depName = xmalloc(nName + 1 + 1);
16 +           (void) stpcpy(depName, Name);
17 +           /* XXX re-add the pesky trailing '/' to dirnames. */
18 +           depName[nName] = (tagno == RPMTAG_DIRNAMES ? '/' : '\0');
19 +           depName[nName+1] = '\0';
20 +       }
21  
22         if (depName[0] == '/' && psm->Tmires != NULL) {
23             miRE mire;
This page took 0.026896 seconds and 3 git commands to generate.