r414 - trunk/vim/debian/patches

James Vega jamessan-guest at costa.debian.org
Fri Nov 25 22:58:28 UTC 2005


Author: jamessan-guest
Date: 2005-11-25 22:58:27 +0000 (Fri, 25 Nov 2005)
New Revision: 414

Modified:
   trunk/vim/debian/patches/304_memline.c.diff
Log:
Fix the segfault bug that was occuring and return successfully when the path is
fully expanded.


Modified: trunk/vim/debian/patches/304_memline.c.diff
===================================================================
--- trunk/vim/debian/patches/304_memline.c.diff	2005-11-23 09:16:18 UTC (rev 413)
+++ trunk/vim/debian/patches/304_memline.c.diff	2005-11-25 22:58:27 UTC (rev 414)
@@ -1,7 +1,7 @@
-diff -urN vim64/src/memline.c vim64.new/src/memline.c
---- vim64/src/memline.c	2005-02-17 05:02:53.000000000 -0500
-+++ vim64.new/src/memline.c	2005-11-18 09:18:01.000000000 -0500
-@@ -3251,6 +3251,64 @@
+diff -u vim64.new/src/memline.c vim64.new/src/memline.c
+--- vim64.new/src/memline.c	2005-11-18 09:18:01.000000000 -0500
++++ vim64.new/src/memline.c	2005-11-25 17:41:04.000000000 -0500
+@@ -3251,6 +3251,69 @@
      }
  }
  
@@ -24,7 +24,7 @@
 +	    if (errno == EINVAL)  /* found non-symlink */
 +		STRCPY(buf, tmp);
 +	    else
-+		return -1;
++		return ret;
 +	}
 +	else
 +	{
@@ -40,14 +40,14 @@
 +		p = tmp + STRLEN(tmp) - 1;
 +		while (!vim_ispathsep(*p) && (p >= tmp))
 +		    --p;
-+		if (p != tmp)
-+		{
++		if (p >= tmp) /* pathsep was found */
 +		    p = vim_strnsave(tmp, p - tmp);
-+		    dir = concat_fnames(p, buf, TRUE);
-+		    STRNCPY(tmp, dir, PATH_MAX);
-+		    vim_free(dir);
-+		    vim_free(p);
-+		}
++		else
++		    p = vim_strsave(".");
++		dir = concat_fnames(p, buf, TRUE);
++		STRNCPY(tmp, dir, PATH_MAX);
++		vim_free(dir);
++		vim_free(p);
 +	    }
 +	    else
 +		STRNCPY(tmp, buf, PATH_MAX);
@@ -60,13 +60,18 @@
 +     * directories.
 +     */
 +    if (vim_FullName(buf, tmp, PATH_MAX, TRUE) == OK)
++    {
 +	STRCPY(buf, tmp);
++	return 0;
++    }
++    else
++	return ret;
 +}
 +
  /*
   * make swap file name out of the file name and a directory name
   */
-@@ -3260,6 +3318,8 @@
+@@ -3260,6 +3323,8 @@
      char_u	*dir_name;
  {
      char_u	*r, *s;
@@ -75,7 +80,7 @@
  
  #if defined(UNIX) || defined(WIN3264)  /* Need _very_ long file names */
      s = dir_name + STRLEN(dir_name);
-@@ -3275,6 +3335,12 @@
+@@ -3275,6 +3340,12 @@
      }
  #endif
  
@@ -88,7 +93,7 @@
      r = buf_modname(
  #ifdef SHORT_FNAME
  	    TRUE,
-@@ -3285,7 +3351,7 @@
+@@ -3285,7 +3356,7 @@
  	    /* Avoid problems if fname has special chars, eg <Wimp$Scrap> */
  	    buf->b_ffname,
  #else




More information about the pkg-vim-maintainers mailing list