From ef204e2c9eb85765de14026c179ff8a03cdbaa3f Mon Sep 17 00:00:00 2001 From: wbaumann Date: Thu, 13 Aug 2020 17:54:17 +0000 Subject: [PATCH] Remove iconv --- ChangeLog | 6 ++ bootstrap | 2 +- config/davfs2.m4 | 16 --- configure.ac | 5 +- etc/davfs2.conf | 1 - man/davfs2.conf.5 | 17 ---- man/davfs2.conf.5.pot | 200 +++++++++++++++--------------------- man/de/davfs2.conf.5.po | 219 +++++++++++++++------------------------- man/es/davfs2.conf.5.po | 217 +++++++++++++++------------------------ src/cache.c | 46 +++------ src/mount_davfs.c | 8 -- src/mount_davfs.h | 1 - src/webdav.c | 127 ----------------------- src/webdav.h | 16 --- 14 files changed, 274 insertions(+), 607 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc043e7..993d8df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ ChangeLog for davfs2 -------------------- +2020-08-13 Werner Baumann (werner.baumann@onlinehome.de) + * mount_davfs.h, mount_davfs.c, webdav.h, webdav.c, + cache.h, cache.c, etc/davfs2.conf, man/davfs2.conf.5, + config/davfs2.m4: + Remove iconv. + 2020-08-12 Werner Baumann (werner.baumann@onlinehome.de) * Remove gnulib. diff --git a/bootstrap b/bootstrap index ad5ee59..d0baa00 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2006, 2007, 2008, 2009 Werner Baumann +# Copyright (C) 2006, 2007, 2008, 2009, 2020 Werner Baumann # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice diff --git a/config/davfs2.m4 b/config/davfs2.m4 index 287e47e..650a626 100644 --- a/config/davfs2.m4 +++ b/config/davfs2.m4 @@ -145,22 +145,6 @@ AC_DEFUN([DAV_LFS],[ ]) -# Disable character conversion. - -AC_DEFUN([DAV_ICONV],[ - AC_ARG_ENABLE([iconv], - [ --disable-iconv disable character conversion], - [dav_iconv=$enableval], - [dav_iconv=yes]) - - if test "$dav_iconv" = "yes"; then - AC_DEFINE([DAV_USE_ICONV], [1], - [Define to enable charcter conversion]) - fi - -]) - - # Output summary AC_DEFUN([DAV_MESSAGE],[ diff --git a/configure.ac b/configure.ac index ed7b41a..9e79c8d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -# Copyright (C) 2006, 2007, 2008, 2009, 2012 Werner Baumann +# Copyright (C) 2006, 2007, 2008, 2009, 2012, 2020 Werner Baumann # # This file is part of davfs2. # @@ -30,11 +30,9 @@ AC_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_CC -gl_EARLY AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL AC_PROG_LN_S -gl_INIT # Checks for libraries. AM_GNU_GETTEXT_VERSION(0.19) @@ -86,7 +84,6 @@ AC_CHECK_FUNCS([ftruncate getmntent memset mkdir nl_langinfo rpmatch select setl DAV_DEFAULTS DAV_LFS DAV_LINGUAS([]) -DAV_ICONV AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU extensions]) AC_CONFIG_FILES([Makefile diff --git a/etc/davfs2.conf b/etc/davfs2.conf index 5687bf9..0e55287 100644 --- a/etc/davfs2.conf +++ b/etc/davfs2.conf @@ -47,7 +47,6 @@ # use_compression 1 # min_propset 0 # sharepoint_href_bug 0 -# server_charset # connect_timeout 10 # seconds # read_timeout 30 # seconds # retry 30 # seconds diff --git a/man/davfs2.conf.5 b/man/davfs2.conf.5 index 01b72d8..59fad25 100644 --- a/man/davfs2.conf.5 +++ b/man/davfs2.conf.5 @@ -309,23 +309,6 @@ disable caching of files because files in the cache can't be reused. .br Default: 0 -.TP -.B server_charset -When extracting file names from the path component of the URL, -\fB@PROGRAM_NAME@\fR will assume they are encoded using this character set -and translate file names to the local character set. This is \fBnot\fR -about encoding of file contents and \fBnot\fR about HTTP escaping rules. -.br -There is no means in HTTP to know the character encoding of the path -component. There may be even different encodings within the same path, as -the encoding of file names is often defined by the clients that created them. -Nowadays it is best to use only UTF\-8 encoding and to do no conversion. If -you are not sure that all clients understand UTF\-8, restrict file names to -pure us\-ascii. Never use characters in file names, that may have a special -function on some operating systems (like /, : and \(rs). -.br -Default: no character set conversion - .TP .B connect_timeout When creating a TCP connection to the server \fB@PROGRAM_NAME@\fR will diff --git a/man/davfs2.conf.5.pot b/man/davfs2.conf.5.pot index 5dcd9f6..68cffa7 100644 --- a/man/davfs2.conf.5.pot +++ b/man/davfs2.conf.5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-12 11:48+0100\n" +"POT-Creation-Date: 2020-08-13 11:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -276,7 +276,7 @@ msgstr "" #. type: Plain text #: davfs2.conf.5:126 davfs2.conf.5:200 davfs2.conf.5:207 davfs2.conf.5:285 -#: davfs2.conf.5:299 davfs2.conf.5:445 +#: davfs2.conf.5:299 davfs2.conf.5:428 msgid "Default: 1" msgstr "" @@ -373,7 +373,7 @@ msgid "" msgstr "" #. type: TP -#: davfs2.conf.5:183 davfs2.conf.5:532 +#: davfs2.conf.5:183 davfs2.conf.5:515 #, no-wrap msgid "B" msgstr "" @@ -477,7 +477,7 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:230 davfs2.conf.5:435 +#: davfs2.conf.5:230 davfs2.conf.5:418 msgid "Default: 60" msgstr "" @@ -498,7 +498,7 @@ msgstr "" #. type: Plain text #: davfs2.conf.5:239 davfs2.conf.5:247 davfs2.conf.5:265 davfs2.conf.5:275 -#: davfs2.conf.5:292 davfs2.conf.5:311 davfs2.conf.5:465 davfs2.conf.5:481 +#: davfs2.conf.5:292 davfs2.conf.5:311 davfs2.conf.5:448 davfs2.conf.5:464 msgid "Default: 0" msgstr "" @@ -626,43 +626,11 @@ msgstr "" #. type: TP #: davfs2.conf.5:312 #, no-wrap -msgid "B" -msgstr "" - -#. type: Plain text -#: davfs2.conf.5:318 -msgid "" -"When extracting file names from the path component of the URL, " -"B<@PROGRAM_NAME@> will assume they are encoded using this character set and " -"translate file names to the local character set. This is B about " -"encoding of file contents and B about HTTP escaping rules." -msgstr "" - -#. type: Plain text -#: davfs2.conf.5:326 -msgid "" -"There is no means in HTTP to know the character encoding of the path " -"component. There may be even different encodings within the same path, as " -"the encoding of file names is often defined by the clients that created " -"them. Nowadays it is best to use only UTF-8 encoding and to do no " -"conversion. If you are not sure that all clients understand UTF-8, restrict " -"file names to pure us-ascii. Never use characters in file names, that may " -"have a special function on some operating systems (like /, : and \\(rs)." -msgstr "" - -#. type: Plain text -#: davfs2.conf.5:328 -msgid "Default: no character set conversion" -msgstr "" - -#. type: TP -#: davfs2.conf.5:329 -#, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:335 +#: davfs2.conf.5:318 msgid "" "When creating a TCP connection to the server B<@PROGRAM_NAME@> will wait " "that many seconds for an answer before assuming an error. If a value of '0' " @@ -671,43 +639,43 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:338 +#: davfs2.conf.5:321 msgid "" "This parameter only takes effect if the version of neon in use (neon version " "E 0.26) and the OS support non-blocking I/O." msgstr "" #. type: Plain text -#: davfs2.conf.5:340 davfs2.conf.5:455 +#: davfs2.conf.5:323 davfs2.conf.5:438 msgid "Default: 10" msgstr "" #. type: TP -#: davfs2.conf.5:341 +#: davfs2.conf.5:324 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:345 +#: davfs2.conf.5:328 msgid "" "How long in seconds B<@PROGRAM_NAME@> will wait for an answer from the " "server before assuming an error." msgstr "" #. type: Plain text -#: davfs2.conf.5:347 davfs2.conf.5:355 +#: davfs2.conf.5:330 davfs2.conf.5:338 msgid "Default: 30" msgstr "" #. type: TP -#: davfs2.conf.5:348 +#: davfs2.conf.5:331 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:353 +#: davfs2.conf.5:336 msgid "" "When B<@PROGRAM_NAME@> can not reach the server it will try again after " "B seconds. For subsequent retries the interval will be increased up " @@ -715,36 +683,36 @@ msgid "" msgstr "" #. type: TP -#: davfs2.conf.5:356 +#: davfs2.conf.5:339 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:359 +#: davfs2.conf.5:342 msgid "Maximum value of the retry interval." msgstr "" #. type: Plain text -#: davfs2.conf.5:361 +#: davfs2.conf.5:344 msgid "Default: 300" msgstr "" #. type: TP -#: davfs2.conf.5:362 +#: davfs2.conf.5:345 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:366 +#: davfs2.conf.5:349 msgid "" "When uploading a changed file fails temporarily B<@PROGRAM_NAME@> will retry " "with increasing intervals, but not more often than this." msgstr "" #. type: Plain text -#: davfs2.conf.5:371 +#: davfs2.conf.5:354 msgid "" "With a bad connection this will cause additional traffic. To reduce traffic " "caused by unsuccessful attempts option B can be set. But " @@ -752,18 +720,18 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:373 +#: davfs2.conf.5:356 msgid "Default: 15" msgstr "" #. type: TP -#: davfs2.conf.5:374 +#: davfs2.conf.5:357 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:380 +#: davfs2.conf.5:363 msgid "" "Your server might expect special headers to do what you want. Different from " "other options, this one takes two values: the name of the header and its " @@ -772,17 +740,17 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:382 +#: davfs2.conf.5:365 msgid "add_header Translate F" msgstr "" #. type: Plain text -#: davfs2.conf.5:384 +#: davfs2.conf.5:367 msgid "B<@PROGRAM_NAME@> will add header \"Translate: F\" on all requests." msgstr "" #. type: Plain text -#: davfs2.conf.5:388 +#: davfs2.conf.5:371 msgid "" "This option is cumulative. You can enter more than one add_header option and " "all of them will be added. Also add_header options from @SYS_CONF_DIR@/" @@ -790,19 +758,19 @@ msgid "" msgstr "" #. type: SH -#: davfs2.conf.5:390 +#: davfs2.conf.5:373 #, no-wrap msgid "Cache Related Options" msgstr "" #. type: TP -#: davfs2.conf.5:392 +#: davfs2.conf.5:375 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:397 +#: davfs2.conf.5:380 msgid "" "Each mounted @PACKAGE@ file system has a directory to store backups of files " "that could not be stored back to the server. This sets the name of this " @@ -810,25 +778,25 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:399 +#: davfs2.conf.5:382 msgid "Default: lost+found" msgstr "" #. type: TP -#: davfs2.conf.5:400 +#: davfs2.conf.5:383 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:404 +#: davfs2.conf.5:387 msgid "" "The directory where B<@PROGRAM_NAME@> will store cached files. For every " "mount point a subdirectory will be created." msgstr "" #. type: Plain text -#: davfs2.conf.5:408 +#: davfs2.conf.5:391 msgid "" "In the systemwide configuration file this will set the system wide cache, " "used by root. In a users configuration file it will set the cache used by " @@ -836,18 +804,18 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:410 +#: davfs2.conf.5:393 msgid "Defaults: @SYS_CACHE_DIR@ and ~/.@PACKAGE@/cache" msgstr "" #. type: TP -#: davfs2.conf.5:411 +#: davfs2.conf.5:394 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:416 +#: davfs2.conf.5:399 msgid "" "The amount of disk space in MiByte that may be used. B<@PROGRAM_NAME@> will " "always take enough space to cache open files, ignoring this value if " @@ -855,18 +823,18 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:418 +#: davfs2.conf.5:401 msgid "Default: 50" msgstr "" #. type: TP -#: davfs2.conf.5:419 +#: davfs2.conf.5:402 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:425 +#: davfs2.conf.5:408 msgid "" "B<@PROGRAM_NAME@> maintains a hash table with an entry for each known file " "or directory. This gives the number of entries in this table. For large file " @@ -875,18 +843,18 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:427 +#: davfs2.conf.5:410 msgid "Default: 1024" msgstr "" #. type: TP -#: davfs2.conf.5:428 +#: davfs2.conf.5:411 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:433 +#: davfs2.conf.5:416 msgid "" "After B<@PROGRAM_NAME@> has got information about files in a directory it " "considers it valid for this time in seconds. Note: This does not affect " @@ -894,13 +862,13 @@ msgid "" msgstr "" #. type: TP -#: davfs2.conf.5:436 +#: davfs2.conf.5:419 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:443 +#: davfs2.conf.5:426 msgid "" "When a file or directory is opened by an application, B<@PROGRAM_NAME@> will " "first check the server for a newer version. But some applications do open " @@ -910,13 +878,13 @@ msgid "" msgstr "" #. type: TP -#: davfs2.conf.5:446 +#: davfs2.conf.5:429 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:453 +#: davfs2.conf.5:436 msgid "" "When a file that has been changed is closed, B<@PROGRAM_NAME@> will wait " "that many seconds before it will upload it to the server. This will avoid " @@ -926,13 +894,13 @@ msgid "" msgstr "" #. type: TP -#: davfs2.conf.5:456 +#: davfs2.conf.5:439 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:463 +#: davfs2.conf.5:446 msgid "" "When a file is opened, B<@PROGRAM_NAME@> will have to check the server " "whether there is a newer version. Graphical User Interfaces tend to open " @@ -942,13 +910,13 @@ msgid "" msgstr "" #. type: TP -#: davfs2.conf.5:466 +#: davfs2.conf.5:449 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:474 +#: davfs2.conf.5:457 msgid "" "davfs2 holds information about files and directories in the working memory. " "It will stay there as long as the file system is mounted and the file is not " @@ -958,7 +926,7 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:479 +#: davfs2.conf.5:462 msgid "" "B Most file attributes are only maintained locally because there " "is no corresponding WebDAV property. So if users change attributes (owner, " @@ -967,19 +935,19 @@ msgid "" msgstr "" #. type: SH -#: davfs2.conf.5:483 +#: davfs2.conf.5:466 #, no-wrap msgid "Debugging Options" msgstr "" #. type: TP -#: davfs2.conf.5:485 +#: davfs2.conf.5:468 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:493 +#: davfs2.conf.5:476 msgid "" "Send debug messages to the syslog daemon. The value tells what kind of " "information shall be logged. The messages are send with facility LOG_DAEMON " @@ -990,7 +958,7 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:497 +#: davfs2.conf.5:480 msgid "" "Unlike other options, this option is cumulative. If there are several debug " "entries with different values, all of them will be applied. Also debug " @@ -999,171 +967,171 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:500 +#: davfs2.conf.5:483 msgid "" "B Debug messages let the log-files grow quickly. Never use this " "option in normal operation of mount.davfs." msgstr "" #. type: Plain text -#: davfs2.conf.5:502 +#: davfs2.conf.5:485 msgid "Default: no debugging messages" msgstr "" #. type: TP -#: davfs2.conf.5:503 +#: davfs2.conf.5:486 #, no-wrap msgid "B" msgstr "" #. type: TP -#: davfs2.conf.5:505 +#: davfs2.conf.5:488 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:508 +#: davfs2.conf.5:491 msgid "Command line and configuration options." msgstr "" #. type: TP -#: davfs2.conf.5:508 +#: davfs2.conf.5:491 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:511 +#: davfs2.conf.5:494 msgid "Upcalls from the kernel file system." msgstr "" #. type: TP -#: davfs2.conf.5:511 +#: davfs2.conf.5:494 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:514 +#: davfs2.conf.5:497 msgid "Cache operations like adding and removing nodes." msgstr "" #. type: TP -#: davfs2.conf.5:514 +#: davfs2.conf.5:497 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:517 +#: davfs2.conf.5:500 msgid "HTTP headers." msgstr "" #. type: TP -#: davfs2.conf.5:517 +#: davfs2.conf.5:500 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:520 +#: davfs2.conf.5:503 msgid "Parsing of the XML-body of WebDAV-requests." msgstr "" #. type: TP -#: davfs2.conf.5:520 +#: davfs2.conf.5:503 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:523 +#: davfs2.conf.5:506 msgid "Negotiation of authentication." msgstr "" #. type: TP -#: davfs2.conf.5:523 +#: davfs2.conf.5:506 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:526 +#: davfs2.conf.5:509 msgid "Information about locks." msgstr "" #. type: TP -#: davfs2.conf.5:526 +#: davfs2.conf.5:509 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:529 +#: davfs2.conf.5:512 msgid "TLS/SSL related stuff like certificates." msgstr "" #. type: TP -#: davfs2.conf.5:529 +#: davfs2.conf.5:512 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:532 +#: davfs2.conf.5:515 msgid "Complete body of HTTP-responses." msgstr "" #. type: Plain text -#: davfs2.conf.5:535 +#: davfs2.conf.5:518 msgid "" "Also print confidential information, which is usually omitted or obscured." msgstr "" #. type: TP -#: davfs2.conf.5:535 +#: davfs2.conf.5:518 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: davfs2.conf.5:538 +#: davfs2.conf.5:521 msgid "Includes config, kernel, cache and http." msgstr "" #. type: SH -#: davfs2.conf.5:541 mount.davfs.8:551 umount.davfs.8:79 +#: davfs2.conf.5:524 mount.davfs.8:551 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "" #. type: Plain text -#: davfs2.conf.5:545 +#: davfs2.conf.5:528 msgid "" "This man page was written by by Werner Baumann Ewerner." "baumann@onlinehome.deE." msgstr "" #. type: SH -#: davfs2.conf.5:547 mount.davfs.8:568 umount.davfs.8:84 +#: davfs2.conf.5:530 mount.davfs.8:568 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "" #. type: Plain text -#: davfs2.conf.5:550 mount.davfs.8:571 umount.davfs.8:87 +#: davfs2.conf.5:533 mount.davfs.8:571 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "" #. type: SH -#: davfs2.conf.5:552 mount.davfs.8:573 umount.davfs.8:89 +#: davfs2.conf.5:535 mount.davfs.8:573 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: davfs2.conf.5:558 +#: davfs2.conf.5:541 msgid "" "B<@PROGRAM_NAME@>(8), B(8), B(8), B(8), " "B(5)" diff --git a/man/de/davfs2.conf.5.po b/man/de/davfs2.conf.5.po index c484a78..578f935 100644 --- a/man/de/davfs2.conf.5.po +++ b/man/de/davfs2.conf.5.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: davfs2 1.5.0\n" -"POT-Creation-Date: 2019-01-12 11:48+0100\n" +"POT-Creation-Date: 2020-08-13 11:21+0200\n" "PO-Revision-Date: 2019-01-12 11:38+0200\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -365,7 +365,7 @@ msgstr "" # type: Plain text #. type: Plain text #: davfs2.conf.5:126 davfs2.conf.5:200 davfs2.conf.5:207 davfs2.conf.5:285 -#: davfs2.conf.5:299 davfs2.conf.5:445 +#: davfs2.conf.5:299 davfs2.conf.5:428 msgid "Default: 1" msgstr "Voreingestellt: 1" @@ -499,7 +499,7 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:183 davfs2.conf.5:532 +#: davfs2.conf.5:183 davfs2.conf.5:515 #, no-wrap msgid "B" msgstr "B" @@ -638,7 +638,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:230 davfs2.conf.5:435 +#: davfs2.conf.5:230 davfs2.conf.5:418 msgid "Default: 60" msgstr "Voreingestellt: 60" @@ -666,7 +666,7 @@ msgstr "" # type: Plain text #. type: Plain text #: davfs2.conf.5:239 davfs2.conf.5:247 davfs2.conf.5:265 davfs2.conf.5:275 -#: davfs2.conf.5:292 davfs2.conf.5:311 davfs2.conf.5:465 davfs2.conf.5:481 +#: davfs2.conf.5:292 davfs2.conf.5:311 davfs2.conf.5:448 davfs2.conf.5:464 msgid "Default: 0" msgstr "Voreingestellt: 0" @@ -846,63 +846,12 @@ msgstr "" #. type: TP #: davfs2.conf.5:312 #, no-wrap -msgid "B" -msgstr "B" - -# type: Plain text -#. type: Plain text -#: davfs2.conf.5:318 -msgid "" -"When extracting file names from the path component of the URL, " -"B<@PROGRAM_NAME@> will assume they are encoded using this character set and " -"translate file names to the local character set. This is B about " -"encoding of file contents and B about HTTP escaping rules." -msgstr "" -"Wenn B<@PROGRAM_NAME@> aus der Pfad-Komponente der URL die Dateinamen " -"erzeugt, geht es davon aus, das diese entsprechend diesem Zeichensatz " -"kodiert sind und übersetzt sie in die lokal benutzte Kodierung. Dies hat " -"B zu tun mit der Kodierung des Dateiinhalts und auch B mit " -"den HTTP-Escape-Regeln." - -# type: Plain text -#. type: Plain text -#: davfs2.conf.5:326 -msgid "" -"There is no means in HTTP to know the character encoding of the path " -"component. There may be even different encodings within the same path, as " -"the encoding of file names is often defined by the clients that created " -"them. Nowadays it is best to use only UTF-8 encoding and to do no " -"conversion. If you are not sure that all clients understand UTF-8, restrict " -"file names to pure us-ascii. Never use characters in file names, that may " -"have a special function on some operating systems (like /, : and \\(rs)." -msgstr "" -"Es gibt in HTTP keine Möglichekit die Kodierung der Pfad-Komponente zu " -"erfahren. Da die Kodierung von Namen im Pfad meistens von den Clients " -"festgelegt wird, die diese Dateien und Verzeichnisse erzeugen, kann es " -"durchaus vorkommen, dass auch innerhalb eines Pfades unterschiedliche " -"Kodierungen verwendet werden. Heutzutage ist es am besten, ausschließlich " -"die UTF-8-Kodierung zu benutzen und keine Konvertierung vorzunehmen. Wenn du " -"nicht sicher bist, dass alle Clients das verstehen, solltest du Dateinamen " -"auf reines US-ASCII beschränken. Benutze niemals Zeichen, die im Dateisystem " -"eines anderen Betriebssystems eine spezielle Funktion haben (wie z.B. /, : " -"und \\(rs)." - -# type: Plain text -#. type: Plain text -#: davfs2.conf.5:328 -msgid "Default: no character set conversion" -msgstr "Voreingestellt: die Kodierung wird nicht umgewandelt" - -# type: TP -#. type: TP -#: davfs2.conf.5:329 -#, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:335 +#: davfs2.conf.5:318 msgid "" "When creating a TCP connection to the server B<@PROGRAM_NAME@> will wait " "that many seconds for an answer before assuming an error. If a value of '0' " @@ -915,7 +864,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:338 +#: davfs2.conf.5:321 msgid "" "This parameter only takes effect if the version of neon in use (neon version " "E 0.26) and the OS support non-blocking I/O." @@ -926,20 +875,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:340 davfs2.conf.5:455 +#: davfs2.conf.5:323 davfs2.conf.5:438 msgid "Default: 10" msgstr "Voreingestellt: 10" # type: TP #. type: TP -#: davfs2.conf.5:341 +#: davfs2.conf.5:324 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:345 +#: davfs2.conf.5:328 msgid "" "How long in seconds B<@PROGRAM_NAME@> will wait for an answer from the " "server before assuming an error." @@ -949,20 +898,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:347 davfs2.conf.5:355 +#: davfs2.conf.5:330 davfs2.conf.5:338 msgid "Default: 30" msgstr "Voreingestellt: 30" # type: TP #. type: TP -#: davfs2.conf.5:348 +#: davfs2.conf.5:331 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:353 +#: davfs2.conf.5:336 msgid "" "When B<@PROGRAM_NAME@> can not reach the server it will try again after " "B seconds. For subsequent retries the interval will be increased up " @@ -974,33 +923,33 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:356 +#: davfs2.conf.5:339 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:359 +#: davfs2.conf.5:342 msgid "Maximum value of the retry interval." msgstr "Maximales retry-Intervall." # type: Plain text #. type: Plain text -#: davfs2.conf.5:361 +#: davfs2.conf.5:344 msgid "Default: 300" msgstr "Voreingestellt: 300" # type: TP #. type: TP -#: davfs2.conf.5:362 +#: davfs2.conf.5:345 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:366 +#: davfs2.conf.5:349 msgid "" "When uploading a changed file fails temporarily B<@PROGRAM_NAME@> will retry " "with increasing intervals, but not more often than this." @@ -1011,7 +960,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:371 +#: davfs2.conf.5:354 msgid "" "With a bad connection this will cause additional traffic. To reduce traffic " "caused by unsuccessful attempts option B can be set. But " @@ -1024,20 +973,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:373 +#: davfs2.conf.5:356 msgid "Default: 15" msgstr "Voreingestellt: 15" # type: TP #. type: TP -#: davfs2.conf.5:374 +#: davfs2.conf.5:357 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:380 +#: davfs2.conf.5:363 msgid "" "Your server might expect special headers to do what you want. Different from " "other options, this one takes two values: the name of the header and its " @@ -1052,13 +1001,13 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:382 +#: davfs2.conf.5:365 msgid "add_header Translate F" msgstr "add_header Translate F" # type: Plain text #. type: Plain text -#: davfs2.conf.5:384 +#: davfs2.conf.5:367 msgid "B<@PROGRAM_NAME@> will add header \"Translate: F\" on all requests." msgstr "" "B<@PROGRAM_NAME@> sendet nun den Header \"Translate: F\" bei allen Anfragen " @@ -1066,7 +1015,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:388 +#: davfs2.conf.5:371 msgid "" "This option is cumulative. You can enter more than one add_header option and " "all of them will be added. Also add_header options from @SYS_CONF_DIR@/" @@ -1078,21 +1027,21 @@ msgstr "" # type: SH #. type: SH -#: davfs2.conf.5:390 +#: davfs2.conf.5:373 #, no-wrap msgid "Cache Related Options" msgstr "Cache-Optionen" # type: TP #. type: TP -#: davfs2.conf.5:392 +#: davfs2.conf.5:375 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:397 +#: davfs2.conf.5:380 msgid "" "Each mounted @PACKAGE@ file system has a directory to store backups of files " "that could not be stored back to the server. This sets the name of this " @@ -1104,20 +1053,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:399 +#: davfs2.conf.5:382 msgid "Default: lost+found" msgstr "Voreingestellt: lost+found" # type: TP #. type: TP -#: davfs2.conf.5:400 +#: davfs2.conf.5:383 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:404 +#: davfs2.conf.5:387 msgid "" "The directory where B<@PROGRAM_NAME@> will store cached files. For every " "mount point a subdirectory will be created." @@ -1127,7 +1076,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:408 +#: davfs2.conf.5:391 msgid "" "In the systemwide configuration file this will set the system wide cache, " "used by root. In a users configuration file it will set the cache used by " @@ -1139,20 +1088,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:410 +#: davfs2.conf.5:393 msgid "Defaults: @SYS_CACHE_DIR@ and ~/.@PACKAGE@/cache" msgstr "Voreingestellt: @SYS_CACHE_DIR@ und ~/.@PACKAGE@/cache" # type: TP #. type: TP -#: davfs2.conf.5:411 +#: davfs2.conf.5:394 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:416 +#: davfs2.conf.5:399 msgid "" "The amount of disk space in MiByte that may be used. B<@PROGRAM_NAME@> will " "always take enough space to cache open files, ignoring this value if " @@ -1164,20 +1113,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:418 +#: davfs2.conf.5:401 msgid "Default: 50" msgstr "Voreingestellt: 50" # type: TP #. type: TP -#: davfs2.conf.5:419 +#: davfs2.conf.5:402 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:425 +#: davfs2.conf.5:408 msgid "" "B<@PROGRAM_NAME@> maintains a hash table with an entry for each known file " "or directory. This gives the number of entries in this table. For large file " @@ -1191,20 +1140,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:427 +#: davfs2.conf.5:410 msgid "Default: 1024" msgstr "Voreingestellt: 1024" # type: TP #. type: TP -#: davfs2.conf.5:428 +#: davfs2.conf.5:411 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:433 +#: davfs2.conf.5:416 msgid "" "After B<@PROGRAM_NAME@> has got information about files in a directory it " "considers it valid for this time in seconds. Note: This does not affect " @@ -1216,14 +1165,14 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:436 +#: davfs2.conf.5:419 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:443 +#: davfs2.conf.5:426 msgid "" "When a file or directory is opened by an application, B<@PROGRAM_NAME@> will " "first check the server for a newer version. But some applications do open " @@ -1239,14 +1188,14 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:446 +#: davfs2.conf.5:429 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:453 +#: davfs2.conf.5:436 msgid "" "When a file that has been changed is closed, B<@PROGRAM_NAME@> will wait " "that many seconds before it will upload it to the server. This will avoid " @@ -1262,14 +1211,14 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:456 +#: davfs2.conf.5:439 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:463 +#: davfs2.conf.5:446 msgid "" "When a file is opened, B<@PROGRAM_NAME@> will have to check the server " "whether there is a newer version. Graphical User Interfaces tend to open " @@ -1286,13 +1235,13 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:466 +#: davfs2.conf.5:449 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: davfs2.conf.5:474 +#: davfs2.conf.5:457 msgid "" "davfs2 holds information about files and directories in the working memory. " "It will stay there as long as the file system is mounted and the file is not " @@ -1308,7 +1257,7 @@ msgstr "" "einige Zeit nicht benutzt wurden. 0 = nein, 1 = ja." #. type: Plain text -#: davfs2.conf.5:479 +#: davfs2.conf.5:462 msgid "" "B Most file attributes are only maintained locally because there " "is no corresponding WebDAV property. So if users change attributes (owner, " @@ -1322,21 +1271,21 @@ msgstr "" # type: SH #. type: SH -#: davfs2.conf.5:483 +#: davfs2.conf.5:466 #, no-wrap msgid "Debugging Options" msgstr "Debugging Optionen" # type: TP #. type: TP -#: davfs2.conf.5:485 +#: davfs2.conf.5:468 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:493 +#: davfs2.conf.5:476 msgid "" "Send debug messages to the syslog daemon. The value tells what kind of " "information shall be logged. The messages are send with facility LOG_DAEMON " @@ -1354,7 +1303,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:497 +#: davfs2.conf.5:480 msgid "" "Unlike other options, this option is cumulative. If there are several debug " "entries with different values, all of them will be applied. Also debug " @@ -1368,7 +1317,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:500 +#: davfs2.conf.5:483 msgid "" "B Debug messages let the log-files grow quickly. Never use this " "option in normal operation of mount.davfs." @@ -1378,53 +1327,53 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:502 +#: davfs2.conf.5:485 msgid "Default: no debugging messages" msgstr "Voreinstellung: keine Debug-Meldungen." # type: Plain text #. type: TP -#: davfs2.conf.5:503 +#: davfs2.conf.5:486 #, no-wrap msgid "B" msgstr "B" # type: TP #. type: TP -#: davfs2.conf.5:505 +#: davfs2.conf.5:488 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:508 +#: davfs2.conf.5:491 msgid "Command line and configuration options." msgstr "Kommando-Zeile und Kofigurationsoptionen." # type: TP #. type: TP -#: davfs2.conf.5:508 +#: davfs2.conf.5:491 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:511 +#: davfs2.conf.5:494 msgid "Upcalls from the kernel file system." msgstr "Anfragen vom Kernel-Dateisystem." # type: TP #. type: TP -#: davfs2.conf.5:511 +#: davfs2.conf.5:494 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:514 +#: davfs2.conf.5:497 msgid "Cache operations like adding and removing nodes." msgstr "" "Cache-Operationen wie das Erzeugen und Löschen von Dateien und " @@ -1432,85 +1381,85 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:514 +#: davfs2.conf.5:497 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:517 +#: davfs2.conf.5:500 msgid "HTTP headers." msgstr "HTTP-Header." # type: TP #. type: TP -#: davfs2.conf.5:517 +#: davfs2.conf.5:500 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:520 +#: davfs2.conf.5:503 msgid "Parsing of the XML-body of WebDAV-requests." msgstr "Analysieren von XML-Daten in WebDAV-Anfragen." # type: TP #. type: TP -#: davfs2.conf.5:520 +#: davfs2.conf.5:503 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:523 +#: davfs2.conf.5:506 msgid "Negotiation of authentication." msgstr "Aushandeln der Authentifizierung." # type: TP #. type: TP -#: davfs2.conf.5:523 +#: davfs2.conf.5:506 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:526 +#: davfs2.conf.5:509 msgid "Information about locks." msgstr "Informationen über Sperren." # type: TP #. type: TP -#: davfs2.conf.5:526 +#: davfs2.conf.5:509 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:529 +#: davfs2.conf.5:512 msgid "TLS/SSL related stuff like certificates." msgstr "TLS/SSL-Informatinen, z.B. Zertifikate." # type: TP #. type: TP -#: davfs2.conf.5:529 +#: davfs2.conf.5:512 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:532 +#: davfs2.conf.5:515 msgid "Complete body of HTTP-responses." msgstr "Der komplette Datenteil von HTTP-Antworten." # type: Plain text #. type: Plain text -#: davfs2.conf.5:535 +#: davfs2.conf.5:518 msgid "" "Also print confidential information, which is usually omitted or obscured." msgstr "" @@ -1518,27 +1467,27 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:535 +#: davfs2.conf.5:518 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:538 +#: davfs2.conf.5:521 msgid "Includes config, kernel, cache and http." msgstr "Beinhaltet config, kernel, cache und http." # type: SH #. type: SH -#: davfs2.conf.5:541 mount.davfs.8:551 umount.davfs.8:79 +#: davfs2.conf.5:524 mount.davfs.8:551 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "AUTOREN" # type: Plain text #. type: Plain text -#: davfs2.conf.5:545 +#: davfs2.conf.5:528 msgid "" "This man page was written by by Werner Baumann Ewerner." "baumann@onlinehome.deE." @@ -1548,27 +1497,27 @@ msgstr "" # type: SH #. type: SH -#: davfs2.conf.5:547 mount.davfs.8:568 umount.davfs.8:84 +#: davfs2.conf.5:530 mount.davfs.8:568 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "DAVFS2 HOME" # type: TH #. type: Plain text -#: davfs2.conf.5:550 mount.davfs.8:571 umount.davfs.8:87 +#: davfs2.conf.5:533 mount.davfs.8:571 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "@PACKAGE_BUGREPORT@" # type: SH #. type: SH -#: davfs2.conf.5:552 mount.davfs.8:573 umount.davfs.8:89 +#: davfs2.conf.5:535 mount.davfs.8:573 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" # type: Plain text #. type: Plain text -#: davfs2.conf.5:558 +#: davfs2.conf.5:541 msgid "" "B<@PROGRAM_NAME@>(8), B(8), B(8), B(8), " "B(5)" diff --git a/man/es/davfs2.conf.5.po b/man/es/davfs2.conf.5.po index 4ffcf9a..719c906 100644 --- a/man/es/davfs2.conf.5.po +++ b/man/es/davfs2.conf.5.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: davfs2.conf.5\n" -"POT-Creation-Date: 2019-01-12 11:48+0100\n" +"POT-Creation-Date: 2020-08-13 11:21+0200\n" "PO-Revision-Date: 2007-04-26 01:24-0300\n" "Last-Translator: Luciano Bello \n" "Language-Team: Español \n" @@ -376,7 +376,7 @@ msgstr "" # type: Plain text #. type: Plain text #: davfs2.conf.5:126 davfs2.conf.5:200 davfs2.conf.5:207 davfs2.conf.5:285 -#: davfs2.conf.5:299 davfs2.conf.5:445 +#: davfs2.conf.5:299 davfs2.conf.5:428 msgid "Default: 1" msgstr "Predeterminado: 1" @@ -500,7 +500,7 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:183 davfs2.conf.5:532 +#: davfs2.conf.5:183 davfs2.conf.5:515 #, no-wrap msgid "B" msgstr "B" @@ -650,7 +650,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:230 davfs2.conf.5:435 +#: davfs2.conf.5:230 davfs2.conf.5:418 msgid "Default: 60" msgstr "Predeterminado: 60" @@ -678,7 +678,7 @@ msgstr "" # type: Plain text #. type: Plain text #: davfs2.conf.5:239 davfs2.conf.5:247 davfs2.conf.5:265 davfs2.conf.5:275 -#: davfs2.conf.5:292 davfs2.conf.5:311 davfs2.conf.5:465 davfs2.conf.5:481 +#: davfs2.conf.5:292 davfs2.conf.5:311 davfs2.conf.5:448 davfs2.conf.5:464 msgid "Default: 0" msgstr "Predeterminado: 0" @@ -823,61 +823,12 @@ msgstr "" #. type: TP #: davfs2.conf.5:312 #, no-wrap -msgid "B" -msgstr "B" - -# type: Plain text -#. type: Plain text -#: davfs2.conf.5:318 -msgid "" -"When extracting file names from the path component of the URL, " -"B<@PROGRAM_NAME@> will assume they are encoded using this character set and " -"translate file names to the local character set. This is B about " -"encoding of file contents and B about HTTP escaping rules." -msgstr "" -"Cuando se extraen los nombre de archivos desde la ruta del componente en la " -"URL, B<@PROGRAM_NAME@> asumirá que están codificados usando este conjunto de " -"caracteres y traducirá los nombre de archivo al mapa de caracteres local. " -"Esto B está relacionado conla codificación del contenido del archivo ni " -"B tiene relación con las reglas de escapado de HTTP." - -# type: Plain text -#. type: Plain text -#: davfs2.conf.5:326 -msgid "" -"There is no means in HTTP to know the character encoding of the path " -"component. There may be even different encodings within the same path, as " -"the encoding of file names is often defined by the clients that created " -"them. Nowadays it is best to use only UTF-8 encoding and to do no " -"conversion. If you are not sure that all clients understand UTF-8, restrict " -"file names to pure us-ascii. Never use characters in file names, that may " -"have a special function on some operating systems (like /, : and \\(rs)." -msgstr "" -"No hay manera en HTTP de saber las codificaciones de caracteres de los " -"componentes de la ruta.Puede que existan muchas codificaciones en una misma " -"ruta, como así también nombres de archivos codificados que suelen ser " -"creados por ciertos clientes.Hoy en día, lo mejor es usar la codificación " -"UTF-8 y no hacer ninguna conversión.Si no está seguro de que todos los " -"clientes entienden UTF-8, limite el nombre de archivo a us-ascii puro. Nunca " -"use caracteres en los nombres de archivo que puedan tener una función " -"especial en algún sistema operativo (como /, : y \\(rs).)" - -# type: Plain text -#. type: Plain text -#: davfs2.conf.5:328 -msgid "Default: no character set conversion" -msgstr "Predeterminado: no convertir el mapa de caracteres" - -# type: TP -#. type: TP -#: davfs2.conf.5:329 -#, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:335 +#: davfs2.conf.5:318 msgid "" "When creating a TCP connection to the server B<@PROGRAM_NAME@> will wait " "that many seconds for an answer before assuming an error. If a value of '0' " @@ -887,7 +838,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:338 +#: davfs2.conf.5:321 msgid "" "This parameter only takes effect if the version of neon in use (neon version " "E 0.26) and the OS support non-blocking I/O." @@ -895,20 +846,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:340 davfs2.conf.5:455 +#: davfs2.conf.5:323 davfs2.conf.5:438 msgid "Default: 10" msgstr "Predeterminado: 10" # type: TP #. type: TP -#: davfs2.conf.5:341 +#: davfs2.conf.5:324 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:345 +#: davfs2.conf.5:328 msgid "" "How long in seconds B<@PROGRAM_NAME@> will wait for an answer from the " "server before assuming an error." @@ -918,20 +869,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:347 davfs2.conf.5:355 +#: davfs2.conf.5:330 davfs2.conf.5:338 msgid "Default: 30" msgstr "Predeterminado: 30" # type: TP #. type: TP -#: davfs2.conf.5:348 +#: davfs2.conf.5:331 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:353 +#: davfs2.conf.5:336 msgid "" "When B<@PROGRAM_NAME@> can not reach the server it will try again after " "B seconds. For subsequent retries the interval will be increased up " @@ -943,33 +894,33 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:356 +#: davfs2.conf.5:339 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:359 +#: davfs2.conf.5:342 msgid "Maximum value of the retry interval." msgstr "Máximo valor para el intervalo de reintento." # type: Plain text #. type: Plain text -#: davfs2.conf.5:361 +#: davfs2.conf.5:344 msgid "Default: 300" msgstr "Predeterminado: 300" # type: TP #. type: TP -#: davfs2.conf.5:362 +#: davfs2.conf.5:345 #, no-wrap msgid "B" msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:366 +#: davfs2.conf.5:349 msgid "" "When uploading a changed file fails temporarily B<@PROGRAM_NAME@> will retry " "with increasing intervals, but not more often than this." @@ -977,7 +928,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:371 +#: davfs2.conf.5:354 msgid "" "With a bad connection this will cause additional traffic. To reduce traffic " "caused by unsuccessful attempts option B can be set. But " @@ -986,21 +937,21 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:373 +#: davfs2.conf.5:356 #, fuzzy msgid "Default: 15" msgstr "Predeterminado: 1" # type: TP #. type: TP -#: davfs2.conf.5:374 +#: davfs2.conf.5:357 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:380 +#: davfs2.conf.5:363 msgid "" "Your server might expect special headers to do what you want. Different from " "other options, this one takes two values: the name of the header and its " @@ -1010,19 +961,19 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:382 +#: davfs2.conf.5:365 msgid "add_header Translate F" msgstr "add_header Translate F" # type: Plain text #. type: Plain text -#: davfs2.conf.5:384 +#: davfs2.conf.5:367 msgid "B<@PROGRAM_NAME@> will add header \"Translate: F\" on all requests." msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:388 +#: davfs2.conf.5:371 msgid "" "This option is cumulative. You can enter more than one add_header option and " "all of them will be added. Also add_header options from @SYS_CONF_DIR@/" @@ -1031,21 +982,21 @@ msgstr "" # type: SH #. type: SH -#: davfs2.conf.5:390 +#: davfs2.conf.5:373 #, no-wrap msgid "Cache Related Options" msgstr "Opciones Relacionadas al Caché " # type: TP #. type: TP -#: davfs2.conf.5:392 +#: davfs2.conf.5:375 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:397 +#: davfs2.conf.5:380 msgid "" "Each mounted @PACKAGE@ file system has a directory to store backups of files " "that could not be stored back to the server. This sets the name of this " @@ -1058,20 +1009,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:399 +#: davfs2.conf.5:382 msgid "Default: lost+found" msgstr "Predeterminado: lost+found" # type: TP #. type: TP -#: davfs2.conf.5:400 +#: davfs2.conf.5:383 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:404 +#: davfs2.conf.5:387 msgid "" "The directory where B<@PROGRAM_NAME@> will store cached files. For every " "mount point a subdirectory will be created." @@ -1081,7 +1032,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:408 +#: davfs2.conf.5:391 msgid "" "In the systemwide configuration file this will set the system wide cache, " "used by root. In a users configuration file it will set the cache used by " @@ -1093,20 +1044,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:410 +#: davfs2.conf.5:393 msgid "Defaults: @SYS_CACHE_DIR@ and ~/.@PACKAGE@/cache" msgstr "Predeterminado: @SYS_CACHE_DIR@ y ~/.@PACKAGE@/cache" # type: TP #. type: TP -#: davfs2.conf.5:411 +#: davfs2.conf.5:394 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:416 +#: davfs2.conf.5:399 msgid "" "The amount of disk space in MiByte that may be used. B<@PROGRAM_NAME@> will " "always take enough space to cache open files, ignoring this value if " @@ -1118,20 +1069,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:418 +#: davfs2.conf.5:401 msgid "Default: 50" msgstr "Predeterminado: 50" # type: TP #. type: TP -#: davfs2.conf.5:419 +#: davfs2.conf.5:402 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:425 +#: davfs2.conf.5:408 msgid "" "B<@PROGRAM_NAME@> maintains a hash table with an entry for each known file " "or directory. This gives the number of entries in this table. For large file " @@ -1146,20 +1097,20 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:427 +#: davfs2.conf.5:410 msgid "Default: 1024" msgstr "Predeterminado: 1024" # type: TP #. type: TP -#: davfs2.conf.5:428 +#: davfs2.conf.5:411 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:433 +#: davfs2.conf.5:416 #, fuzzy msgid "" "After B<@PROGRAM_NAME@> has got information about files in a directory it " @@ -1173,14 +1124,14 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:436 +#: davfs2.conf.5:419 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:443 +#: davfs2.conf.5:426 #, fuzzy #| msgid "" #| "When a file or directory is opened by an application, B<@PROGRAM_NAME@> " @@ -1204,14 +1155,14 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:446 +#: davfs2.conf.5:429 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:453 +#: davfs2.conf.5:436 msgid "" "When a file that has been changed is closed, B<@PROGRAM_NAME@> will wait " "that many seconds before it will upload it to the server. This will avoid " @@ -1222,14 +1173,14 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:456 +#: davfs2.conf.5:439 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:463 +#: davfs2.conf.5:446 msgid "" "When a file is opened, B<@PROGRAM_NAME@> will have to check the server " "whether there is a newer version. Graphical User Interfaces tend to open " @@ -1246,14 +1197,14 @@ msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:466 +#: davfs2.conf.5:449 #, fuzzy, no-wrap #| msgid "B" msgid "B" msgstr "B" #. type: Plain text -#: davfs2.conf.5:474 +#: davfs2.conf.5:457 msgid "" "davfs2 holds information about files and directories in the working memory. " "It will stay there as long as the file system is mounted and the file is not " @@ -1263,7 +1214,7 @@ msgid "" msgstr "" #. type: Plain text -#: davfs2.conf.5:479 +#: davfs2.conf.5:462 msgid "" "B Most file attributes are only maintained locally because there " "is no corresponding WebDAV property. So if users change attributes (owner, " @@ -1273,21 +1224,21 @@ msgstr "" # type: SH #. type: SH -#: davfs2.conf.5:483 +#: davfs2.conf.5:466 #, fuzzy, no-wrap msgid "Debugging Options" msgstr "Opciones Generales" # type: TP #. type: TP -#: davfs2.conf.5:485 +#: davfs2.conf.5:468 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:493 +#: davfs2.conf.5:476 msgid "" "Send debug messages to the syslog daemon. The value tells what kind of " "information shall be logged. The messages are send with facility LOG_DAEMON " @@ -1299,7 +1250,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:497 +#: davfs2.conf.5:480 msgid "" "Unlike other options, this option is cumulative. If there are several debug " "entries with different values, all of them will be applied. Also debug " @@ -1309,7 +1260,7 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:500 +#: davfs2.conf.5:483 msgid "" "B Debug messages let the log-files grow quickly. Never use this " "option in normal operation of mount.davfs." @@ -1317,165 +1268,165 @@ msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:502 +#: davfs2.conf.5:485 msgid "Default: no debugging messages" msgstr "" # type: Plain text #. type: TP -#: davfs2.conf.5:503 +#: davfs2.conf.5:486 #, no-wrap msgid "B" msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:505 +#: davfs2.conf.5:488 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:508 +#: davfs2.conf.5:491 #, fuzzy msgid "Command line and configuration options." msgstr "B" # type: TP #. type: TP -#: davfs2.conf.5:508 +#: davfs2.conf.5:491 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:511 +#: davfs2.conf.5:494 msgid "Upcalls from the kernel file system." msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:511 +#: davfs2.conf.5:494 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:514 +#: davfs2.conf.5:497 msgid "Cache operations like adding and removing nodes." msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:514 +#: davfs2.conf.5:497 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:517 +#: davfs2.conf.5:500 msgid "HTTP headers." msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:517 +#: davfs2.conf.5:500 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:520 +#: davfs2.conf.5:503 msgid "Parsing of the XML-body of WebDAV-requests." msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:520 +#: davfs2.conf.5:503 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:523 +#: davfs2.conf.5:506 msgid "Negotiation of authentication." msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:523 +#: davfs2.conf.5:506 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:526 +#: davfs2.conf.5:509 msgid "Information about locks." msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:526 +#: davfs2.conf.5:509 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:529 +#: davfs2.conf.5:512 msgid "TLS/SSL related stuff like certificates." msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:529 +#: davfs2.conf.5:512 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:532 +#: davfs2.conf.5:515 msgid "Complete body of HTTP-responses." msgstr "" # type: Plain text #. type: Plain text -#: davfs2.conf.5:535 +#: davfs2.conf.5:518 msgid "" "Also print confidential information, which is usually omitted or obscured." msgstr "" # type: TP #. type: TP -#: davfs2.conf.5:535 +#: davfs2.conf.5:518 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: davfs2.conf.5:538 +#: davfs2.conf.5:521 msgid "Includes config, kernel, cache and http." msgstr "" # type: SH #. type: SH -#: davfs2.conf.5:541 mount.davfs.8:551 umount.davfs.8:79 +#: davfs2.conf.5:524 mount.davfs.8:551 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "AUTORES" # type: Plain text #. type: Plain text -#: davfs2.conf.5:545 +#: davfs2.conf.5:528 msgid "" "This man page was written by by Werner Baumann Ewerner." "baumann@onlinehome.deE." @@ -1485,27 +1436,27 @@ msgstr "" # type: SH #. type: SH -#: davfs2.conf.5:547 mount.davfs.8:568 umount.davfs.8:84 +#: davfs2.conf.5:530 mount.davfs.8:568 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "DAVFS2 HOME" # type: TH #. type: Plain text -#: davfs2.conf.5:550 mount.davfs.8:571 umount.davfs.8:87 +#: davfs2.conf.5:533 mount.davfs.8:571 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "@PACKAGE_BUGREPORT@" # type: SH #. type: SH -#: davfs2.conf.5:552 mount.davfs.8:573 umount.davfs.8:89 +#: davfs2.conf.5:535 mount.davfs.8:573 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "VER TAMBIÉN" # type: Plain text #. type: Plain text -#: davfs2.conf.5:558 +#: davfs2.conf.5:541 msgid "" "B<@PROGRAM_NAME@>(8), B(8), B(8), B(8), " "B(5)" diff --git a/src/cache.c b/src/cache.c index 973b638..ece461c 100644 --- a/src/cache.c +++ b/src/cache.c @@ -628,7 +628,7 @@ dav_init_cache(const dav_args *args, const char *mpoint) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Reading stored cache data"); parse_index(); root->name = ne_strdup(""); - root->path = dav_conv_to_server_enc(args->path); + root->path = ne_strdup(args->path); root->mode = default_dir_mode; if (!backup) @@ -909,10 +909,8 @@ dav_create(dav_node **nodep, dav_node *parent, const char *name, uid_t uid, if (!pw) return EINVAL; - char *name_conv = dav_conv_to_server_enc(name); char *path = NULL; - if (asprintf(&path, "%s%s", parent->path, name_conv) < 0) abort(); - free(name_conv); + if (asprintf(&path, "%s%s", parent->path, name) < 0) abort(); *nodep = new_node(parent, mode | S_IFREG); (*nodep)->path = path; @@ -1037,10 +1035,8 @@ dav_mkdir(dav_node **nodep, dav_node *parent, const char *name, uid_t uid, if (!pw) return EINVAL; - char *name_conv = dav_conv_to_server_enc(name); char *path = NULL; - if (asprintf(&path, "%s%s/", parent->path, name_conv) < 0) abort(); - free(name_conv); + if (asprintf(&path, "%s%s/", parent->path, name) < 0) abort(); int ret = dav_make_collection(path); if (!ret) { @@ -1776,10 +1772,8 @@ move_dir(dav_node *src, dav_node *dst, dav_node *dst_parent, char *dst_path; if (!dst) { - char *dst_conv = dav_conv_to_server_enc(dst_name); dst_path = NULL; - if (asprintf(&dst_path, "%s%s/", dst_parent->path, dst_conv) < 0) abort(); - free(dst_conv); + if (asprintf(&dst_path, "%s%s/", dst_parent->path, dst_name) < 0) abort(); } else { dst_path = ne_strdup(dst->path); } @@ -1816,10 +1810,8 @@ move_no_remote(dav_node *src, dav_node *dst, dav_node *dst_parent, char *dst_path; if (!dst) { - char *dst_conv = dav_conv_to_server_enc(dst_name); dst_path = NULL; - if (asprintf(&dst_path, "%s%s", dst_parent->path, dst_conv) < 0) abort(); - free(dst_conv); + if (asprintf(&dst_path, "%s%s", dst_parent->path, dst_name) < 0) abort(); } else { dst_path = ne_strdup(dst->path); } @@ -1885,10 +1877,8 @@ move_reg(dav_node *src, dav_node *dst, dav_node *dst_parent, char *dst_path; if (!dst) { - char *dst_conv = dav_conv_to_server_enc(dst_name); dst_path = NULL; - if (asprintf(&dst_path, "%s%s", dst_parent->path, dst_conv) < 0) abort(); - free(dst_conv); + if (asprintf(&dst_path, "%s%s", dst_parent->path, dst_name) < 0) abort(); } else { dst_path = ne_strdup(dst->path); } @@ -2915,26 +2905,20 @@ write_node(dav_node *node, FILE *file, const char *indent) if (asprintf(&ind, "%s ", indent) < 0) abort(); if (node != root && !is_backup(node)) { - if (fprintf(file, "%s\n", ind, type[PATH], node->path, - type[PATH]) < 0) + if (fprintf(file, "%s\n", ind, type[PATH], + node->path, type[PATH]) < 0) return -1; } if (node != root && node != backup) { - char *name = dav_conv_to_utf_8(node->name); - int ret = fprintf(file, "%s\n", ind, type[NAME], name, - type[NAME]); - free(name); - if (ret < 0) + if (fprintf(file, "%s\n", ind, type[NAME], + node->name, type[NAME]) < 0) return -1; } if (is_reg(node) && node->cache_path != NULL) { - char *path = dav_conv_to_utf_8(node->cache_path); - int ret = fprintf(file, "%s\n", ind, type[CACHE_PATH], - path, type[CACHE_PATH]); - free(path); - if (ret < 0) + if (fprintf(file, "%s\n", ind, + type[CACHE_PATH], node->cache_path, type[CACHE_PATH]) < 0) return -1; } @@ -3335,12 +3319,10 @@ xml_end_string(void *userdata, int state, const char *nspace, const char *name) (*((dav_node **) userdata))->path = xml_data; break; case NAME: - (*((dav_node **) userdata))->name = dav_conv_from_utf_8(xml_data); - free(xml_data); + (*((dav_node **) userdata))->name = xml_data; break; case CACHE_PATH: - (*((dav_node **) userdata))->cache_path = dav_conv_from_utf_8(xml_data); - free(xml_data); + (*((dav_node **) userdata))->cache_path = xml_data; break; case ETAG: (*((dav_node **) userdata))->etag = xml_data; diff --git a/src/mount_davfs.c b/src/mount_davfs.c index 88e2e88..d993ce4 100644 --- a/src/mount_davfs.c +++ b/src/mount_davfs.c @@ -1479,8 +1479,6 @@ delete_args(dav_args *args) } if (args->lock_owner) free(args->lock_owner); - if (args->s_charset) - free(args->s_charset); if (args->header) free(args->header); @@ -1844,8 +1842,6 @@ log_dbg_config(dav_args *args) " retry: %li s", args->retry); syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), " max_retry: %li s", args->max_retry); - syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), - " s_charset: %s", args->s_charset); syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), " header: %s", args->header); syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), @@ -2260,10 +2256,6 @@ read_config(dav_args *args, const char * filename, int system) args->max_retry = arg_to_int(parmv[1], 10, parmv[0]); } else if (strcmp(parmv[0], "max_upload_attempts") == 0) { args->max_upload_attempts = arg_to_int(parmv[1], 10, parmv[0]); - } else if (strcmp(parmv[0], "server_charset") == 0) { - if (args->s_charset) - free(args->s_charset); - args->s_charset = ne_strdup(parmv[1]); } else if (system && strcmp(parmv[0], "cache_dir") == 0) { if (args->sys_cache) free(args->sys_cache); diff --git a/src/mount_davfs.h b/src/mount_davfs.h index 04ed586..2af15c1 100644 --- a/src/mount_davfs.h +++ b/src/mount_davfs.h @@ -100,7 +100,6 @@ typedef struct { time_t retry; /* User config file, system config file */ time_t max_retry; /* User config file, system config file */ int max_upload_attempts; /* User config file, system config file */ - char * s_charset; /* User config file, system config file */ char * header; /* User config file, system config file */ /* Cache */ char *sys_cache; /* System config file */ diff --git a/src/webdav.c b/src/webdav.c index c95cb2b..7059de9 100644 --- a/src/webdav.c +++ b/src/webdav.c @@ -25,9 +25,6 @@ #ifdef HAVE_FCNTL_H #include #endif -#ifdef HAVE_ICONV_H -#include -#endif #ifdef HAVE_LANGINFO_H #include #endif @@ -223,23 +220,6 @@ static int initialized; Needed by ssl_verify() which may be called at any time. */ static int have_terminal; -#if defined DAV_USE_ICONV && defined HAVE_ICONV_H -/* Handle to convert character encoding from utf-8 to LC_CTYPE. - If NULL no conversion is done. */ -static iconv_t from_utf_8; - -/* Handle to convert character encoding from LC_CTYPE to utf-8. - If NULL no conversion is done. */ -static iconv_t to_utf_8; - -/* Handle to convert character encing of path names to LC_CTYPE. If NULL - no conversion is done. */ -static iconv_t from_server_enc; - -/* Handle to convert from LC_CTYPE to character encoding of path names. - If NULL no conversion is done. */ -static iconv_t to_server_enc; -#endif /* DAV_USE_ICONV && HAVE_ICONV_H */ /* A GNU custom stream, used to redirect neon debug messages to syslog. */ static FILE *log_stream; @@ -256,11 +236,6 @@ static char **cookie_list; /* Private function prototypes and inline functions */ /*==================================================*/ -#if defined DAV_USE_ICONV && defined HAVE_ICONV_H -static void -convert(char **s, iconv_t conv); -#endif - static int get_error(int ret, const char *method); @@ -322,33 +297,6 @@ dav_init_webdav(dav_args *args) if (args->neon_debug & ~NE_DBG_HTTPPLAIN) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Initializing webdav"); -#if defined DAV_USE_ICONV && defined HAVE_ICONV_H - char *lc_charset = nl_langinfo(CODESET); - if (lc_charset && strcasecmp(lc_charset, "UTF-8") != 0) { - from_utf_8 = iconv_open(lc_charset, "UTF-8"); - if (from_utf_8 == (iconv_t) -1) - from_utf_8 = 0; - to_utf_8 = iconv_open("UTF-8", lc_charset); - if (to_utf_8 == (iconv_t) -1) - to_utf_8 = 0; - } - - if (lc_charset && args->s_charset - && strcasecmp(args->s_charset, lc_charset) != 0) { - if (strcasecmp(args->s_charset, "UTF-8") == 0) { - from_server_enc = from_utf_8; - to_server_enc = to_utf_8; - } else { - from_server_enc = iconv_open(lc_charset, args->s_charset); - if (from_server_enc == (iconv_t) -1) - from_server_enc = 0; - to_server_enc = iconv_open(args->s_charset, lc_charset); - if (to_server_enc == (iconv_t) -1) - to_server_enc = 0; - } - } -#endif /* DAV_USE_ICONV && HAVE_ICONV_H */ - if (ne_sock_init() != 0) error(EXIT_FAILURE, errno, _("socket library initialization failed")); @@ -522,54 +470,6 @@ dav_close_webdav(void) } -char * -dav_conv_from_utf_8(const char *s) -{ - char *new = ne_strdup(s); -#if defined DAV_USE_ICONV && defined HAVE_ICONV_H - if (from_utf_8) - convert(&new, from_utf_8); -#endif - return new; -} - - -char * -dav_conv_to_utf_8(const char *s) -{ - char *new = ne_strdup(s); -#if defined DAV_USE_ICONV && defined HAVE_ICONV_H - if (to_utf_8) - convert(&new, to_utf_8); -#endif - return new; -} - - -char * -dav_conv_from_server_enc(const char *s) -{ - char *new = ne_strdup(s); -#if defined DAV_USE_ICONV && defined HAVE_ICONV_H - if (from_server_enc) - convert(&new, from_server_enc); -#endif - return new; -} - - -char * -dav_conv_to_server_enc(const char *s) -{ - char *new = ne_strdup(s); -#if defined DAV_USE_ICONV && defined HAVE_ICONV_H - if (to_server_enc) - convert(&new, to_server_enc); -#endif - return new; -} - - int dav_delete(const char *path, time_t *expire) { @@ -1152,29 +1052,6 @@ dav_unlock(const char *path, time_t *expire) /* Private functions */ /*===================*/ -#if defined DAV_USE_ICONV && defined HAVE_ICONV_H -static void -convert(char **s, iconv_t conv) -{ - size_t insize = strlen(*s); - char *in = *s; - size_t outsize = MB_LEN_MAX * (insize + 1); - char *buf = ne_calloc(outsize); - char *out = buf; - - iconv(conv, NULL, NULL, &out, &outsize); - if (iconv(conv, &in, &insize, &out, &outsize) >= 0 - && insize == 0 && outsize >= MB_LEN_MAX) { - memset(out, 0, MB_LEN_MAX); - free(*s); - *s = ne_strndup(buf, out - buf + MB_LEN_MAX); - } - - free(buf); -} -#endif /* DAV_USE_ICONV && HAVE_ICONV_H */ - - /* Returns a file error code according to ret from the last WebDAV method call. If ret has value NE_ERROR the error code from the session is fetched and translated. @@ -1717,10 +1594,6 @@ prop_result(void *userdata, const ne_uri *uri, const ne_prop_result_set *set) strlen(result->path) - strlen(ctx->path) - result->is_dir); replace_slashes(&result->name); -#if defined DAV_USE_ICONV && defined HAVE_ICONV_H - if (from_server_enc) - convert(&result->name, from_server_enc); -#endif } diff --git a/src/webdav.h b/src/webdav.h index 293d9a9..c32a7f0 100644 --- a/src/webdav.h +++ b/src/webdav.h @@ -71,22 +71,6 @@ void dav_close_webdav(void); -/* Converts the character encoding of s from and to the local encoding. - Converter handles are taken from global variables from_utf_8, to_utf_8, - from_server_enc and to_server_enc. - If no conversion is necessary, it just returns a copy of s. - name : string to be converted. - return value : the converted string, newly allocated. */ -char * -dav_conv_from_utf_8(const char *s); -char * -dav_conv_to_utf_8(const char *s); -char * -dav_conv_from_server_enc(const char *s); -char * -dav_conv_to_server_enc(const char *s); - - /* Deletes file path on the server. On success locks for this file are removed from the lock store. path : Absolute path of the file.