Ticket #2930: 2930_patchfs.in.diff

patchfs.in

@@ -273 +273 @@
             }
             print $fh $_ if($rmmod != $filefound);
             $fsize+=length;
-            my ($first)= /^(.)/;
-            if(ord($first) == ord('+')) { $h_add++; }
-            elsif(ord($first) == ord('-')) { $h_del++; }
-            elsif(ord($first) == ord(' ')) { $h_ctx++; }
-            elsif(ord($first) == ord('\\')) { 0; }
-            elsif(ord($first) == ord('@')) { error "Malformed hunk, header came too early"; }
-            else { error "Unrecognized character in hunk"; }
+            if (/^$/) {
+                # Empty line, but should start with ' '. Diff is incorrect, but try to parse it anyway.
+                $h_ctx++;
+            } else {
+                my ($first)= /^(.)/;
+                if(ord($first) == ord('+')) { $h_add++; }
+                elsif(ord($first) == ord('-')) { $h_del++; }
+                elsif(ord($first) == ord(' ')) { $h_ctx++; }
+                elsif(ord($first) == ord('\\')) { 0; }
+                elsif(ord($first) == ord('@')) { error "Malformed hunk, header came too early"; }
+                else { error "Unrecognized character in hunk"; }
+            }
         }
     }
     if($file eq '' && $filetoprint) {