diff options
| -rw-r--r-- | localedata/ChangeLog | 7 | ||||
| -rw-r--r-- | localedata/Makefile | 22 | ||||
| -rw-r--r-- | posix/spawn_faction_addclose.c | 4 | ||||
| -rw-r--r-- | posix/spawn_faction_adddup2.c | 4 | ||||
| -rw-r--r-- | posix/spawn_faction_addopen.c | 4 | ||||
| -rw-r--r-- | posix/spawn_faction_init.c | 13 |
6 files changed, 32 insertions, 22 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index fcfac24db9..e979ab4324 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,12 @@ 2000-09-30 Bruno Haible <haible@clisp.cons.org> + * Makefile (repertoiremaps): Remove variable. + (distribute): Remove repertoiremaps. + (install-others): Likewise. Add .gz to charmaps. + ($(inst_i18ndir)/charmaps/%): Install in gzipped format. + +2000-09-30 Bruno Haible <haible@clisp.cons.org> + * charmaps/ISO-IR-197: Remove alias "none". 2000-09-30 Bruno Haible <haible@clisp.cons.org> diff --git a/localedata/Makefile b/localedata/Makefile index 25ee02d828..ed46db9069 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -31,10 +31,6 @@ charmaps := $(filter-out $(addprefix charmaps/, CVS RCS SCCS %~), \ locales := $(filter-out $(addprefix locales/, CVS RCS SCCS %~), \ $(wildcard locales/*)) -# List of repertoire maps. -repertoiremaps := $(filter-out $(addprefix repertoiremaps/, CVS RCS SCCS %~), \ - $(wildcard repertoiremaps/*)) - subdir-dirs = tests-mbwc vpath %.c tests-mbwc @@ -64,7 +60,7 @@ generated-dirs := $(ld-test-names) tt_TT de_DE.437 \ $(addprefix tstfmon_,$(fmon-tests)) \ distribute := CHECKSUMS README SUPPORTED ChangeLog \ - $(charmaps) $(locales) $(repertoiremaps) \ + $(charmaps) $(locales) \ tst-rpmatch.sh tst-locale.sh tst-fmon.sh sort-test.sh \ tst-fmon.data $(test-input-data) $(ld-test-srcs) \ th_TH.in cs_CZ.in tst-mbswcs.sh tst-trans.sh tst-ctype.sh \ @@ -98,15 +94,21 @@ tests = $(locale_test_suite) tst-digits endif # Files to install. -install-others := $(addprefix $(inst_i18ndir)/, $(charmaps) $(locales) \ - $(repertoiremaps)) +install-others := $(addprefix $(inst_i18ndir)/, \ + $(addsuffix .gz, $(charmaps)) \ + $(locales)) include ../Rules -# Install the source files in the appropriate directories. -$(inst_i18ndir)/charmaps/%: charmaps/% $(+force); $(do-install) +# Install the charmap files in gzipped format. +$(inst_i18ndir)/charmaps/%.gz: charmaps/% $(+force) + $(make-target-directory) + rm -f $(@:.gz=) $@ + $(INSTALL_DATA) $< $(@:.gz=) + gzip -9 $(@:.gz=) + +# Install the locale source files in the appropriate directory. $(inst_i18ndir)/locales/%: locales/% $(+force); $(do-install) -$(inst_i18ndir)/repertoiremaps/%: repertoiremaps/% $(+force); $(do-install) # gcc does not know all the format specifiers we are using here. CFLAGS-tst-mbswcs1.c = -Wno-format diff --git a/posix/spawn_faction_addclose.c b/posix/spawn_faction_addclose.c index b093f2812a..af3b43045d 100644 --- a/posix/spawn_faction_addclose.c +++ b/posix/spawn_faction_addclose.c @@ -35,10 +35,10 @@ posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *file_actions, if (fd < 0 || fd >= maxfd) return EBADF; - /* Allocate more memory of needed. */ + /* Allocate more memory if needed. */ if (file_actions->__used == file_actions->__allocated && __posix_spawn_file_actions_realloc (file_actions) != 0) - /* THis can only mean we ran out of memory. */ + /* This can only mean we ran out of memory. */ return ENOMEM; /* Add the new value. */ diff --git a/posix/spawn_faction_adddup2.c b/posix/spawn_faction_adddup2.c index f8de8ca7f6..46dd5ed129 100644 --- a/posix/spawn_faction_adddup2.c +++ b/posix/spawn_faction_adddup2.c @@ -35,10 +35,10 @@ posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *file_actions, if (fd < 0 || newfd < 0 || fd >= maxfd || newfd >= maxfd) return EBADF; - /* Allocate more memory of needed. */ + /* Allocate more memory if needed. */ if (file_actions->__used == file_actions->__allocated && __posix_spawn_file_actions_realloc (file_actions) != 0) - /* THis can only mean we ran out of memory. */ + /* This can only mean we ran out of memory. */ return ENOMEM; /* Add the new value. */ diff --git a/posix/spawn_faction_addopen.c b/posix/spawn_faction_addopen.c index 3e0c62659e..f438ec1c1e 100644 --- a/posix/spawn_faction_addopen.c +++ b/posix/spawn_faction_addopen.c @@ -36,10 +36,10 @@ posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions, if (fd < 0 || fd >= maxfd) return EBADF; - /* Allocate more memory of needed. */ + /* Allocate more memory if needed. */ if (file_actions->__used == file_actions->__allocated && __posix_spawn_file_actions_realloc (file_actions) != 0) - /* THis can only mean we ran out of memory. */ + /* This can only mean we ran out of memory. */ return ENOMEM; /* Add the new value. */ diff --git a/posix/spawn_faction_init.c b/posix/spawn_faction_init.c index edd41ddd6f..f4b0775b0b 100644 --- a/posix/spawn_faction_init.c +++ b/posix/spawn_faction_init.c @@ -21,23 +21,24 @@ #include <stdlib.h> #include <string.h> +#include "spawn_int.h" + /* Function used to increase the size of the allocated array. This function is called from the `add'-functions. */ int __posix_spawn_file_actions_realloc (posix_spawn_file_actions_t *file_actions) { + int newalloc = file_actions->__allocated + 8; void *newmem = realloc (file_actions->__actions, - file_actions->__allocated += 8); + newalloc * sizeof (struct __spawn_action)); if (newmem == NULL) - { - /* Not enough memory. */ - file_actions->__allocated -= 8; - return ENOMEM; - } + /* Not enough memory. */ + return ENOMEM; file_actions->__actions = (struct __spawn_action *) newmem; + file_actions->__allocated = newalloc; return 0; } |