SOURCES: mc-bash-3.2.patch - proper patch from mc CVS

[baggins]

Author: baggins                      Date: Wed Dec 13 15:54:44 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- proper patch from mc CVS

---- Files affected:
SOURCES:
   mc-bash-3.2.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mc-bash-3.2.patch
diff -u SOURCES/mc-bash-3.2.patch:1.1 SOURCES/mc-bash-3.2.patch:1.2
--- SOURCES/mc-bash-3.2.patch:1.1	Tue Nov  7 20:39:24 2006
+++ SOURCES/mc-bash-3.2.patch	Wed Dec 13 16:54:38 2006
@@ -1,30 +1,31 @@
-diff -Naur mc-4.6.1-orig/src/subshell.c mc-4.6.1/src/subshell.c
---- mc-4.6.1-orig/src/subshell.c	2005-06-07 02:19:19.000000000 -0700
-+++ mc-4.6.1/src/subshell.c	2006-11-03 12:54:30.000000000 -0800
-@@ -722,17 +722,7 @@
+===================================================================
+RCS file: /var/lib/cvs/sources/mc/mc/src/subshell.c,v
+retrieving revision 1.92
+retrieving revision 1.93
+diff -u -r1.92 -r1.93
+--- mc/mc/src/subshell.c	2006/05/08 14:38:36	1.92
++++ mc/mc/src/subshell.c	2006/11/27 21:33:46	1.93
+@@ -747,16 +747,19 @@
+ 
+     /*
       * Print every character in octal format with the leading backslash.
-      * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like them.
+-     * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like them.
++     * bash >= 3.2, tcsh and zsh require 4-digit octals, 2.05b <= bash < 3.2
++     * support 3-digit octals as well as 4-digit octals.
++     * For bash < 2.05b fix below to use 3-digit octals.
       */
--    if (subshell_type == BASH) {
--	for (; *s; s++) {
+     if (subshell_type == BASH) {
+ 	for (; *s; s++) {
 -	    /* Must quote numbers, so that they are not glued to octals */
--	    if (isalpha ((unsigned char) *s)) {
--		*d++ = (unsigned char) *s;
--	    } else {
++	    /* Must quote numbers, so that they are not glued to octals
++	       for bash < 3.2 */
+ 	    if (isalpha ((unsigned char) *s)) {
+ 		*d++ = (unsigned char) *s;
+ 	    } else {
 -		sprintf (d, "\\%03o", (unsigned char) *s);
 -		d += 4;
--	    }
--	}
--    } else {
-+
- 	for (; *s; s++) {
- 	    if (isalnum ((unsigned char) *s)) {
- 		*d++ = (unsigned char) *s;
-@@ -741,7 +731,6 @@
- 		d += 5;
++		sprintf (d, "\\0%03o", (unsigned char) *s);
++		d += 5;
  	    }
  	}
--    }
- 
-     memcpy (d, common_end, sizeof (common_end));
- 
+     } else {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mc-bash-3.2.patch?r1=1.1&r2=1.2&f=u