.

1 files changed, 40 insertions, 33 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 94be6ceb4..278a3f62c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -124,7 +124,7 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 libfetish_a_SOURCES = \
   getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
   canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
-  full-write.c getopt.c getopt1.c getugroups.c hard-locale.c hash.c \
+  full-write.c getopt.c getopt1.c getstr.c getugroups.c hard-locale.c hash.c \
   human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
   makepath.c md5.c memcasecmp.c memcoll.c modechange.c path-concat.c \
   quotearg.c readtokens.c readutmp.c safe-read.c same.c save-cwd.c \
@@ -139,7 +139,7 @@ libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 noinst_HEADERS = \
   argmatch.h backupfile.h bumpalloc.h closeout.h diacrit.h dirname.h error.h \
   exclude.h filemode.h fnmatch.h fsusage.h getdate.h getline.h getopt.h \
-  getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
+  getstr.h getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
   linebuffer.h long-options.h md5.h memcasecmp.h memcoll.h \
   makepath.h modechange.h mountlist.h nanosleep.h obstack.h \
   path-concat.h pathmax.h posixtm.h quotearg.h readtokens.h \
@@ -173,14 +173,14 @@ libfetish_a_AR = $(AR) cru
 am_libfetish_a_OBJECTS =  getdate$U.o posixtm$U.o addext$U.o \
 argmatch$U.o backupfile$U.o basename$U.o canon-host$U.o closeout$U.o \
 diacrit$U.o dirname$U.o exclude$U.o filemode$U.o full-write$U.o \
-getopt$U.o getopt1$U.o getugroups$U.o hard-locale$U.o hash$U.o \
-human$U.o idcache$U.o isdir$U.o linebuffer$U.o localcharset$U.o \
-long-options$U.o makepath$U.o md5$U.o memcasecmp$U.o memcoll$U.o \
-modechange$U.o path-concat$U.o quotearg$U.o readtokens$U.o readutmp$U.o \
-safe-read$U.o same$U.o save-cwd$U.o savedir$U.o stripslash$U.o \
-unicodeio$U.o userspec$U.o version-etc$U.o xgetcwd$U.o xgethostname$U.o \
-xmalloc$U.o xstrdup$U.o xstrtod$U.o xstrtol$U.o xstrtoul$U.o \
-xstrtoumax$U.o yesno$U.o
+getopt$U.o getopt1$U.o getstr$U.o getugroups$U.o hard-locale$U.o \
+hash$U.o human$U.o idcache$U.o isdir$U.o linebuffer$U.o \
+localcharset$U.o long-options$U.o makepath$U.o md5$U.o memcasecmp$U.o \
+memcoll$U.o modechange$U.o path-concat$U.o quotearg$U.o readtokens$U.o \
+readutmp$U.o safe-read$U.o same$U.o save-cwd$U.o savedir$U.o \
+stripslash$U.o unicodeio$U.o userspec$U.o version-etc$U.o xgetcwd$U.o \
+xgethostname$U.o xmalloc$U.o xstrdup$U.o xstrtod$U.o xstrtol$U.o \
+xstrtoul$U.o xstrtoumax$U.o yesno$U.o
 libfetish_a_OBJECTS =  $(am_libfetish_a_OBJECTS)
 AR = ar
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -200,7 +200,8 @@ $(DEPDIR)/exclude$U.Po $(DEPDIR)/fileblocks.Po $(DEPDIR)/filemode$U.Po \
 $(DEPDIR)/fnmatch.Po $(DEPDIR)/fsusage.Po $(DEPDIR)/ftruncate.Po \
 $(DEPDIR)/full-write$U.Po $(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po \
 $(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po $(DEPDIR)/getloadavg.Po \
-$(DEPDIR)/getopt$U.Po $(DEPDIR)/getopt1$U.Po $(DEPDIR)/getugroups$U.Po \
+$(DEPDIR)/getopt$U.Po $(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po \
+$(DEPDIR)/getstr$U.Po $(DEPDIR)/getugroups$U.Po \
 $(DEPDIR)/getusershell.Po $(DEPDIR)/group-member.Po \
 $(DEPDIR)/hard-locale$U.Po $(DEPDIR)/hash$U.Po $(DEPDIR)/human$U.Po \
 $(DEPDIR)/idcache$U.Po $(DEPDIR)/isdir$U.Po $(DEPDIR)/lchown.Po \
@@ -230,13 +231,13 @@ $(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
 DIST_COMMON =  README $(noinst_HEADERS) ChangeLog Makefile.am \
 Makefile.in TODO alloca.c atexit.c chown.c dup2.c error.c error.h \
 euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c \
-getgroups.c gethostname.c getline.c getloadavg.c getusershell.c \
-group-member.c lchown.c malloc.c memchr.c memcmp.c memcpy.c memmove.c \
-memset.c mktime.c mountlist.c nanosleep.c obstack.c obstack.h putenv.c \
-realloc.c regex.c rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c \
-strcspn.c strdup.c strftime.c strncasecmp.c strndup.c strnlen.c \
-strpbrk.c strstr.c strtod.c strtol.c strtoul.c strtoull.c strtoumax.c \
-strverscmp.c utime.c
+getgroups.c gethostname.c getline.c getloadavg.c getpass.c \
+getusershell.c group-member.c lchown.c malloc.c memchr.c memcmp.c \
+memcpy.c memmove.c memset.c mktime.c mountlist.c nanosleep.c obstack.c \
+obstack.h putenv.c realloc.c regex.c rmdir.c rpmatch.c stime.c stpcpy.c \
+strcasecmp.c strcspn.c strdup.c strftime.c strncasecmp.c strndup.c \
+strnlen.c strpbrk.c strstr.c strtod.c strtol.c strtoul.c strtoull.c \
+strtoumax.c strverscmp.c utime.c
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -350,6 +351,10 @@ getopt_.c: getopt.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c
 getopt1_.c: getopt1.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt1_.c
+getpass_.c: getpass.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getpass.c; then echo $(srcdir)/getpass.c; else echo getpass.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getpass_.c
+getstr_.c: getstr.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getstr.c; then echo $(srcdir)/getstr.c; else echo getstr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getstr_.c
 getugroups_.c: getugroups.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getugroups.c; then echo $(srcdir)/getugroups.c; else echo getugroups.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getugroups_.c
 getusershell_.c: getusershell.c $(ANSI2KNR)
@@ -502,21 +507,21 @@ addext_.o alloca_.o argmatch_.o atexit_.o backupfile_.o basename_.o \
 canon-host_.o chown_.o closeout_.o diacrit_.o dirname_.o dup2_.o \
 error_.o euidaccess_.o exclude_.o fileblocks_.o filemode_.o fnmatch_.o \
 fsusage_.o ftruncate_.o full-write_.o getdate_.o getgroups_.o \
-gethostname_.o getline_.o getloadavg_.o getopt_.o getopt1_.o \
-getugroups_.o getusershell_.o group-member_.o hard-locale_.o hash_.o \
-human_.o idcache_.o isdir_.o lchown_.o linebuffer_.o localcharset_.o \
-long-options_.o lstat_.o makepath_.o malloc_.o md5_.o memcasecmp_.o \
-memchr_.o memcmp_.o memcoll_.o memcpy_.o memmove_.o memset_.o mktime_.o \
-modechange_.o mountlist_.o nanosleep_.o obstack_.o path-concat_.o \
-posixtm_.o putenv_.o quotearg_.o readtokens_.o readutmp_.o realloc_.o \
-regex_.o rmdir_.o rpmatch_.o safe-read_.o same_.o save-cwd_.o \
-savedir_.o stat_.o stime_.o stpcpy_.o strcasecmp_.o strcspn_.o \
-strdup_.o strftime_.o stripslash_.o strncasecmp_.o strndup_.o \
-strnlen_.o strpbrk_.o strstr_.o strtod_.o strtol_.o strtoul_.o \
-strtoull_.o strtoumax_.o strverscmp_.o unicodeio_.o userspec_.o \
-utime_.o version-etc_.o xgetcwd_.o xgethostname_.o xmalloc_.o \
-xstrdup_.o xstrtod_.o xstrtol_.o xstrtoul_.o xstrtoumax_.o yesno_.o : \
-$(ANSI2KNR)
+gethostname_.o getline_.o getloadavg_.o getopt_.o getopt1_.o getpass_.o \
+getstr_.o getugroups_.o getusershell_.o group-member_.o hard-locale_.o \
+hash_.o human_.o idcache_.o isdir_.o lchown_.o linebuffer_.o \
+localcharset_.o long-options_.o lstat_.o makepath_.o malloc_.o md5_.o \
+memcasecmp_.o memchr_.o memcmp_.o memcoll_.o memcpy_.o memmove_.o \
+memset_.o mktime_.o modechange_.o mountlist_.o nanosleep_.o obstack_.o \
+path-concat_.o posixtm_.o putenv_.o quotearg_.o readtokens_.o \
+readutmp_.o realloc_.o regex_.o rmdir_.o rpmatch_.o safe-read_.o \
+same_.o save-cwd_.o savedir_.o stat_.o stime_.o stpcpy_.o strcasecmp_.o \
+strcspn_.o strdup_.o strftime_.o stripslash_.o strncasecmp_.o \
+strndup_.o strnlen_.o strpbrk_.o strstr_.o strtod_.o strtol_.o \
+strtoul_.o strtoull_.o strtoumax_.o strverscmp_.o unicodeio_.o \
+userspec_.o utime_.o version-etc_.o xgetcwd_.o xgethostname_.o \
+xmalloc_.o xstrdup_.o xstrtod_.o xstrtol_.o xstrtoul_.o xstrtoumax_.o \
+yesno_.o : $(ANSI2KNR)
 .y.c:
 	$(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c
 	if test -f y.tab.h; then \
@@ -585,6 +590,8 @@ maintainer-clean-tags:
 @AMDEP@include $(DEPDIR)/getloadavg.Po
 @AMDEP@include $(DEPDIR)/getopt$U.Po
 @AMDEP@include $(DEPDIR)/getopt1$U.Po
+@AMDEP@include $(DEPDIR)/getpass.Po
+@AMDEP@include $(DEPDIR)/getstr$U.Po
 @AMDEP@include $(DEPDIR)/getugroups$U.Po
 @AMDEP@include $(DEPDIR)/getusershell.Po
 @AMDEP@include $(DEPDIR)/group-member.Po