Skip to content

Commit 38a2930

Browse files
jhambyjhamby
committed
Finish refactoring execute_cmd.cc.
Finish refactoring execute_cmd.cc and various files that it depends on.
1 parent cd0985f commit 38a2930

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1513
-1796
lines changed

‎Makefile.am

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ bash_SOURCES = shell.cc eval.cc parse.yy general.cc parser.cc \
4343
stringlib.cc locale.cc findcmd.cc redir.cc \
4444
pcomplete.cc pcomplib.cc alias.hh array.hh assoc.hh bashintl.hh \
4545
bashtypes.hh builtins.hh command.hh config-bot.hh config-top.hh \
46-
conftypes.hh externs.hh findcmd.hh flags.hh \
46+
conftypes.hh externs.hh flags.hh \
4747
general.hh hashcmd.hh hashlib.hh input.hh jobs.hh parser.hh \
4848
patchlevel.hh pathexp.hh pcomplete.hh quit.hh shell.hh sig.hh \
49-
subst.hh syntax.hh trap.hh variables.hh \
50-
include/chartypes.hh include/strmatch.hh \
49+
subst.hh syntax.hh trap.hh variables.hh include/chartypes.hh \
5150
include/maxpath.hh include/posixdir.hh include/posixselect.hh \
5251
include/posixstat.hh include/posixtime.hh include/posixwait.hh \
5352
include/shmbchar.hh include/shmbutil.hh include/shtty.hh \
@@ -200,7 +199,7 @@ bash_SOURCES += $(RLDIR)/readline.cc $(RLDIR)/funmap.cc $(RLDIR)/keymaps.cc \
200199
$(RLDIR)/rlshell.hh $(RLDIR)/rltty.hh $(RLDIR)/rlwinsize.hh \
201200
$(RLDIR)/tcap.hh $(RLDIR)/tilde.hh
202201

203-
bash_SOURCES += $(SHDIR)/clktck.cc $(SHDIR)/clock.cc \
202+
bash_SOURCES += $(SHDIR)/clktck.cc $(SHDIR)/clock.cc $(SHDIR)/eaccess.cc \
204203
$(SHDIR)/setlinebuf.cc $(SHDIR)/zread.cc \
205204
$(SHDIR)/inet_aton.cc $(SHDIR)/netconn.cc $(SHDIR)/netopen.cc \
206205
$(SHDIR)/timeval.cc $(SHDIR)/makepath.cc \

‎Makefile.in

Lines changed: 72 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
132132
$(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \
133133
$(top_srcdir)/m4/euidaccess.m4 $(top_srcdir)/m4/exponentd.m4 \
134134
$(top_srcdir)/m4/extensions.m4 \
135-
$(top_srcdir)/m4/extern-inline.m4 \
136-
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \
135+
$(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \
137136
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \
138137
$(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \
139138
$(top_srcdir)/m4/filenamecat.m4 $(top_srcdir)/m4/flexmember.m4 \
@@ -257,17 +256,17 @@ am__bash_SOURCES_DIST = shell.cc eval.cc parse.yy general.cc parser.cc \
257256
locale.cc findcmd.cc redir.cc pcomplete.cc pcomplib.cc \
258257
alias.hh array.hh assoc.hh bashintl.hh bashtypes.hh \
259258
builtins.hh command.hh config-bot.hh config-top.hh \
260-
conftypes.hh externs.hh findcmd.hh flags.hh general.hh \
261-
hashcmd.hh hashlib.hh input.hh jobs.hh parser.hh patchlevel.hh \
262-
pathexp.hh pcomplete.hh quit.hh shell.hh sig.hh subst.hh \
263-
syntax.hh trap.hh variables.hh include/chartypes.hh \
264-
include/strmatch.hh include/maxpath.hh include/posixdir.hh \
265-
include/posixselect.hh include/posixstat.hh \
266-
include/posixtime.hh include/posixwait.hh include/shmbchar.hh \
267-
include/shmbutil.hh include/shtty.hh include/stat-time.hh \
268-
include/systimes.hh include/typemax.hh include/unionwait.hh \
269-
pathnames.hh include/nonstd/string_view.hpp array2.cc array.cc \
270-
jobs.cc nojobs.cc $(BLTDIR)/alias_def.cc $(BLTDIR)/bind_def.cc \
259+
conftypes.hh externs.hh flags.hh general.hh hashcmd.hh \
260+
hashlib.hh input.hh jobs.hh parser.hh patchlevel.hh pathexp.hh \
261+
pcomplete.hh quit.hh shell.hh sig.hh subst.hh syntax.hh \
262+
trap.hh variables.hh include/chartypes.hh include/maxpath.hh \
263+
include/posixdir.hh include/posixselect.hh \
264+
include/posixstat.hh include/posixtime.hh include/posixwait.hh \
265+
include/shmbchar.hh include/shmbutil.hh include/shtty.hh \
266+
include/stat-time.hh include/systimes.hh include/typemax.hh \
267+
include/unionwait.hh pathnames.hh \
268+
include/nonstd/string_view.hpp array2.cc array.cc jobs.cc \
269+
nojobs.cc $(BLTDIR)/alias_def.cc $(BLTDIR)/bind_def.cc \
271270
$(BLTDIR)/break_def.cc $(BLTDIR)/builtin_def.cc \
272271
$(BLTDIR)/caller_def.cc $(BLTDIR)/cd_def.cc \
273272
$(BLTDIR)/colon_def.cc $(BLTDIR)/command_def.cc \
@@ -310,17 +309,18 @@ am__bash_SOURCES_DIST = shell.cc eval.cc parse.yy general.cc parser.cc \
310309
$(RLDIR)/rldefs.hh $(RLDIR)/rlmbutil.hh $(RLDIR)/rlprivate.hh \
311310
$(RLDIR)/rlshell.hh $(RLDIR)/rltty.hh $(RLDIR)/rlwinsize.hh \
312311
$(RLDIR)/tcap.hh $(RLDIR)/tilde.hh $(SHDIR)/clktck.cc \
313-
$(SHDIR)/clock.cc $(SHDIR)/setlinebuf.cc $(SHDIR)/zread.cc \
314-
$(SHDIR)/inet_aton.cc $(SHDIR)/netconn.cc $(SHDIR)/netopen.cc \
315-
$(SHDIR)/timeval.cc $(SHDIR)/makepath.cc $(SHDIR)/spell.cc \
316-
$(SHDIR)/shquote.cc $(SHDIR)/strtrans.cc $(SHDIR)/mailstat.cc \
317-
$(SHDIR)/fmtulong.cc $(SHDIR)/fmtullong.cc $(SHDIR)/fmtumax.cc \
318-
$(SHDIR)/shmatch.cc $(SHDIR)/oslib.cc $(SHDIR)/stringlist.cc \
319-
$(SHDIR)/stringvec.cc $(SHDIR)/strvis.cc $(SHDIR)/zcatfd.cc \
320-
$(SHDIR)/zmapfd.cc $(SHDIR)/winsize.cc $(SHDIR)/zgetline.cc \
321-
$(SHDIR)/uconvert.cc $(SHDIR)/ufuncs.cc $(SHDIR)/casemod.cc \
322-
$(SHDIR)/input_avail.cc $(SHDIR)/fnxform.cc \
323-
$(SHDIR)/unicode.cc $(SHDIR)/shmbchar.cc $(TLDIR)/tilde.cc
312+
$(SHDIR)/clock.cc $(SHDIR)/eaccess.cc $(SHDIR)/setlinebuf.cc \
313+
$(SHDIR)/zread.cc $(SHDIR)/inet_aton.cc $(SHDIR)/netconn.cc \
314+
$(SHDIR)/netopen.cc $(SHDIR)/timeval.cc $(SHDIR)/makepath.cc \
315+
$(SHDIR)/spell.cc $(SHDIR)/shquote.cc $(SHDIR)/strtrans.cc \
316+
$(SHDIR)/mailstat.cc $(SHDIR)/fmtulong.cc \
317+
$(SHDIR)/fmtullong.cc $(SHDIR)/fmtumax.cc $(SHDIR)/shmatch.cc \
318+
$(SHDIR)/oslib.cc $(SHDIR)/stringlist.cc $(SHDIR)/stringvec.cc \
319+
$(SHDIR)/strvis.cc $(SHDIR)/zcatfd.cc $(SHDIR)/zmapfd.cc \
320+
$(SHDIR)/winsize.cc $(SHDIR)/zgetline.cc $(SHDIR)/uconvert.cc \
321+
$(SHDIR)/ufuncs.cc $(SHDIR)/casemod.cc $(SHDIR)/input_avail.cc \
322+
$(SHDIR)/fnxform.cc $(SHDIR)/unicode.cc $(SHDIR)/shmbchar.cc \
323+
$(TLDIR)/tilde.cc
324324
@ALT_ARRAY_IMPL_TRUE@am__objects_1 = array2.$(OBJEXT)
325325
@ALT_ARRAY_IMPL_FALSE@am__objects_2 = array.$(OBJEXT)
326326
@JOB_CONTROL_TRUE@am__objects_3 = jobs.$(OBJEXT)
@@ -383,22 +383,23 @@ am_bash_OBJECTS = shell.$(OBJEXT) eval.$(OBJEXT) parse.$(OBJEXT) \
383383
$(RLDIR)/text.$(OBJEXT) $(RLDIR)/misc.$(OBJEXT) \
384384
$(RLDIR)/colors.$(OBJEXT) $(RLDIR)/parse-colors.$(OBJEXT) \
385385
$(RLDIR)/mbutil.$(OBJEXT) $(SHDIR)/clktck.$(OBJEXT) \
386-
$(SHDIR)/clock.$(OBJEXT) $(SHDIR)/setlinebuf.$(OBJEXT) \
387-
$(SHDIR)/zread.$(OBJEXT) $(SHDIR)/inet_aton.$(OBJEXT) \
388-
$(SHDIR)/netconn.$(OBJEXT) $(SHDIR)/netopen.$(OBJEXT) \
389-
$(SHDIR)/timeval.$(OBJEXT) $(SHDIR)/makepath.$(OBJEXT) \
390-
$(SHDIR)/spell.$(OBJEXT) $(SHDIR)/shquote.$(OBJEXT) \
391-
$(SHDIR)/strtrans.$(OBJEXT) $(SHDIR)/mailstat.$(OBJEXT) \
392-
$(SHDIR)/fmtulong.$(OBJEXT) $(SHDIR)/fmtullong.$(OBJEXT) \
393-
$(SHDIR)/fmtumax.$(OBJEXT) $(SHDIR)/shmatch.$(OBJEXT) \
394-
$(SHDIR)/oslib.$(OBJEXT) $(SHDIR)/stringlist.$(OBJEXT) \
395-
$(SHDIR)/stringvec.$(OBJEXT) $(SHDIR)/strvis.$(OBJEXT) \
396-
$(SHDIR)/zcatfd.$(OBJEXT) $(SHDIR)/zmapfd.$(OBJEXT) \
397-
$(SHDIR)/winsize.$(OBJEXT) $(SHDIR)/zgetline.$(OBJEXT) \
398-
$(SHDIR)/uconvert.$(OBJEXT) $(SHDIR)/ufuncs.$(OBJEXT) \
399-
$(SHDIR)/casemod.$(OBJEXT) $(SHDIR)/input_avail.$(OBJEXT) \
400-
$(SHDIR)/fnxform.$(OBJEXT) $(SHDIR)/unicode.$(OBJEXT) \
401-
$(SHDIR)/shmbchar.$(OBJEXT) $(TLDIR)/tilde.$(OBJEXT)
386+
$(SHDIR)/clock.$(OBJEXT) $(SHDIR)/eaccess.$(OBJEXT) \
387+
$(SHDIR)/setlinebuf.$(OBJEXT) $(SHDIR)/zread.$(OBJEXT) \
388+
$(SHDIR)/inet_aton.$(OBJEXT) $(SHDIR)/netconn.$(OBJEXT) \
389+
$(SHDIR)/netopen.$(OBJEXT) $(SHDIR)/timeval.$(OBJEXT) \
390+
$(SHDIR)/makepath.$(OBJEXT) $(SHDIR)/spell.$(OBJEXT) \
391+
$(SHDIR)/shquote.$(OBJEXT) $(SHDIR)/strtrans.$(OBJEXT) \
392+
$(SHDIR)/mailstat.$(OBJEXT) $(SHDIR)/fmtulong.$(OBJEXT) \
393+
$(SHDIR)/fmtullong.$(OBJEXT) $(SHDIR)/fmtumax.$(OBJEXT) \
394+
$(SHDIR)/shmatch.$(OBJEXT) $(SHDIR)/oslib.$(OBJEXT) \
395+
$(SHDIR)/stringlist.$(OBJEXT) $(SHDIR)/stringvec.$(OBJEXT) \
396+
$(SHDIR)/strvis.$(OBJEXT) $(SHDIR)/zcatfd.$(OBJEXT) \
397+
$(SHDIR)/zmapfd.$(OBJEXT) $(SHDIR)/winsize.$(OBJEXT) \
398+
$(SHDIR)/zgetline.$(OBJEXT) $(SHDIR)/uconvert.$(OBJEXT) \
399+
$(SHDIR)/ufuncs.$(OBJEXT) $(SHDIR)/casemod.$(OBJEXT) \
400+
$(SHDIR)/input_avail.$(OBJEXT) $(SHDIR)/fnxform.$(OBJEXT) \
401+
$(SHDIR)/unicode.$(OBJEXT) $(SHDIR)/shmbchar.$(OBJEXT) \
402+
$(TLDIR)/tilde.$(OBJEXT)
402403
bash_OBJECTS = $(am_bash_OBJECTS)
403404
bash_LDADD = $(LDADD)
404405
bash_DEPENDENCIES = lib/gnulib/libgnu.a
@@ -501,9 +502,9 @@ am__depfiles_remade = $(BLTDIR)/$(DEPDIR)/alias_def.Po \
501502
$(RLDIR)/$(DEPDIR)/undo.Po $(RLDIR)/$(DEPDIR)/util.Po \
502503
$(RLDIR)/$(DEPDIR)/vi_mode.Po $(SHDIR)/$(DEPDIR)/casemod.Po \
503504
$(SHDIR)/$(DEPDIR)/clktck.Po $(SHDIR)/$(DEPDIR)/clock.Po \
504-
$(SHDIR)/$(DEPDIR)/fmtullong.Po $(SHDIR)/$(DEPDIR)/fmtulong.Po \
505-
$(SHDIR)/$(DEPDIR)/fmtumax.Po $(SHDIR)/$(DEPDIR)/fnxform.Po \
506-
$(SHDIR)/$(DEPDIR)/inet_aton.Po \
505+
$(SHDIR)/$(DEPDIR)/eaccess.Po $(SHDIR)/$(DEPDIR)/fmtullong.Po \
506+
$(SHDIR)/$(DEPDIR)/fmtulong.Po $(SHDIR)/$(DEPDIR)/fmtumax.Po \
507+
$(SHDIR)/$(DEPDIR)/fnxform.Po $(SHDIR)/$(DEPDIR)/inet_aton.Po \
507508
$(SHDIR)/$(DEPDIR)/input_avail.Po \
508509
$(SHDIR)/$(DEPDIR)/mailstat.Po $(SHDIR)/$(DEPDIR)/makepath.Po \
509510
$(SHDIR)/$(DEPDIR)/netconn.Po $(SHDIR)/$(DEPDIR)/netopen.Po \
@@ -1891,17 +1892,17 @@ bash_SOURCES = shell.cc eval.cc parse.yy general.cc parser.cc \
18911892
locale.cc findcmd.cc redir.cc pcomplete.cc pcomplib.cc \
18921893
alias.hh array.hh assoc.hh bashintl.hh bashtypes.hh \
18931894
builtins.hh command.hh config-bot.hh config-top.hh \
1894-
conftypes.hh externs.hh findcmd.hh flags.hh general.hh \
1895-
hashcmd.hh hashlib.hh input.hh jobs.hh parser.hh patchlevel.hh \
1896-
pathexp.hh pcomplete.hh quit.hh shell.hh sig.hh subst.hh \
1897-
syntax.hh trap.hh variables.hh include/chartypes.hh \
1898-
include/strmatch.hh include/maxpath.hh include/posixdir.hh \
1899-
include/posixselect.hh include/posixstat.hh \
1900-
include/posixtime.hh include/posixwait.hh include/shmbchar.hh \
1901-
include/shmbutil.hh include/shtty.hh include/stat-time.hh \
1902-
include/systimes.hh include/typemax.hh include/unionwait.hh \
1903-
pathnames.hh include/nonstd/string_view.hpp $(am__append_1) \
1904-
$(am__append_2) $(am__append_3) $(am__append_4) $(DEFSRC) \
1895+
conftypes.hh externs.hh flags.hh general.hh hashcmd.hh \
1896+
hashlib.hh input.hh jobs.hh parser.hh patchlevel.hh pathexp.hh \
1897+
pcomplete.hh quit.hh shell.hh sig.hh subst.hh syntax.hh \
1898+
trap.hh variables.hh include/chartypes.hh include/maxpath.hh \
1899+
include/posixdir.hh include/posixselect.hh \
1900+
include/posixstat.hh include/posixtime.hh include/posixwait.hh \
1901+
include/shmbchar.hh include/shmbutil.hh include/shtty.hh \
1902+
include/stat-time.hh include/systimes.hh include/typemax.hh \
1903+
include/unionwait.hh pathnames.hh \
1904+
include/nonstd/string_view.hpp $(am__append_1) $(am__append_2) \
1905+
$(am__append_3) $(am__append_4) $(DEFSRC) \
19051906
$(BLTDIR)/builtins.cc $(BLTDIR)/common.cc \
19061907
$(BLTDIR)/evalstring.cc $(BLTDIR)/evalfile.cc \
19071908
$(BLTDIR)/getopt.cc $(BLTDIR)/bashgetopt.cc \
@@ -1924,17 +1925,18 @@ bash_SOURCES = shell.cc eval.cc parse.yy general.cc parser.cc \
19241925
$(RLDIR)/rldefs.hh $(RLDIR)/rlmbutil.hh $(RLDIR)/rlprivate.hh \
19251926
$(RLDIR)/rlshell.hh $(RLDIR)/rltty.hh $(RLDIR)/rlwinsize.hh \
19261927
$(RLDIR)/tcap.hh $(RLDIR)/tilde.hh $(SHDIR)/clktck.cc \
1927-
$(SHDIR)/clock.cc $(SHDIR)/setlinebuf.cc $(SHDIR)/zread.cc \
1928-
$(SHDIR)/inet_aton.cc $(SHDIR)/netconn.cc $(SHDIR)/netopen.cc \
1929-
$(SHDIR)/timeval.cc $(SHDIR)/makepath.cc $(SHDIR)/spell.cc \
1930-
$(SHDIR)/shquote.cc $(SHDIR)/strtrans.cc $(SHDIR)/mailstat.cc \
1931-
$(SHDIR)/fmtulong.cc $(SHDIR)/fmtullong.cc $(SHDIR)/fmtumax.cc \
1932-
$(SHDIR)/shmatch.cc $(SHDIR)/oslib.cc $(SHDIR)/stringlist.cc \
1933-
$(SHDIR)/stringvec.cc $(SHDIR)/strvis.cc $(SHDIR)/zcatfd.cc \
1934-
$(SHDIR)/zmapfd.cc $(SHDIR)/winsize.cc $(SHDIR)/zgetline.cc \
1935-
$(SHDIR)/uconvert.cc $(SHDIR)/ufuncs.cc $(SHDIR)/casemod.cc \
1936-
$(SHDIR)/input_avail.cc $(SHDIR)/fnxform.cc \
1937-
$(SHDIR)/unicode.cc $(SHDIR)/shmbchar.cc $(TLDIR)/tilde.cc
1928+
$(SHDIR)/clock.cc $(SHDIR)/eaccess.cc $(SHDIR)/setlinebuf.cc \
1929+
$(SHDIR)/zread.cc $(SHDIR)/inet_aton.cc $(SHDIR)/netconn.cc \
1930+
$(SHDIR)/netopen.cc $(SHDIR)/timeval.cc $(SHDIR)/makepath.cc \
1931+
$(SHDIR)/spell.cc $(SHDIR)/shquote.cc $(SHDIR)/strtrans.cc \
1932+
$(SHDIR)/mailstat.cc $(SHDIR)/fmtulong.cc \
1933+
$(SHDIR)/fmtullong.cc $(SHDIR)/fmtumax.cc $(SHDIR)/shmatch.cc \
1934+
$(SHDIR)/oslib.cc $(SHDIR)/stringlist.cc $(SHDIR)/stringvec.cc \
1935+
$(SHDIR)/strvis.cc $(SHDIR)/zcatfd.cc $(SHDIR)/zmapfd.cc \
1936+
$(SHDIR)/winsize.cc $(SHDIR)/zgetline.cc $(SHDIR)/uconvert.cc \
1937+
$(SHDIR)/ufuncs.cc $(SHDIR)/casemod.cc $(SHDIR)/input_avail.cc \
1938+
$(SHDIR)/fnxform.cc $(SHDIR)/unicode.cc $(SHDIR)/shmbchar.cc \
1939+
$(TLDIR)/tilde.cc
19381940
AM_YFLAGS = -d
19391941
AM_CPPFLAGS = -I$(srcdir)/lib/gnulib -I$(builddir)/lib/gnulib \
19401942
-I$(srcdir)/include -I$(srcdir)/lib/tilde \
@@ -2271,6 +2273,8 @@ $(SHDIR)/clktck.$(OBJEXT): $(SHDIR)/$(am__dirstamp) \
22712273
$(SHDIR)/$(DEPDIR)/$(am__dirstamp)
22722274
$(SHDIR)/clock.$(OBJEXT): $(SHDIR)/$(am__dirstamp) \
22732275
$(SHDIR)/$(DEPDIR)/$(am__dirstamp)
2276+
$(SHDIR)/eaccess.$(OBJEXT): $(SHDIR)/$(am__dirstamp) \
2277+
$(SHDIR)/$(DEPDIR)/$(am__dirstamp)
22742278
$(SHDIR)/setlinebuf.$(OBJEXT): $(SHDIR)/$(am__dirstamp) \
22752279
$(SHDIR)/$(DEPDIR)/$(am__dirstamp)
22762280
$(SHDIR)/zread.$(OBJEXT): $(SHDIR)/$(am__dirstamp) \
@@ -2470,6 +2474,7 @@ distclean-compile:
24702474
@AMDEP_TRUE@@am__include@ @am__quote@$(SHDIR)/$(DEPDIR)/casemod.Po@am__quote@ # am--include-marker
24712475
@AMDEP_TRUE@@am__include@ @am__quote@$(SHDIR)/$(DEPDIR)/clktck.Po@am__quote@ # am--include-marker
24722476
@AMDEP_TRUE@@am__include@ @am__quote@$(SHDIR)/$(DEPDIR)/clock.Po@am__quote@ # am--include-marker
2477+
@AMDEP_TRUE@@am__include@ @am__quote@$(SHDIR)/$(DEPDIR)/eaccess.Po@am__quote@ # am--include-marker
24732478
@AMDEP_TRUE@@am__include@ @am__quote@$(SHDIR)/$(DEPDIR)/fmtullong.Po@am__quote@ # am--include-marker
24742479
@AMDEP_TRUE@@am__include@ @am__quote@$(SHDIR)/$(DEPDIR)/fmtulong.Po@am__quote@ # am--include-marker
24752480
@AMDEP_TRUE@@am__include@ @am__quote@$(SHDIR)/$(DEPDIR)/fmtumax.Po@am__quote@ # am--include-marker
@@ -3032,6 +3037,7 @@ distclean: distclean-recursive
30323037
-rm -f $(SHDIR)/$(DEPDIR)/casemod.Po
30333038
-rm -f $(SHDIR)/$(DEPDIR)/clktck.Po
30343039
-rm -f $(SHDIR)/$(DEPDIR)/clock.Po
3040+
-rm -f $(SHDIR)/$(DEPDIR)/eaccess.Po
30353041
-rm -f $(SHDIR)/$(DEPDIR)/fmtullong.Po
30363042
-rm -f $(SHDIR)/$(DEPDIR)/fmtulong.Po
30373043
-rm -f $(SHDIR)/$(DEPDIR)/fmtumax.Po
@@ -3238,6 +3244,7 @@ maintainer-clean: maintainer-clean-recursive
32383244
-rm -f $(SHDIR)/$(DEPDIR)/casemod.Po
32393245
-rm -f $(SHDIR)/$(DEPDIR)/clktck.Po
32403246
-rm -f $(SHDIR)/$(DEPDIR)/clock.Po
3247+
-rm -f $(SHDIR)/$(DEPDIR)/eaccess.Po
32413248
-rm -f $(SHDIR)/$(DEPDIR)/fmtullong.Po
32423249
-rm -f $(SHDIR)/$(DEPDIR)/fmtulong.Po
32433250
-rm -f $(SHDIR)/$(DEPDIR)/fmtumax.Po

‎aclocal.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,6 @@ m4_include([m4/euidaccess.m4])
12161216
m4_include([m4/exponentd.m4])
12171217
m4_include([m4/extensions.m4])
12181218
m4_include([m4/extern-inline.m4])
1219-
m4_include([m4/faccessat.m4])
12201219
m4_include([m4/fchdir.m4])
12211220
m4_include([m4/fcntl-o.m4])
12221221
m4_include([m4/fcntl.m4])

‎array.hh

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ struct ARRAY_ELEMENT
5050

5151
typedef int (*sh_ae_map_func_t) (ARRAY_ELEMENT *, void *);
5252

53+
/* Flags for array_shift */
54+
#define AS_DISPOSE 0x01
55+
5356
struct ARRAY
5457
{
5558
#ifndef ALT_ARRAY_IMPLEMENTATION
@@ -104,6 +107,18 @@ struct ARRAY
104107
return rshift (1, v);
105108
}
106109

110+
void
111+
push (string_view v)
112+
{
113+
(void)rshift (1, v);
114+
}
115+
116+
void
117+
pop ()
118+
{
119+
(void)shift (1, AS_DISPOSE);
120+
}
121+
107122
#else // ALT_ARRAY_IMPLEMENTATION
108123

109124
ARRAY () : max_index (-1), num_elements (0), first_index_ (-1) {}
@@ -260,9 +275,6 @@ std::string array_to_assign (ARRAY *, bool);
260275
std::string array_to_string (ARRAY *, string_view, bool);
261276
ARRAY *array_from_string (char *, char *);
262277

263-
/* Flags for array_shift */
264-
#define AS_DISPOSE 0x01
265-
266278
/* Convenience */
267279

268280
#define GET_ARRAY_FROM_VAR(n, v, a) \

‎bashline.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#if defined(READLINE)
2424

2525
#include "builtins.hh"
26-
#include "findcmd.hh"
2726
#include "flags.hh"
2827
#include "input.hh"
2928
#include "parser.hh"

‎builtins/common.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,12 @@ Shell::sh_chkwrite (int s)
300300
in the list in *IP, if IP is non-null. A convenience function for
301301
loadable builtins; also used by `test'. */
302302
char **
303-
Shell::make_builtin_argv (WORD_LIST *list, int *ip)
303+
Shell::make_builtin_argv (WORD_LIST *list, size_t *ip)
304304
{
305305
char **argv;
306306

307-
argv = strvec_from_word_list (list, 0, 1, ip);
308-
argv[0] = (char *)this_command_name;
307+
argv = strvec_from_word_list (list, 1, ip);
308+
argv[0] = savestring (this_command_name);
309309
return argv;
310310
}
311311

‎builtins/enable_def.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656

5757
#include "builtins.hh"
5858
#include "common.hh"
59-
#include "findcmd.hh"
6059
#include "flags.hh"
6160
#include "shell.hh"
6261

0 commit comments

Comments
 (0)