r511 - in trunk/vim: debian upstream/patches

[Pierre Habouzit]

Author: madcoder
Date: 2006-03-15 11:25:46 +0000 (Wed, 15 Mar 2006)
New Revision: 511

Added:
   trunk/vim/upstream/patches/6.4.009
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
patch 6.4.009



Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2006-03-13 22:10:44 UTC (rev 510)
+++ trunk/vim/debian/README	2006-03-15 11:25:46 UTC (rev 511)
@@ -33,3 +33,4 @@
   2320  6.4.006  ":argedit", "argdel" and ":argadd" used count argument
   1717  6.4.007  Unix: crash when expanding backticks
   2199  6.4.008  hang for 'hlsearch' highlighting in multi-byte character
+  2653  6.4.009  (after 6.4.002) VMS: updating the viminfo file fails

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2006-03-13 22:10:44 UTC (rev 510)
+++ trunk/vim/debian/changelog	2006-03-15 11:25:46 UTC (rev 511)
@@ -1,7 +1,7 @@
 vim (1:6.4-008+1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream patch (008), see README.gz for details.
+  * New upstream patch (009), see README.gz for details.
 
   [ Pierre Habouzit ]
   * Support python `as' keyword. (closes: #352885)
@@ -15,7 +15,7 @@
   * Move vimtutor.1 to the same package (vim-runtime) as vimtutor.
     Fixes a lintian warning.
 
- -- James Vega <jamessan at debian.org>  Sat, 25 Feb 2006 08:58:43 -0500
+ -- Pierre Habouzit <madcoder at debian.org>  Wed, 15 Mar 2006 12:24:10 +0100
 
 vim (1:6.4-007+1) unstable; urgency=low
 

Added: trunk/vim/upstream/patches/6.4.009
===================================================================
--- trunk/vim/upstream/patches/6.4.009	2006-03-13 22:10:44 UTC (rev 510)
+++ trunk/vim/upstream/patches/6.4.009	2006-03-15 11:25:46 UTC (rev 511)
@@ -0,0 +1,91 @@
+To: vim-dev at vim.org
+Subject: Patch 6.4.009
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.4.009 (after 6.4.002)
+Problem:    VMS: Updating the viminfo file fails.
+Solution:   Avoid using fdopen(). (Zoltan Arpadffy)
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-6.4.008/src/ex_cmds.c	Tue Nov 29 19:29:15 2005
+--- src/ex_cmds.c	Wed Mar 15 11:27:43 2006
+***************
+*** 1514,1536 ****
+  
+  	if (tempname != NULL)
+  	{
+  	    int fd;
+  
+  	    /* Use mch_open() to be able to use O_EXCL and set file
+  	     * protection same as original file, but strip s-bit. */
+! #ifdef UNIX
+  	    fd = mch_open((char *)tempname,
+  		    O_CREAT|O_EXTRA|O_EXCL|O_WRONLY,
+  				       (int)((st_old.st_mode & 0777) | 0600));
+! #else
+  	    fd = mch_open((char *)tempname,
+  		    O_CREAT|O_EXTRA|O_EXCL|O_WRONLY,
+  				       0600);	/* r&w for user only */
+! #endif
+  	    if (fd < 0)
+  		fp_out = NULL;
+  	    else
+  		fp_out = fdopen(fd, WRITEBIN);
+  
+  	    /*
+  	     * If we can't create in the same directory, try creating a
+--- 1514,1543 ----
+  
+  	if (tempname != NULL)
+  	{
++ #ifdef VMS
++ 	    /* fdopen() fails for some reason */
++ 	    umask_save = umask(077);
++ 	    fp_out = mch_fopen((char *)tempname, WRITEBIN);
++ 	    (void)umask(umask_save);
++ #else
+  	    int fd;
+  
+  	    /* Use mch_open() to be able to use O_EXCL and set file
+  	     * protection same as original file, but strip s-bit. */
+! # ifdef UNIX
+  	    fd = mch_open((char *)tempname,
+  		    O_CREAT|O_EXTRA|O_EXCL|O_WRONLY,
+  				       (int)((st_old.st_mode & 0777) | 0600));
+! # else
+  	    fd = mch_open((char *)tempname,
+  		    O_CREAT|O_EXTRA|O_EXCL|O_WRONLY,
+  				       0600);	/* r&w for user only */
+! # endif
+  	    if (fd < 0)
+  		fp_out = NULL;
+  	    else
+  		fp_out = fdopen(fd, WRITEBIN);
++ #endif /* VMS */
+  
+  	    /*
+  	     * If we can't create in the same directory, try creating a
+*** ../vim-6.4.008/src/version.c	Sat Feb 25 14:38:00 2006
+--- src/version.c	Wed Mar 15 11:23:20 2006
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     9,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+124. You begin conversations with, "Who is your internet service provider?"
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://www.ICCF.nl         ///