rgw: fix bug with rgw-gap-list

ivancich · ivancich · commit 0cfbc57d2c43 · 2025-03-26T13:58:30.000-04:00
rgw-gap-list would fail if it it reached the end of the second file
before the first, thereby causing an infinite loop.

Signed-off-by: J. Eric Ivancich &lt;ivancich@redhat.com&gt;
Signed-off-by: Michael J. Kidd &lt;linuxkidd@gmail.com&gt;
diff --git a/src/rgw/rgw-gap-list b/src/rgw/rgw-gap-list
@@ -400,9 +400,12 @@ BEGIN {
   f1_count++
   if(f2_eof==0) {
     if(test_lines()==2) {
-      while ($1>b[1]) {
+      while ($1>b[1] && !f2_eof) {
         advance_f2()
       }
+      if (f2_eof) {
+        line_out()
+      }
       test_lines()
     }
   } else {

Original file line number	Diff line number	Diff line change
`@@ -400,9 +400,12 @@ BEGIN {`
`400`	`400`	`f1_count++`
`401`	`401`	`if(f2_eof==0) {`
`402`	`402`	`if(test_lines()==2) {`
`403`		`- while ($1>b[1]) {`
	`403`	`+ while ($1>b[1] && !f2_eof) {`
`404`	`404`	`advance_f2()`
`405`	`405`	`}`
	`406`	`+ if (f2_eof) {`
	`407`	`+ line_out()`
	`408`	`+ }`
`406`	`409`	`test_lines()`
`407`	`410`	`}`
`408`	`411`	`} else {`