From 1a251f9934739302aa7537e6f8f744f123d00247 Mon Sep 17 00:00:00 2001 From: wbaumann Date: Fri, 27 May 2011 20:46:44 +0000 Subject: [PATCH] missing include canonicalize.h --- ChangeLog | 4 ++++ Makefile.am | 3 ++- po/cs.po | 28 ++++++++++++++-------------- po/davfs2.pot | 28 ++++++++++++++-------------- po/de.po | 28 ++++++++++++++-------------- src/umount_davfs.c | 1 + 6 files changed, 49 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 660bc6d..5218d49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ ChangeLog for davfs2 -------------------- +2011-05-27 Werner Baumann (werner.baumann@onlinehome.de) + * umount_davfs.c: + Missing #include "canonicalize.h" + 2011-04-03 Werner Baumann (werner.baumann@onlinehome.de) * mount_davfs.c, mount_davfs.h: Remove check for someone elses home directory diff --git a/Makefile.am b/Makefile.am index 7b2e993..66d757b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,8 @@ ## Process this file with automake to produce Makefile.in EXTRA_DIST = bootstrap BUGS FAQ README.translators \ - config/COPYING.davfs2 config/INSTALL.davfs2 + config/COPYING.davfs2 config/INSTALL.davfs2 \ + config/gnulib-cache.m4 SUBDIRS = gl glpo po etc man src ACLOCAL_AMFLAGS = -I config doc_DATA = AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README \ diff --git a/po/cs.po b/po/cs.po index 441f770..640fb59 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2011-04-03 09:59+0200\n" +"POT-Creation-Date: 2011-05-27 21:29+0200\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -373,7 +373,7 @@ msgstr "kernel nezná souborový systém %s" msgid "mount point is busy" msgstr "přípojný bod je zaneprázdněn" -#: src/mount_davfs.c:942 src/umount_davfs.c:90 +#: src/mount_davfs.c:942 src/umount_davfs.c:91 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -384,15 +384,15 @@ msgstr "" "Program je poskytován BEZ JAKÉKOLIV záruky, včetně záruky PRODEJNOSTI či " "VHODNOSTI K URČITÉMU ÚČELU.\n" -#: src/mount_davfs.c:958 src/umount_davfs.c:115 +#: src/mount_davfs.c:958 src/umount_davfs.c:116 msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:967 src/umount_davfs.c:121 +#: src/mount_davfs.c:967 src/umount_davfs.c:122 msgid "missing argument" msgstr "chybějící argument" -#: src/mount_davfs.c:980 src/umount_davfs.c:123 +#: src/mount_davfs.c:980 src/umount_davfs.c:124 msgid "too many arguments" msgstr "příliš mnoho argumentů" @@ -626,7 +626,7 @@ msgstr "" " [no]suid : (ne)povolit účinnost suid a sgid bitů\n" " [no]_netdev : (není) třeba síťové spojení\n" -#: src/umount_davfs.c:96 +#: src/umount_davfs.c:97 #, c-format msgid "" "Usage:\n" @@ -639,7 +639,7 @@ msgstr "" " u%s -h,--help : vypsat tuto zprávu\n" "\n" -#: src/umount_davfs.c:100 +#: src/umount_davfs.c:101 #, c-format msgid "" "To umount a WebDAV-resource don't call u%s directly, but use\n" @@ -648,7 +648,7 @@ msgstr "" "Pro odpojení zdroje WebDAV nevolejte přímo u%s, ale použijte\n" "místo toho `umount'.\n" -#: src/umount_davfs.c:103 +#: src/umount_davfs.c:104 #, c-format msgid "" " umount : umount the WebDAV-resource as specified in\n" @@ -657,11 +657,11 @@ msgstr "" " umount : odpojit zdroj WebDAV tak, jak je určeno\n" " v /etc/fstab.\n" -#: src/umount_davfs.c:129 +#: src/umount_davfs.c:130 msgid "can't determine mount point" msgstr "nemohu určit přípojný bod" -#: src/umount_davfs.c:149 +#: src/umount_davfs.c:150 #, c-format msgid "" "\n" @@ -674,7 +674,7 @@ msgstr "" " přesto se pokouším odpojit;\n" " čekejte prosím, až %s skončí" -#: src/umount_davfs.c:161 +#: src/umount_davfs.c:162 #, c-format msgid "" "\n" @@ -687,7 +687,7 @@ msgstr "" " přesto se pokouším odpojit;\n" " čekejte prosím, až %s skončí" -#: src/umount_davfs.c:177 +#: src/umount_davfs.c:178 #, c-format msgid "" "\n" @@ -700,12 +700,12 @@ msgstr "" " přesto se pokouším odpojit.\n" " pravděpodobně budete muset odstranit %s ručně" -#: src/umount_davfs.c:188 +#: src/umount_davfs.c:189 #, c-format msgid "%s: waiting while %s (pid %s) synchronizes the cache ." msgstr "%s: čekám, než si %s (pid %s) sesynchronizuje vyrovnávací paměť." -#: src/umount_davfs.c:201 +#: src/umount_davfs.c:202 #, c-format msgid "an error occured while waiting; please wait for %s to terminate" msgstr "při čekání došlo k chybě; čekejte prosím až %s skončí" diff --git a/po/davfs2.pot b/po/davfs2.pot index 6b83964..e797526 100644 --- a/po/davfs2.pot +++ b/po/davfs2.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2011-04-03 09:59+0200\n" +"POT-Creation-Date: 2011-05-27 21:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -364,22 +364,22 @@ msgstr "" msgid "mount point is busy" msgstr "" -#: src/mount_davfs.c:942 src/umount_davfs.c:90 +#: src/mount_davfs.c:942 src/umount_davfs.c:91 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/mount_davfs.c:958 src/umount_davfs.c:115 +#: src/mount_davfs.c:958 src/umount_davfs.c:116 msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:967 src/umount_davfs.c:121 +#: src/mount_davfs.c:967 src/umount_davfs.c:122 msgid "missing argument" msgstr "" -#: src/mount_davfs.c:980 src/umount_davfs.c:123 +#: src/mount_davfs.c:980 src/umount_davfs.c:124 msgid "too many arguments" msgstr "" @@ -572,7 +572,7 @@ msgid "" " [no]_netdev : (no) network connection needed\n" msgstr "" -#: src/umount_davfs.c:96 +#: src/umount_davfs.c:97 #, c-format msgid "" "Usage:\n" @@ -581,25 +581,25 @@ msgid "" "\n" msgstr "" -#: src/umount_davfs.c:100 +#: src/umount_davfs.c:101 #, c-format msgid "" "To umount a WebDAV-resource don't call u%s directly, but use\n" "`umount' instead.\n" msgstr "" -#: src/umount_davfs.c:103 +#: src/umount_davfs.c:104 #, c-format msgid "" " umount : umount the WebDAV-resource as specified in\n" " /etc/fstab.\n" msgstr "" -#: src/umount_davfs.c:129 +#: src/umount_davfs.c:130 msgid "can't determine mount point" msgstr "" -#: src/umount_davfs.c:149 +#: src/umount_davfs.c:150 #, c-format msgid "" "\n" @@ -608,7 +608,7 @@ msgid "" " please wait for %s to terminate" msgstr "" -#: src/umount_davfs.c:161 +#: src/umount_davfs.c:162 #, c-format msgid "" "\n" @@ -617,7 +617,7 @@ msgid "" " please wait for %s to terminate" msgstr "" -#: src/umount_davfs.c:177 +#: src/umount_davfs.c:178 #, c-format msgid "" "\n" @@ -626,12 +626,12 @@ msgid "" " you propably have to remove %s manually" msgstr "" -#: src/umount_davfs.c:188 +#: src/umount_davfs.c:189 #, c-format msgid "%s: waiting while %s (pid %s) synchronizes the cache ." msgstr "" -#: src/umount_davfs.c:201 +#: src/umount_davfs.c:202 #, c-format msgid "an error occured while waiting; please wait for %s to terminate" msgstr "" diff --git a/po/de.po b/po/de.po index 096193c..48386b6 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: davfs2 1.3.3\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2011-04-03 09:59+0200\n" +"POT-Creation-Date: 2011-05-27 21:29+0200\n" "PO-Revision-Date: 2011-04-03 10:00+0300\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -380,7 +380,7 @@ msgstr "der Kernel kenn das Dateisystem %s nicht" msgid "mount point is busy" msgstr "das Einhängepunkt wird anderweitig benutzt" -#: src/mount_davfs.c:942 src/umount_davfs.c:90 +#: src/mount_davfs.c:942 src/umount_davfs.c:91 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -391,15 +391,15 @@ msgstr "" "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/mount_davfs.c:958 src/umount_davfs.c:115 +#: src/mount_davfs.c:958 src/umount_davfs.c:116 msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:967 src/umount_davfs.c:121 +#: src/mount_davfs.c:967 src/umount_davfs.c:122 msgid "missing argument" msgstr "zu wenig Argumente" -#: src/mount_davfs.c:980 src/umount_davfs.c:123 +#: src/mount_davfs.c:980 src/umount_davfs.c:124 msgid "too many arguments" msgstr "zu viele Argumente" @@ -634,7 +634,7 @@ msgstr "" " [no]suid : gesetzte suid- und sgid-Bits sind (nicht) wirksam\n" " [no]_nedev : benötigt (keine) Netzwerkverbindung\n" -#: src/umount_davfs.c:96 +#: src/umount_davfs.c:97 #, c-format msgid "" "Usage:\n" @@ -647,7 +647,7 @@ msgstr "" " u%s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/umount_davfs.c:100 +#: src/umount_davfs.c:101 #, c-format msgid "" "To umount a WebDAV-resource don't call u%s directly, but use\n" @@ -656,7 +656,7 @@ msgstr "" "Um eine WebDAV-Resource auszuhängen, sollte u%s nicht direkt aufgerufen " "werden; stattdessen sollte „umount” benutzt werden.\n" -#: src/umount_davfs.c:103 +#: src/umount_davfs.c:104 #, c-format msgid "" " umount : umount the WebDAV-resource as specified in\n" @@ -665,11 +665,11 @@ msgstr "" " umount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab aus.\n" -#: src/umount_davfs.c:129 +#: src/umount_davfs.c:130 msgid "can't determine mount point" msgstr "kann den Einhängepunkt nicht ermitteln" -#: src/umount_davfs.c:149 +#: src/umount_davfs.c:150 #, c-format msgid "" "\n" @@ -682,7 +682,7 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " bitte warte bis der %s-Prozess endet" -#: src/umount_davfs.c:161 +#: src/umount_davfs.c:162 #, c-format msgid "" "\n" @@ -695,7 +695,7 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " bitte warte bis der %s-Prozess endet" -#: src/umount_davfs.c:177 +#: src/umount_davfs.c:178 #, c-format msgid "" "\n" @@ -708,14 +708,14 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " %s muss wahrscheinlich von Hand gelöscht werden" -#: src/umount_davfs.c:188 +#: src/umount_davfs.c:189 #, c-format msgid "%s: waiting while %s (pid %s) synchronizes the cache ." msgstr "" "%s: warte bis %s (PID %s) die Dateien im Cache\n" "gesichert hat ." -#: src/umount_davfs.c:201 +#: src/umount_davfs.c:202 #, c-format msgid "an error occured while waiting; please wait for %s to terminate" msgstr "" diff --git a/src/umount_davfs.c b/src/umount_davfs.c index 373d2cd..4144987 100644 --- a/src/umount_davfs.c +++ b/src/umount_davfs.c @@ -43,6 +43,7 @@ #include #include "defaults.h" +#include "canonicalize.h" #ifdef ENABLE_NLS #define _(String) gettext(String)