From 88f1af6092edef582e05fbebaf7780bd7cde0504 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 22 Mar 2011 15:27:56 +0000
Subject: [PATCH] Extract read_only_bottom() from
 read_only_bottom_close_and_rename()'s code.

---
 regen/regen_lib.pl | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/regen/regen_lib.pl b/regen/regen_lib.pl
index 85defb9..a243ee6 100644
--- a/regen/regen_lib.pl
+++ b/regen/regen_lib.pl
@@ -132,12 +132,9 @@ EOM
     return $cooked;
 }
 
-sub read_only_bottom_close_and_rename {
-    my ($fh, $sources) = @_;
-    my $name = *{$fh}->{name};
-    my $lang = *{$fh}->{lang};
-    die "No final name specified at open time for $name"
-	unless *{$fh}->{final_name};
+sub read_only_bottom {
+    my ($sources, $lang) = @_;
+
     my $comment;
     if ($sources) {
 	$comment = "Generated from:\n";
@@ -148,14 +145,25 @@ sub read_only_bottom_close_and_rename {
     }
     $comment .= "ex: set ro:";
 
-    if ($lang eq 'Perl') {
+    if (defined $lang && $lang eq 'Perl') {
 	$comment =~ s/^/# /mg;
     } else {
 	$comment =~ s/^/ * /mg;
 	$comment =~ s! \* !/* !;
 	$comment .= " */";
     }
-    print $fh "\n$comment\n";
+    return "$comment\n";
+}
+
+sub read_only_bottom_close_and_rename {
+    my ($fh, $sources) = @_;
+    my $name = *{$fh}->{name};
+    my $lang = *{$fh}->{lang};
+    die "No final name specified at open time for $name"
+	unless *{$fh}->{final_name};
+
+    print $fh "\n", read_only_bottom($sources, $lang);
+
     safer_close($fh);
     rename_if_different($name, *{$fh}->{final_name});
 }
-- 
2.7.4