diff options
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | config.h.in | 6 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | lib/backup-files.c | 17 | ||||
| -rw-r--r-- | po/de.po | 12 | ||||
| -rw-r--r-- | po/fr.po | 12 | ||||
| -rw-r--r-- | po/ja.po | 12 | ||||
| -rw-r--r-- | po/quilt.pot | 12 | ||||
| -rw-r--r-- | quilt.changes | 7 |
9 files changed, 55 insertions, 43 deletions
diff --git a/Makefile.in b/Makefile.in index 8840217..b568962 100644 --- a/Makefile.in +++ b/Makefile.in @@ -217,9 +217,6 @@ $(PACKAGE)-$(ISODATE).tar.bz2 : $(SRC) configure $(PACKAGE).spec rm -f $(PACKAGE)-$(ISODATE) @echo "File $@ created." -configure : configure.ac - autoconf - $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile @echo "Generating spec file" ; \ set -e ; \ @@ -229,7 +226,8 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile gsub(/@CHANGELOG''@/, changelog) ; \ print }' changelog="$$changelog" $< > $@ -% : %.in Makefile +$(patsubst %.in,%,$(wildcard quilt/*.in scripts/*.in)) :: Makefile +% :: %.in @echo "$< -> $@" >&2 @sed -e 's:@LIB''@:$(LIB_DIR):g' \ -e 's:@QUILT''@:$(QUILT_DIR):g' \ @@ -251,9 +249,10 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ $< > $@ +lib/backup-files.o :: config.h + Makefile : Makefile.in - @echo "Please run ./configure by hand" - @false + @echo "Please run ./configure" install-main: scripts $(INSTALL) -d $(BUILD_ROOT)$(bindir) diff --git a/config.h.in b/config.h.in index 3e55591..fce2675 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,11 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the `chmod' function. */ +#undef HAVE_CHMOD + +/* Define to 1 if you have the `fchmod' function. */ +#undef HAVE_FCHMOD + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H diff --git a/configure.ac b/configure.ac index 5cf58e3..92e3672 100644 --- a/configure.ac +++ b/configure.ac @@ -2,19 +2,18 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([quilt],[0.42],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.46 $) +AC_REVISION ($Revision: 1.47 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) dnl Setup for backup-files compilation AC_HEADER_STDC +AC_CHECK_FUNCS([fchmod chmod]) AC_CHECK_FUNCS([mkstemp mktemp], break) -AC_CHECK_FUNCS([mkdir]) -AC_CHECK_FUNCS([rmdir]) -AC_CHECK_FUNCS([strchr]) +AC_CHECK_FUNCS([mkdir rmdir]) +AC_CHECK_FUNCS([strchr strrchr]) AC_CHECK_FUNCS([strerror]) -AC_CHECK_FUNCS([strrchr]) AC_C_CONST AC_FUNC_STAT diff --git a/lib/backup-files.c b/lib/backup-files.c index 3d2d183..831379f 100644 --- a/lib/backup-files.c +++ b/lib/backup-files.c @@ -166,7 +166,11 @@ link_or_copy(const char *from, struct stat *st, const char *to) close(from_fd); return 1; } +#if defined(HAVE_FCHMOD) (void) fchmod(to_fd, st->st_mode); +#elif defined(HAVE_CHMOD) + (void) chmod(to, st->st_mode); +#endif if (copy(from_fd, to_fd)) { fprintf(stderr, "%s -> %s: %s\n", from, to, strerror(errno)); unlink(to); @@ -217,7 +221,11 @@ ensure_nolinks(const char *filename) goto fail; if (copy(from_fd, to_fd)) goto fail; - (void) fchmod(to_fd, st.st_mode); +#if defined(HAVE_FCHMOD) + (void) fchmod(to_fd, st.st_mode); +#elif defined(HAVE_CHMOD) + (void) chmod(tmpname, st.st_mode); +#endif if (rename(tmpname, filename)) goto fail; @@ -299,16 +307,9 @@ process_file(const char *file) goto fail; } } - if (!(st.st_mode & S_IWUSR)) { - /* Change mode of backup file so that we - can later remove it. */ - chmod(backup, st.st_mode | S_IWUSR); - } unlink(backup); remove_parents(backup); } else if (opt_what == what_remove) { - /* Change mode of backup file so that we can remove it. */ - chmod(backup, S_IWUSR); unlink(backup); remove_parents(backup); } else if (opt_what == what_noop) { @@ -14,19 +14,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: bin/quilt.in:33 +#: bin/quilt.in:29 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-h] ..." -#: bin/quilt.in:34 +#: bin/quilt.in:30 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:36 +#: bin/quilt.in:32 msgid "Commands are:" msgstr "Vorhandene Befehle:" -#: bin/quilt.in:41 +#: bin/quilt.in:37 msgid "" "\n" "Global options:\n" @@ -1374,7 +1374,7 @@ msgstr "Datei %s ist verschwunden\n" msgid "Failed to rename %s to %s: %s\n" msgstr "Konnte %s nicht auf %s umbenennen: %s\n" -#: scripts/patchfns.in:704 +#: scripts/patchfns.in:700 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1387,7 +1387,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: scripts/patchfns.in:789 +#: scripts/patchfns.in:785 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -13,19 +13,19 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: bin/quilt.in:33 +#: bin/quilt.in:29 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Usage : quilt [--trace[=verbose]] [--quiltrc=XX] commande [-h] ..." -#: bin/quilt.in:34 +#: bin/quilt.in:30 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:36 +#: bin/quilt.in:32 msgid "Commands are:" msgstr "Les commandes sont :" -#: bin/quilt.in:41 +#: bin/quilt.in:37 msgid "" "\n" "Global options:\n" @@ -1390,7 +1390,7 @@ msgstr "Le fichier %s a disparu !\n" msgid "Failed to rename %s to %s: %s\n" msgstr "Impossible de renommer %s en %s : %s\n" -#: scripts/patchfns.in:704 +#: scripts/patchfns.in:700 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1402,7 +1402,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilisée pour les appliquer avant d'installer une version plus ancienne.\\n" -#: scripts/patchfns.in:789 +#: scripts/patchfns.in:785 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -12,19 +12,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: bin/quilt.in:33 +#: bin/quilt.in:29 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "使ã„æ–¹: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." -#: bin/quilt.in:34 +#: bin/quilt.in:30 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:36 +#: bin/quilt.in:32 msgid "Commands are:" msgstr "コマンド一覧:" -#: bin/quilt.in:41 +#: bin/quilt.in:37 msgid "" "\n" "Global options:\n" @@ -1351,7 +1351,7 @@ msgstr "ファイル %s ãŒæ¶ˆãˆã¾ã—ãŸ!\n" msgid "Failed to rename %s to %s: %s\n" msgstr "パッム%s ã‹ã‚‰ %sã¸ã®åå‰ã®å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: scripts/patchfns.in:704 +#: scripts/patchfns.in:700 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1363,7 +1363,7 @@ msgstr "" "ã¦ã„ã¾ã›ã‚“。ダウングレードã™ã‚‹å‰ã«ã€pushã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® quiltを使ã£ã¦ã€\n" "ã™ã¹ã¦ã®ãƒ‘ッãƒã‚’ pop ã—ã¦ãã ã•ã„。\\n" -#: scripts/patchfns.in:789 +#: scripts/patchfns.in:785 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 08685b9..e969470 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -1,16 +1,16 @@ -#: bin/quilt.in:33 +#: bin/quilt.in:29 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "" -#: bin/quilt.in:34 +#: bin/quilt.in:30 msgid " quilt --version" msgstr "" -#: bin/quilt.in:36 +#: bin/quilt.in:32 msgid "Commands are:" msgstr "" -#: bin/quilt.in:41 +#: bin/quilt.in:37 msgid "" "\n" "Global options:\n" @@ -969,7 +969,7 @@ msgstr "" msgid "Failed to rename %s to %s: %s\n" msgstr "" -#: scripts/patchfns.in:704 +#: scripts/patchfns.in:700 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -977,7 +977,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: scripts/patchfns.in:789 +#: scripts/patchfns.in:785 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/quilt.changes b/quilt.changes index 60746bd..8132ec6 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sun Sep 18 12:55:17 CEST 2005 - agruen@suse.de + +- lib/backup-files.c: add missing dependency on config.h. Check + for chmod and fchmod support. Remove two unnecessary chmod calls. +- Makefile.in: fix cyclic dependency on Makefile. + +------------------------------------------------------------------- Sun Sep 18 12:32:41 CEST 2005 - agruen@suse.de - lib/backup-files.c: use mktemp if mkstemp is not available |