X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=config%2Fsrclist-update;h=b528d1a40e81d10ce2bd0c74edf9db37991696f8;hb=cdf12ee48247d39e7b1fd40289b78741aa4d4df1;hp=8fe46986310bf775ea1f22b57734fbbb21d3be97;hpb=3f53294c6ad284644ff21fa9fe52173551b9965b;p=gnulib.git

diff --git a/config/srclist-update b/config/srclist-update
index 8fe469863..b528d1a40 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,10 +1,24 @@
 #!/bin/sh
-# $Id: srclist-update,v 1.1 2002-09-10 23:41:12 karl Exp $
-# 
-# Check for files being up to date, according to the list on stdin.
-# 
-# Source $mydir/srclistvars.sh first, if it exists, where
-# $mydir=`dirname $0`.
+# Check for files in directory $1 being up to date, according to the
+# list on stdin.  Don't actually make any changes, just show the diffs.
+#
+# Copyright (C) 2002-2003, 2005, 2007-2011 Free Software Foundation, Inc.
+#
+# This program 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 of the License, or
+# (at your option) any later version.
+#
+# This program 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, see <http://www.gnu.org/licenses/>.
+
+# Originally written by Karl Berry.
+
 
 if test -n "$1"; then
   cd "$1" || exit 1
@@ -13,40 +27,107 @@ fi
 verbose=false
 #chicken="echo (would)"
 
-srctmp=${TMPDIR-/tmp}/srclist.src
-dsttmp=${TMPDIR-/tmp}/srclist.dst
+: ${TMPDIR=/tmp}
+dsttmp=$TMPDIR/srclist.dst
 
+# Source `dirname $0`/srclistvars.sh first, if it exists.
 mydir=`dirname $0`
 test -r $mydir/srclistvars.sh && . $mydir/srclistvars.sh
 
-cat | while read src dst; do
-  test -z "$dst" && continue  # skip lines without second element
-  echo "$src $dst" | sed 's/#.*$//' | egrep '^\s*$' >/dev/null \
-  && continue  # skip whitespace and comment-only lines
-  
-  src=`eval echo $src`
+
+# 
+# sed command to fix the license to be GPL.
+fixlicense='
+  /^[[:space:]]*#[[:space:]]*Th[ei][ s].* is free software/,/^[[:space:]]*#.*USA\./c\
+#   This program 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 of the License, or\
+#   (at your option) any later version.\
+#\
+#   This program 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, see <http://www.gnu.org/licenses/>.
+
+  /Th[ei][ s].* is free software/,/\*\//c\
+   This program 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 of the License, or\
+   (at your option) any later version.\
+\
+   This program 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, see <http://www.gnu.org/licenses/>.  */
+'
+
+# sed command to remove lines containing $Id lines.
+# Quote the $ so that CVS does not expand it in this script.
+remove_id_lines='/[$]Id:.*[$]/d'
+
+# $1 is input file, $2 is output.
+# Remove $Id lines, since they'll differ between source locations.
+# If $options contains "gpl", change the license to be the standard
+# GPL.  We use this for libc files, et al.
+#
+fixfile() \
+{
+  sed_command="$remove_id_lines"
+
+  case " $options " in
+  *' gpl '*)
+    sed_command="$sed_command; $fixlicense";;
+  esac
+
+  sed "$sed_command" $1 >$2
+}
+
+
+# 
+cat | while read src dst options; do
+  #echo "src=$src, dst=$dst, options=$options" >&2
+  case $src:$dst in
+    *: ) continue;;    # skip lines without second element
+    '#'* ) continue;;  # skip comment-only lines
+  esac
+
+  # Expand variables and make sure we have an input file.
+  eval src=$src
   if test ! -r $src; then
     echo "$0: cannot read $src" >&2
     continue
   fi
-  
-  # If given src/foo.c dst, copy to dst/foo.c.
-  dst=`eval echo $dst`
+
+  # Ignore subdirs in src dir.  E.g., if input spec is
+  #   src/subdir/foo.c dst
+  # then write destination file dst/foo.c.
+  eval dst=$dst
   test -d $dst && dst=$dst/`basename $src`
-  
-  # $ Id: lines will differ.
-  fgrep -v '$'"Id:" $src >$srctmp
-  test -r $dst && fgrep -v '$'"Id:" $dst >$dsttmp
+
+  # Fix files in both src and dst, for the sake
+  # of a clean comparison.
+  srctmp=$TMPDIR/`basename $src`
+  fixfile $src $srctmp
+  test -r $dst && fixfile $dst $dsttmp
+
+  # if src was executable, make dst executable, to placate git.
+  test -x $src && chmod a+x $dst
 
   if test ! -e $dst; then
-    echo "## $src $dst  # new"
-    $chicken cp -p $src $dst
+    echo "## $srctmp $dst  # new"
+    $chicken cp -p $srctmp $dst
   elif cmp -s $srctmp $dsttmp; then
-    $verbose && echo "## $src $dst  # unchanged"
+    $verbose && echo "## $srctmp $dst  # unchanged"
   else
-    echo "## $src $dst  # changes"
-    diff -c2 $src $dst
+    echo "## $srctmp $dst  # changes"
+    diff -C 2 $dst $srctmp
   fi
 done
 
-rm -f $srctmp $dsttmp
+rm -f $dsttmp