+++ /dev/null
-diff -Nur coreutils-4.5.3.orig/doc/coreutils.texi coreutils-4.5.3/doc/coreutils.texi
---- coreutils-4.5.3.orig/doc/coreutils.texi Sun Oct 27 22:19:34 2002
-+++ coreutils-4.5.3/doc/coreutils.texi Sun Oct 27 22:48:17 2002
-@@ -6188,6 +6188,11 @@
- @xref{Backup options}.
- Make a backup of each file that would otherwise be overwritten or removed.
-
-+@item -C
-+@opindex -C
-+Install file, unless target already exists and is the same file, in which
-+case the modification time is not changed.
-+
- @item -c
- @opindex -c
- Ignored; for compatibility with old Unix versions of @command{install}.
---- coreutils-6.10/src/install.c.orig 2008-01-05 23:59:11.000000000 +0100
-+++ coreutils-6.10/src/install.c 2008-03-02 02:21:08.251625392 +0100
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <getopt.h>
- #include <sys/types.h>
-+#include <sys/mman.h>
- #include <signal.h>
- #include <pwd.h>
- #include <grp.h>
-@@ -123,6 +124,9 @@
- or S_ISGID bits. */
- static mode_t dir_mode_bits = CHMOD_MODE_BITS;
-
-+/* Compare files before installing (-C) */
-+static int docompare=0;
-+
- /* If true, strip executable files after copying them. */
- static bool strip_files;
-
-@@ -160,6 +164,82 @@
- {NULL, 0, NULL, 0}
- };
-
-+int compare (const char *file, const char *to)
-+{
-+ void *p, *q;
-+ int ret=0;
-+ size_t size;
-+ int done=0;
-+ struct stat file_s, to_s;
-+ int file_fd, to_fd;
-+
-+ stat(file, &file_s);
-+ stat(to, &to_s);
-+
-+ if (file_s.st_size != to_s.st_size)
-+ return 1;
-+
-+ file_fd = open(file, O_RDONLY);
-+ if (file_fd < 0)
-+ return 1;
-+
-+ to_fd = open(to, O_RDONLY);
-+ if (to_fd < 0)
-+ {
-+ close(file_fd);
-+ return 1;
-+ }
-+
-+ size = (size_t) file_s.st_size;
-+ if (size <= 4194309) /* Don't try to mmap() files > 4 MB */
-+ {
-+ p = mmap(NULL, size, PROT_READ, MAP_SHARED, file_fd, (off_t) 0);
-+ if (p != MAP_FAILED)
-+ {
-+ q = mmap(NULL, size, PROT_READ, MAP_SHARED, to_fd, (off_t) 0);
-+ if (q == MAP_FAILED)
-+ {
-+ munmap(p, size);
-+ }
-+ else
-+ {
-+ ret = (memcmp(p, q, size)==0) ? 0 : 1;
-+ munmap(p, size);
-+ munmap(q, size);
-+ done = 1;
-+ }
-+ }
-+ }
-+ if (!done)
-+ {
-+ char buf1[65536], buf2[65536];
-+ int n1, n2;
-+
-+ lseek(file_fd, 0, SEEK_SET);
-+ lseek(to_fd, 0, SEEK_SET);
-+ while (ret == 0)
-+ {
-+ n1 = read(file_fd, buf1, sizeof(buf1));
-+ if (n1 == 0)
-+ break;
-+ else if (n1 > 0)
-+ {
-+ n2 = read(to_fd, buf2, n1);
-+ if (n2 == n1)
-+ ret = memcmp(buf1, buf2, n1);
-+ else
-+ ret = 1; /* ouf of sync */
-+ }
-+ else
-+ ret = 1; /* read failure */
-+ }
-+ }
-+
-+ close(file_fd);
-+ close(to_fd);
-+ return ret;
-+}
-+
- static void
- cp_option_init (struct cp_options *x)
- {
-@@ -345,7 +425,7 @@
- we'll actually use backup_suffix_string. */
- backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-
-- while ((optc = getopt_long (argc, argv, "bcsDdg:m:o:pt:TvS:Z:", long_options,
-+ while ((optc = getopt_long (argc, argv, "bCcsDdg:m:o:pt:TvS:Z:", long_options,
- NULL)) != -1)
- {
- switch (optc)
-@@ -357,6 +437,9 @@
- break;
- case 'c':
- break;
-+ case 'C':
-+ docompare=1;
-+ break;
- case 's':
- strip_files = true;
- #ifdef SIGCHLD
-@@ -627,6 +710,12 @@
- However, since !x->recursive, the call to "copy" will fail if FROM
- is a directory. */
-
-+ if (docompare)
-+ {
-+ if(compare(from, to) == 0) /* Files are identical */
-+ return true;
-+ }
-+
- return copy (from, to, false, x, ©_into_self, NULL);
- }
-
-@@ -805,6 +894,9 @@
- --backup[=CONTROL] make a backup of each existing destination file\n\
- -b like --backup but does not accept an argument\n\
- -c (ignored)\n\
-+ -C install file, unless the target already exists and is the\n\
-+ same, in which case mtime will remain unchanged\n\
-+ (for compatibility with *BSD)\n\
- -d, --directory treat all arguments as directory names; create all\n\
- components of the specified directories\n\
- "), stdout);
---- coreutils-6.4/po/pl.po.orig 2006-10-24 22:32:17.793354500 +0200
-+++ coreutils-6.4/po/pl.po 2006-10-24 22:34:53.511086250 +0200
-@@ -1854,6 +1854,9 @@
- "argument\n"
- " --copy-contents copy contents of special files when "
- "recursive\n"
-+" -C install file, unless the target already exists and is the\n"
-+" same, in which case mtime will remain unchanged\n"
-+" (for compatibility with *BSD)\n"
- " -d same as --no-dereference --preserve=links\n"
- msgstr ""
- " -a, --archive to samo co -dpR\n"
-@@ -1863,6 +1866,10 @@
- " -b jak --backup, ale bez podawania argumentu\n"
- " --copy-contents kopiowanie zawartości pliku specjalnego w\n"
- " przypadku rekursji\n"
-+ " -c (ignorowane)\n"
-+" -C instalowanie pliku, chyba że plik docelowy już istnieje\n"
-+" i jest taki sam - wtedy mtime pozostanie nie zmieniony\n"
-+" (dla kompatybilności z *BSD)\n"
- " -d to samo co --no-dereference --preserve=link\n"
-
- #: src/cp.c:186
+++ /dev/null
---- coreutils-6.10/po/da.po.orig 2008-01-09 11:29:11.000000000 +0100
-+++ coreutils-6.10/po/da.po 2008-03-02 13:35:58.511033776 +0100
-@@ -2882,27 +2882,27 @@
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr " Inoder IBrugt IFri IBrug%%"
-+msgstr " Inoder IBrugt IFri IBrug%%"
-
- #: src/df.c:158
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Størr Brugt Tilb Brug%%"
-+msgstr " Størr Brugt Tilb Brug%%"
-
- #: src/df.c:160
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Størr Brugt Tilb Brug"
-+msgstr " Størr Brugt Tilb Brug%%"
-
- #: src/df.c:163
--#, fuzzy, c-format
-+#, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %4s-blokke Brugt Tilbage Kapacitet"
-+msgstr " %s-blokke Brugt Tilbage Kapacitet"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr " %4s-blokke Brugt Tilbage Brug%%"
-+msgstr " %4s-blokke Brugt Tilbage Brug%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/es.po.orig 2008-01-09 11:29:12.000000000 +0100
-+++ coreutils-6.10/po/es.po 2008-03-02 13:38:51.940916982 +0100
-@@ -3305,9 +3305,9 @@
- # El espacio inicial es necesario para que la palabra Bloques no aparezca
- # pegada a la palabra Tipo cuando se usa df -T.
- #: src/df.c:163
--#, fuzzy, c-format
-+#, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " Bloques de %-4s Usado Dispon Ocupado"
-+msgstr " Bloques de %s Usado Dispon Ocupado"
-
- #: src/df.c:192
- #, c-format
---- coreutils-6.10/po/et.po.orig 2008-01-09 11:29:12.000000000 +0100
-+++ coreutils-6.10/po/et.po 2008-03-02 13:57:47.405623428 +0100
-@@ -2967,7 +2967,7 @@
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr " I-kirjeid IKasut IVaba IKas%%"
-+msgstr " I-kirjeid IKasut IVaba IKas%%"
-
- #: src/df.c:158
- #, c-format
-@@ -2977,17 +2977,17 @@
- #: src/df.c:161
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Maht Kasut Vaba Kas%%"
-+msgstr " Maht Kasut Vaba Kas%%"
-
- #: src/df.c:163
- #, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %s-plokki Kasut Vaba Maht"
-+msgstr " %s-plokki Kasut Vaba Maht"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr "%4s-blokke Kasut Vaba Kas%%"
-+msgstr " %4s-blokke Kasut Vaba Kas%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/fi.po.orig 2008-01-09 11:29:13.000000000 +0100
-+++ coreutils-6.10/po/fi.po 2008-03-02 13:59:17.490757087 +0100
-@@ -2989,7 +2989,7 @@
-
- #: src/df.c:151
- msgid "Filesystem "
--msgstr "Tiedostojärjestelmä"
-+msgstr "Tied.järj. "
-
- #: src/df.c:154
- #, c-format
-@@ -2999,7 +2999,7 @@
- #: src/df.c:158
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Koko Käyt Vapaa Käy%%"
-+msgstr " Koko Käyt Vapaa Käy%%"
-
- # "Käy%" on epäselvä, mutta tilaa ei ole sarakkeessa yhtään enempää.
- #: src/df.c:160
-@@ -3012,12 +3012,12 @@
- #: src/df.c:163
- #, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %s-lohkot Käytetty Vapaana Käytetty"
-+msgstr " %s-lohkot Käytetty Vapaana Käytetty"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr "%4s-lohkot Käytetty Vapaana Käy%%"
-+msgstr " %4s-lohkot Käytetty Vapaana Käy%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/fr.po.orig 2008-01-09 11:29:13.000000000 +0100
-+++ coreutils-6.10/po/fr.po 2008-03-02 14:00:54.620292184 +0100
-@@ -3070,7 +3070,7 @@
-
- #: src/df.c:149
- msgid "Filesystem Type"
--msgstr "Sys. de fich. Type "
-+msgstr "Sys. de fich. Type"
-
- #: src/df.c:151
- msgid "Filesystem "
-@@ -3079,27 +3079,27 @@
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr " Inodes IUtil. ILib. %%IUti."
-+msgstr " Inodes IUtil. ILib. %%IUti."
-
- #: src/df.c:158
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Tail. Occ. Disp. %%Occ."
-+msgstr " Tail. Occ. Disp. %%Occ."
-
- #: src/df.c:160
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Tail. Occ. Disp. %%Occ."
-+msgstr " Tail. Occ. Disp. %%Occ."
-
- #: src/df.c:163
- #, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %s-blocs Capacité Disponible Occupée"
-+msgstr " %s-blocs Capacité Disponible Occupée"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr " %4s-blocs Occupé Disponible Capacité"
-+msgstr " %4s-blocs Occupé Disponible Uti%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/gl.po.orig 2008-01-09 11:29:14.000000000 +0100
-+++ coreutils-6.10/po/gl.po 2008-03-02 14:02:45.558614199 +0100
-@@ -2778,14 +2778,12 @@ msgid "truncating at %<PRIuMAX> bytes in
- msgstr "avanzando os pasados %s bytes no ficheiro de saída %s"
-
- #: src/df.c:149
--#, fuzzy
- msgid "Filesystem Type"
--msgstr "Sist. Fich "
-+msgstr "Sist. Fich Tipo"
-
- #: src/df.c:151
--#, fuzzy
- msgid "Filesystem "
--msgstr "Sist. Fich "
-+msgstr "Sist. Fich "
-
- #: src/df.c:154
- #, c-format
-@@ -2798,19 +2796,19 @@
- msgstr " Tamaño Usado Disp Uso%%"
-
- #: src/df.c:160
--#, fuzzy, c-format
-+#, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Tamaño Usado Disp Uso%%"
-+msgstr " Tamaño Usado Disp Uso%%"
-
- #: src/df.c:163
--#, fuzzy, c-format
-+#, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr "bloques-%4d Usado Dispoñib Capacid"
-+msgstr "bloques-%s Usado Dispoñib Capacid"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr "bloques-%4s Usado Dispoñib Uso%%"
-+msgstr "bloques-%-4s Usado Dispoñib Uso%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/hu.po.orig 2008-01-16 21:22:07.000000000 +0100
-+++ coreutils-6.10/po/hu.po 2008-03-02 14:05:02.370410659 +0100
-@@ -3058,36 +3058,36 @@
-
- #: src/df.c:149
- msgid "Filesystem Type"
--msgstr "Fájlrendszer Típus"
-+msgstr "Fájlrendszer Típus"
-
- #: src/df.c:151
- msgid "Filesystem "
--msgstr "Fájlrendszer "
-+msgstr "Fájlrendszer "
-
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr "Inode-ok IFogl. ISzab. IFo.%%"
-+msgstr " Inode-ok IFogl. ISzab. IFo.%%"
-
- #: src/df.c:158
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Méret Fogl. Szab. Fo.%%"
-+msgstr " Méret Fogl. Szab. Fo.%%"
-
- #: src/df.c:160
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Méret Fogl. Szab. Fo.%%"
-+msgstr " Méret Fogl. Szab. Fo.%%"
-
- #: src/df.c:163
- #, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %s-blokk Fogl. Szabad Kapacitás"
-+msgstr " %s-blokk Fogl. Szabad Kapacitás"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr "%4s-blokk Foglalt Szabad Fo.%%"
-+msgstr " %4s-blokk Foglalt Szabad Fo.%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/it.po.orig 2008-01-09 11:29:14.000000000 +0100
-+++ coreutils-6.10/po/it.po 2008-03-02 14:06:25.751162257 +0100
-@@ -2851,19 +2851,17 @@
- msgstr "avanzamento di %s byte nel file di output %s"
-
- #: src/df.c:149
--#, fuzzy
- msgid "Filesystem Type"
--msgstr "Filesystem "
-+msgstr "Filesystem Tipo"
-
- #: src/df.c:151
--#, fuzzy
- msgid "Filesystem "
--msgstr "Filesystem "
-+msgstr "Filesystem "
-
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr " Inode IUsati ILib. IUso%%"
-+msgstr " Inode IUsati ILib. IUso%%"
-
- #: src/df.c:158
- #, c-format
-@@ -2873,17 +2871,17 @@
- #: src/df.c:160
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Dimens. Usati Disp. Uso%%"
-+msgstr " Dimens. Usati Disp. Uso%%"
-
- #: src/df.c:163
--#, fuzzy, c-format
-+#, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr "blocchi di %d Usati Disponib. Capacità"
-+msgstr "blocchi di %s Usati Disponib. Capacità"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr "blocchi di %4s Usati Disponib. Uso%%"
-+msgstr "blocchi di %4s Usati Disponib. Uso%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/ja.po.orig 2008-01-09 11:29:15.000000000 +0100
-+++ coreutils-6.10/po/ja.po 2008-03-02 14:08:49.391347844 +0100
-@@ -2850,34 +2850,32 @@
- msgstr "出力ファイル %s の直前 %s バイトを進めます"
-
- #: src/df.c:149
--#, fuzzy
- msgid "Filesystem Type"
--msgstr "Filesystem "
-+msgstr "Filesystem タイプ"
-
- #: src/df.c:151
--#, fuzzy
- msgid "Filesystem "
--msgstr "Filesystem "
-+msgstr "Filesystem "
-
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr " Iノード I使用 I残り I使用%%"
-+msgstr " Iノード I使用 I残り I使用%%"
-
- #: src/df.c:158
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " サイズ 使用 残り 使用%%"
-+msgstr " サイズ 使用 残り 使用%%"
-
- #: src/df.c:160
--#, fuzzy, c-format
-+#, c-format
- msgid " Size Used Avail Use%%"
--msgstr " サイズ 使用 残り 使用%%"
-+msgstr " サイズ 使用 残り 使用%%"
-
- #: src/df.c:163
--#, fuzzy, c-format
-+#, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %4d-blocks Used Available Capacity"
-+msgstr " %s-blocks Used Available Capacity"
-
- #: src/df.c:194
- #, c-format
---- coreutils-6.10/po/pt_BR.po.orig 2008-01-09 11:29:16.000000000 +0100
-+++ coreutils-6.10/po/pt_BR.po 2008-03-02 14:11:23.636137754 +0100
-@@ -2814,7 +2814,7 @@
-
- #: src/df.c:149
- msgid "Filesystem Type"
--msgstr "Sist. Arq. Tipo "
-+msgstr "Sist. Arq. Tipo"
-
- #: src/df.c:151
- msgid "Filesystem "
-@@ -2823,27 +2823,27 @@
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr " Inodes IUsados ILivr IUso%%"
-+msgstr " Inodes IUsados ILivr IUso%%"
-
- #: src/df.c:158
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Tam Usad Disp Uso%%"
-+msgstr " Tam Usad Disp Uso%%"
-
- #: src/df.c:160
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Tam Usado Disp Uso%%"
-+msgstr " Tam Usado Disp Uso%%"
-
- #: src/df.c:163
--#, fuzzy, c-format
-+#, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %4s-blocos Usad Dispon. Capacidade"
-+msgstr " %s-blocos Usad Dispon. Capacidade"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr " %4s-blocos Usad Dispon. Uso%%"
-+msgstr " %4s-blocos Usad Dispon. Uso%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/ru.po.orig 2008-01-09 11:29:16.000000000 +0100
-+++ coreutils-6.10/po/ru.po 2008-03-02 14:12:56.225414117 +0100
-@@ -3017,7 +3017,7 @@
-
- #: src/df.c:149
- msgid "Filesystem Type"
--msgstr "Ф. система Тип "
-+msgstr "Ф. система Тип"
-
- #: src/df.c:151
- msgid "Filesystem "
-@@ -3026,27 +3026,27 @@
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr " Инодов Испол Своб Исп %%"
-+msgstr " Инодов Испол Своб Исп%%"
-
- #: src/df.c:158
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Разм Исп Дост Исп%%"
-+msgstr " Разм Исп Дост Исп%%"
-
- #: src/df.c:160
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Разм Исп Дост Исп%%"
-+msgstr " Разм Исп Дост Исп%%"
-
- #: src/df.c:163
- #, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %s-блоков Исп Доступно Всего"
-+msgstr " %s-блоков Исп Доступно Всего"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr " %4s-блоков Исп Доступно Исп%%"
-+msgstr " %4s-блоков Исп Доступно Исп%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/sk.po.orig 2008-01-09 11:29:17.000000000 +0100
-+++ coreutils-6.10/po/sk.po 2008-03-02 14:14:53.360089241 +0100
-@@ -2804,36 +2804,36 @@
-
- #: src/df.c:149
- msgid "Filesystem Type"
--msgstr "Súborový systém Typ"
-+msgstr "Súborový syst. Typ"
-
- #: src/df.c:151
- msgid "Filesystem "
--msgstr "Súborový systém "
-+msgstr "Súborový systém "
-
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr " I-uzly IPouž IVoľ IPou%%"
-+msgstr " I-uzly IPouž IVoľ IPou%%"
-
- #: src/df.c:158
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Veľk Použ Dost Pou%%"
-+msgstr " Veľk Použ Dost Pou%%"
-
- #: src/df.c:160
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Veľk Použ Dost Pou%%"
-+msgstr " Veľk Použ Dost Pou%%"
-
- #: src/df.c:163
- #, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %s-blokov Použ Dostupné Kapacita"
-+msgstr " %s-blokov Použ Dostupné Kapacita"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr " %4s-bloky Použ Dostupné Pou%%"
-+msgstr " %4s-bloky Použ Dostupné Pou%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/tr.po.orig 2008-01-09 11:29:18.000000000 +0100
-+++ coreutils-6.10/po/tr.po 2008-03-02 14:16:34.765868027 +0100
-@@ -3007,7 +3007,7 @@
-
- #: src/df.c:149
- msgid "Filesystem Type"
--msgstr "Dosyasistemi Türü"
-+msgstr "Dosyasistemi Türü"
-
- #: src/df.c:149
- msgid "Filesystem "
-@@ -3016,27 +3016,27 @@
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr "Dosyaindeksi Dolu Boş Kull%%"
-+msgstr "Dosyaindeksi Dolu Boş Kull%%"
-
- #: src/df.c:158
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Boy Dolu Boş Kull%%"
-+msgstr " Boy Dolu Boş Kull%%"
-
- #: src/df.c:160
- #, c-format
- msgid " Size Used Avail Use%%"
--msgstr " Boy Dolu Boş Kull%%"
-+msgstr " Boy Dolu Boş Kull%%"
-
- #: src/df.c:163
--#, fuzzy, c-format
-+#, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %4s-blok Dolu Boş Kapasite"
-+msgstr " %s-blok Dolu Boş Kapasite"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr " %4s-blok Dolu Boş Kull%%"
-+msgstr " %4s-blok Dolu Boş Kull%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/zh_CN.po.orig 2008-01-09 11:29:18.000000000 +0100
-+++ coreutils-6.10/po/zh_CN.po 2008-03-02 14:17:57.026555797 +0100
-@@ -2789,14 +2789,14 @@
- msgstr " 容量 已用 可用 已用%%"
-
- #: src/df.c:163
--#, fuzzy, c-format
-+#, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %4d-块 已用 可用 容量"
-+msgstr " %s-块 已用 可用 容量"
-
- #: src/df.c:194
- #, c-format
- msgid " %4s-blocks Used Available Use%%"
--msgstr " %4s-块 已用 可用 已用%%"
-+msgstr " %4s-块 已用 可用 已用%%"
-
- #: src/df.c:198
- #, c-format
---- coreutils-6.10/po/zh_TW.po.orig 2008-01-09 11:29:18.000000000 +0100
-+++ coreutils-6.10/po/zh_TW.po 2008-03-02 14:18:59.138095332 +0100
-@@ -2830,7 +2830,7 @@
- #: src/df.c:154
- #, c-format
- msgid " Inodes IUsed IFree IUse%%"
--msgstr " Inode I已用 I可用 I已用%%"
-+msgstr " Inode I已用 I可用 I已用%%"
-
- #: src/df.c:158
- #, c-format
-@@ -2843,9 +2843,9 @@
- msgstr " 容量 已用 可用 已用%%"
-
- #: src/df.c:163
--#, fuzzy, c-format
-+#, c-format
- msgid " %s-blocks Used Available Capacity"
--msgstr " %4s-區段 已用 可用 容量"
-+msgstr " %s-區段 已用 可用 容量"
-
- #: src/df.c:194
- #, c-format
+++ /dev/null
---- coreutils-6.12/lib/utimens.c 2008-05-29 09:21:57.000000000 -0400
-+++ coreutils/lib/utimens.c 2008-06-07 11:36:50.000000000 -0400
-@@ -96,20 +96,42 @@
- #endif
-
- /* POSIX 200x added two interfaces to set file timestamps with
-- nanosecond resolution. */
-+ nanosecond resolution. We provide a fallback for ENOSYS (for
-+ example, compiling against Linux 2.6.25 kernel headers and glibc
-+ 2.7, but running on Linux 2.6.18 kernel). */
- #if HAVE_UTIMENSAT
- if (fd < 0)
-- return utimensat (AT_FDCWD, file, timespec, 0);
-+ {
-+ int result = utimensat (AT_FDCWD, file, timespec, 0);
-+#ifdef __linux__
-+ /* Work around what might be a kernel bug:
-+ http://bugzilla.redhat.com/442352
-+ http://bugzilla.redhat.com/449910
-+ It appears that utimensat can mistakenly return 280 rather
-+ than 0 to indicate success.
-+ FIXME: remove in 2010 or whenever the offending kernels
-+ are no longer in common use. */
-+ if (0 < result)
-+ result = 0;
-+#endif
-+
-+ if (result == 0 || errno != ENOSYS)
-+ return result;
-+ }
- #endif
- #if HAVE_FUTIMENS
-- return futimens (fd, timespec);
--#else
-+ {
-+ int result = futimens (fd, timespec);
-+ if (result == 0 || errno != ENOSYS)
-+ return result;
-+ }
-+#endif
-
- /* The platform lacks an interface to set file timestamps with
- nanosecond resolution, so do the best we can, discarding any
- fractional part of the timestamp. */
- {
--# if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES
-+#if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES
- struct timeval timeval[2];
- struct timeval const *t;
- if (timespec)
-@@ -125,9 +147,9 @@
-
- if (fd < 0)
- {
--# if HAVE_FUTIMESAT
-+# if HAVE_FUTIMESAT
- return futimesat (AT_FDCWD, file, t);
--# endif
-+# endif
- }
- else
- {
-@@ -141,21 +163,21 @@
- worth optimizing, and who knows what other messed-up systems
- are out there? So play it safe and fall back on the code
- below. */
--# if HAVE_FUTIMESAT
-+# if HAVE_FUTIMESAT
- if (futimesat (fd, NULL, t) == 0)
- return 0;
--# elif HAVE_FUTIMES
-+# elif HAVE_FUTIMES
- if (futimes (fd, t) == 0)
- return 0;
--# endif
-+# endif
- }
--# endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */
-+#endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */
-
- if (!file)
- {
--# if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES))
-+#if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES))
- errno = ENOSYS;
--# endif
-+#endif
-
- /* Prefer EBADF to ENOSYS if both error numbers apply. */
- if (errno == ENOSYS)
-@@ -170,9 +192,9 @@
- return -1;
- }
-
--# if HAVE_WORKING_UTIMES
-+#if HAVE_WORKING_UTIMES
- return utimes (file, t);
--# else
-+#else
- {
- struct utimbuf utimbuf;
- struct utimbuf const *ut;
-@@ -187,9 +209,8 @@
-
- return utime (file, ut);
- }
--# endif /* !HAVE_WORKING_UTIMES */
-+#endif /* !HAVE_WORKING_UTIMES */
- }
--#endif /* !HAVE_FUTIMENS */
- }
-
- /* Set the access and modification time stamps of FILE to be
projects / packages / coreutils.git / commitdiff