From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sun, 30 Aug 2009 17:49:38 +0000 (-0400)
Subject: Fix uninitialized value when editing a page being vivified from the
X-Git-Tag: 3.14159265~61^2~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e972cadf78ba511af33ba19d40c5b6156569120d;p=ikiwiki.git

Fix uninitialized value when editing a page being vivified from the
basewiki. Makes the filetype-testing logic more explicit anyway.
---

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 66e9463be..fa4c4da8e 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -226,13 +226,18 @@ sub rcs_add ($) {
 	}
 
 	while ($file = pop @files_to_add) {
-		if ((@files_to_add == 0) &&
-			(File::MimeInfo::default $file ne 'text/plain')) {
-			# it's a binary file, add specially
-			cvs_runcvs(['add', '-kb', $file]) ||
-				warn("cvs add $file failed\n");
+		if (@files_to_add == 0) {
+			# file
+			my $filemime = File::MimeInfo::default($file);
+			if (defined($filemime) && $filemime eq 'text/plain') {
+				cvs_runcvs(['add', $file]) ||
+					warn("cvs add $file failed\n");
+			} else {
+				cvs_runcvs(['add', '-kb', $file]) ||
+					warn("cvs add binary $file failed\n");
+			}
 		} else {
-			# directory or regular file
+			# directory
 			cvs_runcvs(['add', $file]) ||
 				warn("cvs add $file failed\n");
 		}