Attachment 150040 Details for Bug 232222 – rpm-4.4.2-debugedit-canonicalize-path.patch

[patch] rpm-4.4.2-debugedit-canonicalize-path.patch

P (text/plain), 1.37 KB, created by Jakub Jelinek on 2007-03-14 14:47:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelinek

Created: 2007-03-14 14:47:03 UTC

Size: 1.37 KB

patch

obsolete

>--- tools/debugedit.c.jj	2007-03-14 14:11:04.000000000 +0100
>+++ tools/debugedit.c	2007-03-14 15:39:34.000000000 +0100
>@@ -372,38 +372,43 @@ canonicalize_path (const char *s, char *
>       if (s[0] == '.' && (s[1] == 0 || IS_DIR_SEPARATOR (s[1])))
> 	{
> 	  s ++;
>-	  if (*s)
>-	    s++;
>-	  else if (d > droot)
>+	  if (!*s && d > droot)
> 	    d--;
> 	}
> 
>       else if (s[0] == '.' && s[1] == '.'
> 	       && (s[2] == 0 || IS_DIR_SEPARATOR (s[2])))
> 	{
>-	  char *pre = d-1; /* includes slash */
>+	  char *pre = d - 1; /* includes slash */
> 	  while (droot < pre && IS_DIR_SEPARATOR (*pre))
> 	    pre--;
> 	  if (droot <= pre && ! IS_DIR_SEPARATOR (*pre))
> 	    {
>-	      d = pre;
>-	      while (droot < d && ! IS_DIR_SEPARATOR (*d))
>-		d--;
>-	      /* d now points to the slash */
>-	      if (droot < d)
>-		d++;
>-	      s += 2;
>-	      if (*s)
>-		s++;
>-	      else if (d > droot)
>-		d--;
>+	      while (droot < pre && ! IS_DIR_SEPARATOR (*pre))
>+		pre--;
>+	      /* pre now points to the slash */
>+	      if (droot < pre)
>+		pre++;
>+	      if (pre + 3 == d && pre[0] == '.' && pre[1] == '.')
>+		{
>+		  *d++ = *s++;
>+		  *d++ = *s++;
>+		}
>+	      else
>+		{
>+		  d = pre;
>+		  s += 2;
>+		  if (*s)
>+		    while (IS_DIR_SEPARATOR (*s))
>+		      s++;
>+		  else if (d > droot)
>+		    d--;
>+		}
> 	    }
> 	  else
> 	    {
> 	      *d++ = *s++;
> 	      *d++ = *s++;
>-	      if (*s)
>-		*d++ = *s++;
> 	    }
> 	}
>

Actions: View | Diff

Attachments on bug 232222: 150040 | 153216