fishdescriptor: Work if child is not running as root, but we are

[chiark-utils.git] / backup / whatsthis

diff --git a/backup/whatsthis b/backup/whatsthis
index 00d5dfff0ec4bc910ae88f7ec137cb33613d4bd2..26315f8a4d3ab4b3c52ef1b95bb20b569adea2d3 100755 (executable)
--- a/backup/whatsthis
+++ b/backup/whatsthis
@@ -1,7 +1,28 @@
 #!/usr/bin/perl
+# whatsthis
+# read an id off the tape and display it to the user
+
+# This file is part of chiark backup, a system for backing up GNU/Linux and
+# other UN*X-compatible machines, as used on chiark.greenend.org.uk.
+#
+# chiark backup is:
+#  Copyright (C) 1997-1998,2000-2001,2007
+#                     Ian Jackson <ian@chiark.greenend.org.uk>
+#  Copyright (C) 1999 Peter Maydell <pmaydell@chiark.greenend.org.uk>
+#
+# This is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3, or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
-# whatsthis : just read an ID off the tape and display it to the user.
-# Peter Maydell <pmaydell@chiark.greenend.org.uk>
 # First rough hack; mostly just code nabbed from full. 
 # --list assumes the dump type was 'zafio', which is a bit bogus.
 
@@ -12,7 +33,7 @@
 sub rewind();
 sub stopandsay(@);
 
-$etc='/etc/backup';
+$etc='/etc/chiark-backup';
 require "$etc/settings.pl";
 require 'backuplib.pl';
 
@@ -98,7 +119,7 @@ if ($ftype =~ /POSIX tar/) {
 # Now back up so we can read the file again properly
 #system "mt -f $ntape bsf 1"; $? and stopandsay "couldn't backspace tape: $?";
 
-system "dd if=$ntape ibs=$blocksizebytes | /usr/local/lib/backup/readbuffer | $reader";
+system "dd if=$ntape ibs=$blocksizebytes | readbuffer | $reader";
 $? and stopandsay "listing failed: $?";
 
 # All's well, stop here.