X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Far-lib;h=fe2301e71a86f025f97a189dc6b5374e8b0caa65;hb=83d9dda1f1623f8bbab011c6196c8a56690c1f6b;hp=aa4acbdaa0f1ad3debe0f2118719c24df8bea62a;hpb=d59c72566f0175f5b0c1cabb17ed00d81dc4ad2b;p=gnulib.git

diff --git a/build-aux/ar-lib b/build-aux/ar-lib
index aa4acbdaa..fe2301e71 100755
--- a/build-aux/ar-lib
+++ b/build-aux/ar-lib
@@ -2,10 +2,9 @@
 # Wrapper for Microsoft lib.exe
 
 me=ar-lib
-scriptversion=2010-08-08.07; # UTC
+scriptversion=2012-03-01.08; # UTC
 
-# Copyright (C) 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2010-2013 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda@lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -42,7 +41,7 @@ file_conv=
 
 # func_file_conv build_file
 # Convert a $build file to $host form and store it in $file
-# Currently only supports Win32 hosts.
+# Currently only supports Windows hosts.
 func_file_conv ()
 {
   file=$1
@@ -99,7 +98,7 @@ func_at_file ()
 
 case $1 in
   '')
-     func_error "no command.  Try \`$0 --help' for more information."
+     func_error "no command.  Try '$0 --help' for more information."
      ;;
   -h | --h*)
     cat <<EOF
@@ -121,8 +120,28 @@ fi
 
 AR=$1
 shift
-action=$1
-shift
+while :
+do
+  if test $# -lt 2; then
+    func_error "you must specify a program, an action and an archive"
+  fi
+  case $1 in
+    -lib | -LIB \
+    | -ltcg | -LTCG \
+    | -machine* | -MACHINE* \
+    | -subsystem* | -SUBSYSTEM* \
+    | -verbose | -VERBOSE \
+    | -wx* | -WX* )
+      AR="$AR $1"
+      shift
+      ;;
+    *)
+      action=$1
+      shift
+      break
+      ;;
+  esac
+done
 orig_archive=$1
 shift
 func_file_conv "$orig_archive"
@@ -134,7 +153,9 @@ action=${action#-}
 delete=
 extract=
 list=
+quick=
 replace=
+index=
 create=
 
 while test -n "$action"
@@ -143,9 +164,13 @@ do
     d*) delete=yes  ;;
     x*) extract=yes ;;
     t*) list=yes    ;;
+    q*) quick=yes   ;;
     r*) replace=yes ;;
+    s*) index=yes   ;;
+    S*)             ;; # the index is always updated implicitly
     c*) create=yes  ;;
     u*)             ;; # TODO: don't ignore the update modifier
+    v*)             ;; # TODO: don't ignore the verbose modifier
     *)
       func_error "unknown action specified"
       ;;
@@ -153,8 +178,8 @@ do
   action=${action#?}
 done
 
-case $delete$extract$list$replace in
-  yes)
+case $delete$extract$list$quick$replace,$index in
+  yes,* | ,yes)
     ;;
   yesyes*)
     func_error "more than one action specified"
@@ -199,13 +224,13 @@ elif test -n "$extract"; then
       esac
     done
   else
-    $AR -NOLOGO -LIST "$archive" | while read member
+    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
     do
       $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
     done
   fi
 
-elif test -n "$replace"; then
+elif test -n "$quick$replace"; then
   if test ! -f "$orig_archive"; then
     if test -z "$create"; then
       echo "$me: creating $orig_archive"