i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

awk: fix regexp errors

Browse Source 
As of awk version 5.0.0 the regexp library used switched to GNULIB.
This means that using \" is no longer escaping the quotation mark but only
matching a literal backslash followed by a quotation mark.

Another project that dealt with the same warning is here:
https://github.com/soimort/translate-shell/issues/285

Change-Id: If465b5966e448591acdae9e764c22bc2fce79f5d
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8836
Reviewed-by: Adrien Destugues <[email protected]>
Tested-by: Commit checker robot <[email protected]>
Haiku-Format: Haiku-format Bot <[email protected]>
This commit is contained in:
Dave Slusher
2025-01-28 16:44:06 +00:00
committed by waddlesplash
parent c96e40d299
commit 36fac427b5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/devices/pci-header.awk
+6 -6
View File
@@ -47,7 +47,7 @@ BEGIN {
# store vendor ID for possible devices afterwards # store vendor ID for possible devices afterwards
vendorid = $1 vendorid = $1
vendor = substr($0, 7) vendor = substr($0, 7)
gsub( /\"/, "&&", vendor ) gsub( /"/, "&&", vendor )
# Remove double interrogation points that may be interpreted as trigraphs # Remove double interrogation points that may be interpreted as trigraphs
gsub( /\?\?\?/, "xxx", vendor ) gsub( /\?\?\?/, "xxx", vendor )
@@ -61,7 +61,7 @@ BEGIN {
device = substr($0, 8) device = substr($0, 8)
gsub( /\\/, "&&", device ) gsub( /\\/, "&&", device )
gsub( /\"/, "&&", device ) gsub( /"/, "&&", device )
# Remove double interrogation points that may be interpreted as trigraphs # Remove double interrogation points that may be interpreted as trigraphs
gsub( /\?\?\?/, "xxx", device ) gsub( /\?\?\?/, "xxx", device )
@@ -81,7 +81,7 @@ BEGIN {
/^\t\t[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]] / { /^\t\t[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]] / {
device = substr($0, 14) device = substr($0, 14)
gsub( /\"/, "\\\"", device ) gsub( /"/, "\\\"", device )
devicecount++ devicecount++
devices[devicecount, 1] = vendorid devices[devicecount, 1] = vendorid
@@ -96,7 +96,7 @@ BEGIN {
class = $2 class = $2
classname = substr($0, 7) classname = substr($0, 7)
gsub( /\"/, "\\\"", classname ) gsub( /"/, "\\\"", classname )
} }
# match subclass, use device class data captured earlier, and output # match subclass, use device class data captured earlier, and output
@@ -104,7 +104,7 @@ BEGIN {
subclass = $1 subclass = $1
subclassname = substr($0, 6) subclassname = substr($0, 6)
gsub( /\"/, "\\\"", subclassname ) gsub( /"/, "\\\"", subclassname )
classcount++ classcount++
classes[classcount, 1] = class classes[classcount, 1] = class
@@ -120,7 +120,7 @@ BEGIN {
proginterface = $1 proginterface = $1
proginterfacename = substr($0, 7) proginterfacename = substr($0, 7)
gsub( /\"/, "\\\"", proginterfacename ) gsub( /"/, "\\\"", proginterfacename )
classcount++ classcount++
classes[classcount, 1] = class classes[classcount, 1] = class
src/apps/devices/usb-header.awk
+5 -5
View File
@@ -49,7 +49,7 @@ BEGIN {
# store vendor ID for possible devices afterwards # store vendor ID for possible devices afterwards
vendorid = $1 vendorid = $1
vendor = substr($0, 7) vendor = substr($0, 7)
gsub( /\"/, "&&", vendor ) gsub( /"/, "&&", vendor )
# Remove double interrogation points that may be interpreted as trigraphs # Remove double interrogation points that may be interpreted as trigraphs
gsub( /\?\?\?/, "xxx", vendor ) gsub( /\?\?\?/, "xxx", vendor )
@@ -63,7 +63,7 @@ BEGIN {
device = substr($0, 8) device = substr($0, 8)
gsub( /\\/, "&&", device ) gsub( /\\/, "&&", device )
gsub( /\"/, "&&", device ) gsub( /"/, "&&", device )
# Remove double interrogation points that may be interpreted as trigraphs # Remove double interrogation points that may be interpreted as trigraphs
gsub( /\?\?\?/, "xxx", device ) gsub( /\?\?\?/, "xxx", device )
@@ -82,7 +82,7 @@ BEGIN {
class = $2 class = $2
classname = substr($0, 7) classname = substr($0, 7)
gsub( /\"/, "\\\"", classname ) gsub( /"/, "\\\"", classname )
inClassesDefinition = 1 inClassesDefinition = 1
@@ -99,7 +99,7 @@ BEGIN {
inClassesDefinition && (/^\t[[:xdigit:]][[:xdigit:]] /) { inClassesDefinition && (/^\t[[:xdigit:]][[:xdigit:]] /) {
subclass = $1 subclass = $1
subclassname = substr($0, 6) subclassname = substr($0, 6)
gsub( /\"/, "\\\"", subclassname ) gsub( /"/, "\\\"", subclassname )
classcount++ classcount++
classes[classcount, 1] = class classes[classcount, 1] = class
@@ -115,7 +115,7 @@ inClassesDefinition && (/^\t\t[[:xdigit:]][[:xdigit:]] /) {
protocol = $1 protocol = $1
protocolname = substr($0, 7) protocolname = substr($0, 7)
gsub( /\"/, "\\\"", protocolname ) gsub( /"/, "\\\"", protocolname )
classcount++ classcount++
classes[classcount, 1] = class classes[classcount, 1] = class