To: vim-dev@vim.org Subject: Patch 6.1.140 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.140 Problem: Cygwin: ":args `ls *.c`" does not work if the shell command produces CR NL line separators. Solution: Remove the CR characters ourselfs. (Pavol Juhas) Files: src/os_unix.c *** ../vim61.139/src/os_unix.c Sat Jun 8 19:05:54 2002 --- src/os_unix.c Mon Jul 15 21:08:16 2002 *************** *** 4567,4573 **** /* * read the names from the file into memory */ ! fd = fopen((char *)tempname, "r"); if (fd == NULL) { /* Something went wrong, perhaps a file name with a special char. */ --- 4567,4573 ---- /* * read the names from the file into memory */ ! fd = fopen((char *)tempname, READBIN); if (fd == NULL) { /* Something went wrong, perhaps a file name with a special char. */ *************** *** 4603,4608 **** --- 4603,4618 ---- return FAIL; } vim_free(tempname); + + #if defined(__CYGWIN__) || defined(__CYGWIN32__) + /* Translate into . Caution, buffer may contain NUL. */ + p = buffer; + for (i = 0; i < len; ++i) + if (!(buffer[i] == CR && buffer[i + 1] == NL)) + *p++ = buffer[i]; + len = p - buffer; + # endif + /* file names are separated with Space */ if (shell_style == STYLE_ECHO) *** ../vim61.139/src/version.c Sun Jul 21 21:29:47 2002 --- src/version.c Sun Jul 21 21:34:53 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 140, /**/ -- hundred-and-one symptoms of being an internet addict: 21. Your dog has its own home page. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///