Blame rpm-debugedit-incremental-fix.patch
|
Paul Nasrat |
fbf185c |
--- rpm-4.4.2/tools/debugedit.c.jj 2007-04-20 21:27:50.000000000 +0200
|
|
Paul Nasrat |
fbf185c |
+++ rpm-4.4.2/tools/debugedit.c 2007-04-20 23:07:27.000000000 +0200
|
|
Paul Nasrat |
fbf185c |
@@ -371,9 +371,10 @@ canonicalize_path (const char *s, char *
|
|
Paul Nasrat |
fbf185c |
|
|
Paul Nasrat |
fbf185c |
if (s[0] == '.' && (s[1] == 0 || IS_DIR_SEPARATOR (s[1])))
|
|
Paul Nasrat |
fbf185c |
{
|
|
Paul Nasrat |
fbf185c |
- s ++;
|
|
Paul Nasrat |
fbf185c |
- if (!*s && d > droot)
|
|
Paul Nasrat |
fbf185c |
- d--;
|
|
Paul Nasrat |
fbf185c |
+ s++;
|
|
Paul Nasrat |
fbf185c |
+ if (*s)
|
|
Paul Nasrat |
fbf185c |
+ while (IS_DIR_SEPARATOR (*s))
|
|
Paul Nasrat |
fbf185c |
+ ++s;
|
|
Paul Nasrat |
fbf185c |
}
|
|
Paul Nasrat |
fbf185c |
|
|
Paul Nasrat |
fbf185c |
else if (s[0] == '.' && s[1] == '.'
|
|
Paul Nasrat |
fbf185c |
@@ -401,8 +402,6 @@ canonicalize_path (const char *s, char *
|
|
Paul Nasrat |
fbf185c |
if (*s)
|
|
Paul Nasrat |
fbf185c |
while (IS_DIR_SEPARATOR (*s))
|
|
Paul Nasrat |
fbf185c |
s++;
|
|
Paul Nasrat |
fbf185c |
- else if (d > droot)
|
|
Paul Nasrat |
fbf185c |
- d--;
|
|
Paul Nasrat |
fbf185c |
}
|
|
Paul Nasrat |
fbf185c |
}
|
|
Paul Nasrat |
fbf185c |
else
|
|
Paul Nasrat |
fbf185c |
@@ -411,7 +410,6 @@ canonicalize_path (const char *s, char *
|
|
Paul Nasrat |
fbf185c |
*d++ = *s++;
|
|
Paul Nasrat |
fbf185c |
}
|
|
Paul Nasrat |
fbf185c |
}
|
|
Paul Nasrat |
fbf185c |
-
|
|
Paul Nasrat |
fbf185c |
else
|
|
Paul Nasrat |
fbf185c |
{
|
|
Paul Nasrat |
fbf185c |
while (*s && ! IS_DIR_SEPARATOR (*s))
|