- (bal) renabled 'catman-do:' and fixed it. So now catman pages should

[openssh.git] / fixpaths

diff --git a/fixpaths b/fixpaths
index 6a2a3a0b3954d860860667c236073fad0ac5d31b..7e4178e4a96753c4debff32e37a9b1a3bdd5c0c8 100755 (executable)
--- a/fixpaths
+++ b/fixpaths
@@ -3,7 +3,7 @@
 # fixpaths  - substitute makefile variables into text files
 
 
-$usage = "Usage: $0 [-D<variable>=<value>] [[infile] ...]\n";
+$usage = "Usage: $0 [-Dstring=replacement] [[infile] ...]\n";
 
 if (!defined(@ARGV)) { die ("$usage"); }
 
@@ -18,7 +18,8 @@ while ($_=$ARGV[0], /^-/) {
       die ("$usage$0: error in command line arguments.\n");
     }
   } else {
-    &usage; die ("$usage$0: unknown option '-".$ARGV[0][1]."'\n");
+    @cmd = split(//, $ARGV[0]); $opt = $cmd[1];
+    die ("$usage$0: unknown option '-$opt'\n");
   }
 } # while parsing arguments
 
@@ -29,19 +30,14 @@ if (!defined(%def)) {
 for $f (@ARGV) {
 
   $f =~ /(.*\/)*(.*)$/;
-  $of = $2; $of =~ s/.in$//;
-
-  print("Making substitutions for $of\n");
 
   open(IN, "<$f")          || die ("$0: input file $f missing!\n");
-  if (open(OUT, ">$of")) {
-    while (<IN>) {
-      for $s (keys(%def)) {
-       s#\@$s\@#$def{$s}#;
-      } # for $s
-      print OUT;
-    } # while <IN>
-  } # if (outfile open)
+  while (<IN>) {
+    for $s (keys(%def)) {
+      s#$s#$def{$s}#;
+    } # for $s
+    print;
+  } # while <IN>
 } # for $f
 
 exit 0;