X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Ftext%2Fdiff_lib.pl;h=7d60e8605716d121d05466019833284fef04b3a4;hb=4bd5169eb75c769397e1c86069f9d2356c89d63d;hp=c0ffaf7a1e88dec7c6c4e864eb4a1cb734b3a2b7;hpb=2dc7262979a054eeb1167aa60546365f1da812e1;p=feisty_meow.git

diff --git a/scripts/text/diff_lib.pl b/scripts/text/diff_lib.pl
index c0ffaf7a..7d60e860 100644
--- a/scripts/text/diff_lib.pl
+++ b/scripts/text/diff_lib.pl
@@ -23,9 +23,9 @@
 # support from CPAN.  this can be installed by using cpan and telling it
 #    install Text::Diff
 
-require "ctime.pl";
 require "filename_helper.pl";
-require "importenv.pl";
+
+use Env qw(FEISTY_MEOW_DIR);
 
 use Text::Diff;
 
@@ -71,12 +71,12 @@ sub diff_dirs {
     &differ_instructions;
     return;
   }
-  if (-l $compare_directory) {
-    # we will not operate on links, due to recursion issues.
-##    &differ_instructions;
-    print "skipping link: $compare_directory\n";
-    return;
-  }
+#  if (-l $compare_directory) {
+#    # we will not operate on links, due to recursion issues.
+###    &differ_instructions;
+#    print "skipping link: $compare_directory\n";
+#    return;
+#  }
   if (! -d $compare_directory) {
     # a missing directory is just not good.
     print "skipping missing directory: $compare_directory\n";
@@ -90,12 +90,12 @@ sub diff_dirs {
     $source_directory = $arguments[1];
   }
   $source_directory = &sanitize_name($source_directory);
-  if (-l $source_directory) {
-    # we will not operate on links, due to recursion issues.
-#    &differ_instructions;
-    print "skipping link: $source_directory\n";
-    return;
-  }
+#  if (-l $source_directory) {
+#    # we will not operate on links, due to recursion issues.
+##    &differ_instructions;
+#    print "skipping link: $source_directory\n";
+#    return;
+#  }
   if (! -d $source_directory) {
     # a missing directory is just not good.
     print "skipping missing directory: $source_directory\n";
@@ -146,7 +146,7 @@ sub print_header {
   # this function prints out the header prior to printing out any real
   # data.  if there are no diffs, the header should never get printed.
   print "$break_line\n";
-  local($printable_date) = &ctime(time);
+  local($printable_date) = scalar(localtime());
   $printable_date =~ s/\n//g;
   print "[$printable_date]\n";
   print "Left (<) is \"$temp_src\".\n";
@@ -164,10 +164,10 @@ This program needs a directory name.  The directory name is used to
 specify a target directory where there are files which are mostly similar
 to the files in this directory.  The files in the current directory are
 compared to those in the specified target directory and the differences
-are sent to the standard output.  Note that neither directory may be
-a symbolic link, as that can lead to crazy recursion.
+are sent to the standard output.
 ";
 }
+#Note that neither directory may be a symbolic link, as that can lead to crazy recursion.
 
 ############################################################################
 
@@ -378,11 +378,11 @@ sub copy_diff_dirs {
     &cpdiff_instructions;
     return;
   }
-  if (-l $source_directory) {
-    # we will not operate on links, due to recursion issues.
-    &cpdiff_instructions;
-    return;
-  }
+#  if (-l $source_directory) {
+#    # we will not operate on links, due to recursion issues.
+#    &cpdiff_instructions;
+#    return;
+#  }
 
   # get the comparison directory from the arguments.
   local($compare_directory) = &sanitize_name($arguments[1]);
@@ -391,11 +391,11 @@ sub copy_diff_dirs {
     &cpdiff_instructions;
     return;
   }
-  if (-l $compare_directory) {
-    # we will not operate on links, due to recursion issues.
-    &cpdiff_instructions;
-    return;
-  }
+#  if (-l $compare_directory) {
+#    # we will not operate on links, due to recursion issues.
+#    &cpdiff_instructions;
+#    return;
+#  }
 
 #  print "src=$source_directory, dest=$compare_directory\n";