* Fixed use portable method for escaping symbol for gawk 3 and 4

openlink · Mar 8, 2012 · b01c641 · b01c641
1 parent b44bb09
commit b01c641
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk
@@ -30,13 +30,7 @@ BEGIN   {
 	}
 	{
 	  fun = $0
-	  # was: gsub ( /\\/, "\\\\", fun)
-	  q = "\\\\"
-	  if (PROCINFO["version"] ~ /^4/)
-	    gsub ( q, q q, fun)
-	  else
-	    gsub ( q, q, fun)
-
+          gsub ( "\\\\", "&&", fun)
 	  gsub ( /"/, "\\\"", fun)
 	  gsub ( /\$/, "\\044", fun)
 	  gsub ( /.*/, "\"&\\n\",", fun)

diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk
@@ -42,7 +42,7 @@ END {
     }
 
   x = $0
-  gsub (/\\/, "\\\\", x)
+  gsub ( "\\\\", "&&", x)
   gsub (/\"/, "\\\"", x)
   print "\"" x "\\n\""
 }
diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk
@@ -48,7 +48,7 @@ END {
     }
 
   x = $0
-  gsub (/\\/, "\\\\", x)
+  gsub ( "\\\\", "&&", x)
   gsub (/\"/, "\\\"", x)
   print "\"" x "\\n\""
 }
diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk
@@ -54,7 +54,7 @@ BEGIN {
       print "  ses := string_output ();"
     }
   str = $0
-  gsub ( /\\/, "\\\\", str)
+  gsub ( "\\\\", "&&", str)
   gsub ( /'/, "\\'", str)
 
   #

diff --git a/libsrc/Wi/sql_to_c.awk b/libsrc/Wi/sql_to_c.awk
@@ -343,13 +343,7 @@ BEGIN   {
 
                 # does escape the symbols
 		fun = $0
-		q = "\\\\"
-		if (PROCINFO["version"] ~ /^4/)
-		    gsub ( q, q q, fun)
-		else
-		    gsub ( q, q, fun)
-
-	        #WAS: gsub ( /\\/, "\\\\", fun)
+		gsub ("\\\\", "&&", fun)
 
 		# remove whitespace except when there is just a semicolon
 		if ((in_xsl_mode == 0) && (in_xsd_mode == 0))