[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5670 - in GNUnet: . libltdl m4 po src/applications/sqstore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r5670 - in GNUnet: . libltdl m4 po src/applications/sqstore_mysql src/applications/vpn src/include src/util/network |
Date: |
Sat, 29 Sep 2007 16:47:49 -0600 (MDT) |
Author: grothoff
Date: 2007-09-29 16:47:47 -0600 (Sat, 29 Sep 2007)
New Revision: 5670
Modified:
GNUnet/INSTALL
GNUnet/libltdl/aclocal.m4
GNUnet/libltdl/configure
GNUnet/libltdl/install-sh
GNUnet/libltdl/ltdl.c
GNUnet/libltdl/ltdl.h
GNUnet/libltdl/ltmain.sh
GNUnet/libltdl/missing
GNUnet/m4/Makefile.in
GNUnet/po/GNUnet.pot
GNUnet/po/de.po
GNUnet/po/es.po
GNUnet/po/rw.po
GNUnet/po/sv.po
GNUnet/po/vi.po
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/vpn/vpn.c
GNUnet/src/include/plibc.h
GNUnet/src/util/network/io.c
GNUnet/src/util/network/select.c
Log:
indent
Modified: GNUnet/INSTALL
===================================================================
--- GNUnet/INSTALL 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/INSTALL 2007-09-29 22:47:47 UTC (rev 5670)
@@ -1,19 +1,13 @@
-Installation Instructions
-*************************
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+ These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -26,9 +20,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
+the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.
+cache files.)
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -38,17 +32,20 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -70,49 +67,51 @@
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
Installation Names
==================
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+ By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
+options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -123,7 +122,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -138,11 +137,11 @@
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -157,7 +156,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the `--target=TYPE' option to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -168,9 +167,9 @@
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -179,7 +178,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -187,18 +186,14 @@
./configure CC=/usr/local2/bin/gcc
-causes the specified `gcc' to be used as the C compiler (unless it is
+will cause the specified gcc to be used as the C compiler (unless it is
overridden in the site shell script).
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
Modified: GNUnet/libltdl/aclocal.m4
===================================================================
--- GNUnet/libltdl/aclocal.m4 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/libltdl/aclocal.m4 2007-09-29 22:47:47 UTC (rev 5670)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,53 +11,56 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+# -*- Autoconf -*-
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Generated from amversion.in; do not edit by hand.
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+ [AM_AUTOMAKE_VERSION([1.8.5])])
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+# AM_AUX_DIR_EXPAND
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -103,17 +106,27 @@
am_aux_dir=`cd $ac_aux_dir && pwd`
])
-# AM_CONDITIONAL -*- Autoconf -*-
+# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-# serial 8
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 6
+
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
@@ -121,10 +134,8 @@
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -134,19 +145,31 @@
fi
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
+ AC_MSG_ERROR([conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# serial 7 -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# serial 9
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
@@ -154,6 +177,7 @@
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
@@ -173,7 +197,6 @@
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -239,7 +262,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -292,21 +314,30 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([AMDEPBACKSLASH])
])
-# Generate code to set up dependency tracking. -*- Autoconf -*-
+# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation,
Inc.
-#serial 3
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+#serial 2
+
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -318,28 +349,33 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+ # Extract the definition of DEP_FILES from the Makefile without
+ # running `make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+ # We invoke sed twice because it is the simplest approach to
+ # changing $(DEPDIR) to its actual value in the expansion.
+ for file in `sed -n '
+ /^DEP_FILES = .*\\\\$/ {
+ s/^DEP_FILES = //
+ :loop
+ s/\\\\$//
+ p
+ n
+ /\\\\$/ b loop
+ p
+ }
+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -365,32 +401,55 @@
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-# serial 8
+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 7
+
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-# Do all the work for Automake. -*- Autoconf -*-
+# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# This macro actually does too much some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
-# serial 12
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 11
+
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
@@ -403,20 +462,16 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.58])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean"
there first])
- fi
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean"
there first])
fi
# test whether we have cygpath
@@ -436,9 +491,6 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -454,6 +506,7 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
AM_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -462,9 +515,7 @@
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)],
@@ -474,10 +525,6 @@
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
@@ -502,28 +549,52 @@
done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# -*- Autoconf -*-
+# Copyright (C) 2003 Free Software Foundation, Inc.
-# serial 2
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@ -537,16 +608,27 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-# Check to see how 'make' treats includes. -*- Autoconf -*-
+# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-# serial 3
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -589,17 +671,28 @@
rm -f confinc confmf
])
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+# -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# serial 5
+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -614,7 +707,6 @@
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@@ -625,42 +717,93 @@
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
# AM_PROG_MKDIR_P
# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-# Helper functions for option handling. -*- Autoconf -*-
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+# created by `make install' are always world readable, even if the
+# installer happens to have an overly restrictive umask (e.g. 077).
+# This was a mistake. There are at least two reasons why we must not
+# use `-m 0755':
+# - it causes special bits like SGID to be ignored,
+# - it may be too restrictive (some setups expect 775 directories).
#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Do not use -m 0755 and let people choose whatever they expect by
+# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out. Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
+AC_DEFUN([AM_PROG_MKDIR_P],
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # Keeping the `.' argument allows $(mkdir_p) to be used without
+ # argument. Indeed, we sometimes output rules like
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined.
+ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+ # expensive solution, as it forces Make to start a sub-shell.)
+ mkdir_p='mkdir -p -- .'
+else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
+ else
+ mkdir_p='$(install_sh) -d'
+ fi
+fi
+AC_SUBST([mkdir_p])])
-# serial 3
+# Helper functions for option handling. -*- Autoconf -*-
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
@@ -684,17 +827,29 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Check to make sure that the build environment is sane.
+#
-# serial 4
+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
@@ -736,14 +891,25 @@
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# AM_PROG_INSTALL_STRIP
-# AM_PROG_INSTALL_STRIP
-# ---------------------
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
@@ -761,115 +927,7 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball. -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf -
"'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf -
"'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
m4_include([acinclude.m4])
Modified: GNUnet/libltdl/configure
===================================================================
--- GNUnet/libltdl/configure 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/libltdl/configure 2007-09-29 22:47:47 UTC (rev 5670)
@@ -809,7 +809,6 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
-am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -818,6 +817,7 @@
AUTOMAKE
AUTOHEADER
MAKEINFO
+AMTAR
install_sh
STRIP
INSTALL_STRIP_PROGRAM
@@ -825,9 +825,6 @@
AWK
SET_MAKE
am__leading_dot
-AMTAR
-am__tar
-am__untar
CC
CFLAGS
LDFLAGS
@@ -1998,8 +1995,7 @@
## ------------------------ ##
## Automake Initialisation. ##
## ------------------------ ##
-am__api_version='1.10'
-
+am__api_version="1.8"
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -2151,54 +2147,31 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # Keeping the `.' argument allows $(mkdir_p) to be used without
+ # argument. Indeed, we sometimes output rules like
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined.
+ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+ # expensive solution, as it forces Make to start a sub-shell.)
+ mkdir_p='mkdir -p -- .'
else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x
"$as_dir/$ac_prog$ac_exec_ext"; } || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
- 'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
- break 3;;
- esac
- done
- done
-done
-IFS=$as_save_IFS
-
-fi
-
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
+ mkdir_p='$(install_sh) -d'
fi
fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with
args.
@@ -2280,16 +2253,12 @@
fi
rmdir .tst 2>/dev/null
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run
\"make distclean\" there first" >&5
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run
\"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make
distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
- fi
fi
# test whether we have cygpath
@@ -2323,8 +2292,11 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
@@ -2427,20 +2399,13 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
ac_config_headers="$ac_config_headers config.h:config-h.in"
@@ -3419,7 +3384,9 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
- if test "x$enable_dependency_tracking" != xno; then
+
+
+if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -3429,6 +3396,7 @@
+
depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3496,7 +3464,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3526,7 +3493,9 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
+
+
+if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -4515,7 +4484,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4518 "configure"' > conftest.$ac_ext
+ echo '#line 4487 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6034,7 +6003,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -6064,7 +6032,9 @@
echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- if
+
+
+if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
@@ -7540,11 +7510,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7543: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7513: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7547: \$? = $ac_status" >&5
+ echo "$as_me:7517: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7808,11 +7778,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7811: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7781: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7815: \$? = $ac_status" >&5
+ echo "$as_me:7785: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7912,11 +7882,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7915: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7885: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7919: \$? = $ac_status" >&5
+ echo "$as_me:7889: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10209,7 +10179,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10212 "configure"
+#line 10182 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10309,7 +10279,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10312 "configure"
+#line 10282 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12649,11 +12619,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12652: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12622: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12656: \$? = $ac_status" >&5
+ echo "$as_me:12626: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12753,11 +12723,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12756: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12726: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12760: \$? = $ac_status" >&5
+ echo "$as_me:12730: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14314,11 +14284,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14317: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14287: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14321: \$? = $ac_status" >&5
+ echo "$as_me:14291: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14418,11 +14388,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14421: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14391: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14425: \$? = $ac_status" >&5
+ echo "$as_me:14395: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16609,11 +16579,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16612: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16582: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16616: \$? = $ac_status" >&5
+ echo "$as_me:16586: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16877,11 +16847,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16880: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16850: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16884: \$? = $ac_status" >&5
+ echo "$as_me:16854: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16981,11 +16951,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16984: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16954: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16988: \$? = $ac_status" >&5
+ echo "$as_me:16958: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19881,7 +19851,9 @@
fi
- if test x"${enable_ltdl_install-no}" != xno; then
+
+
+if test x"${enable_ltdl_install-no}" != xno; then
INSTALL_LTDL_TRUE=
INSTALL_LTDL_FALSE='#'
else
@@ -19889,7 +19861,9 @@
INSTALL_LTDL_FALSE=
fi
- if test x"${enable_ltdl_convenience-no}" != xno; then
+
+
+if test x"${enable_ltdl_convenience-no}" != xno; then
CONVENIENCE_LTDL_TRUE=
CONVENIENCE_LTDL_FALSE='#'
else
@@ -20714,7 +20688,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20717 "configure"
+#line 20691 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22666,7 +22640,6 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -22874,7 +22847,6 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -22883,6 +22855,7 @@
AUTOMAKE!$AUTOMAKE$ac_delim
AUTOHEADER!$AUTOHEADER$ac_delim
MAKEINFO!$MAKEINFO$ac_delim
+AMTAR!$AMTAR$ac_delim
install_sh!$install_sh$ac_delim
STRIP!$STRIP$ac_delim
INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
@@ -22890,9 +22863,6 @@
AWK!$AWK$ac_delim
SET_MAKE!$SET_MAKE$ac_delim
am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -22931,6 +22901,9 @@
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
CXXDEPMODE!$CXXDEPMODE$ac_delim
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+CXXCPP!$CXXCPP$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22972,9 +22945,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-CXXCPP!$CXXCPP$ac_delim
F77!$F77$ac_delim
FFLAGS!$FFLAGS$ac_delim
ac_ct_F77!$ac_ct_F77$ac_delim
@@ -22989,7 +22959,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -23216,11 +23186,6 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
- ac_MKDIR_P=$MKDIR_P
- case $MKDIR_P in
- [\\/$]* | ?:[\\/]* ) ;;
- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
- esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -23274,7 +23239,6 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed"
>$tmp/out
@@ -23439,9 +23403,8 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
@@ -23468,21 +23431,27 @@
else
continue
fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+ # Extract the definition of DEP_FILES from the Makefile without
+ # running `make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+ # We invoke sed twice because it is the simplest approach to
+ # changing $(DEPDIR) to its actual value in the expansion.
+ for file in `sed -n '
+ /^DEP_FILES = .*\\\\$/ {
+ s/^DEP_FILES = //
+ :loop
+ s/\\\\$//
+ p
+ n
+ /\\\\$/ b loop
+ p
+ }
+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
Modified: GNUnet/libltdl/install-sh
===================================================================
--- GNUnet/libltdl/install-sh 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/libltdl/install-sh 2007-09-29 22:47:47 UTC (rev 5670)
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2004-04-01.17
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,24 +39,15 @@
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch.
+# from scratch. It can only install one file at a time, a restriction
+# shared with many OS's install programs.
-nl='
-'
-IFS=" "" $nl"
-
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
-if test -z "$doit"; then
- doit_exec=exec
-else
- doit_exec=$doit
-fi
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
+# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
@@ -67,13 +58,10 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-posix_glob=
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chmodcmd=$chmodprog
+transformbasename=
+transform_arg=
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
chowncmd=
chgrpcmd=
stripcmd=
@@ -82,27 +70,23 @@
src=
dst=
dir_arg=
-dstarg=
-no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
- or: $0 [OPTION]... -d DIRECTORIES...
+ or: $0 -d DIRECTORIES...
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
+In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
+In the second, create the directory path DIR.
Options:
--c (ignored)
+-b=TRANSFORMBASENAME
+-c copy source (using $cpprog) instead of moving (using $mvprog).
-d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
+-g GROUP $chgrp installed files to GROUP.
+-m MODE $chmod installed files to MODE.
+-o USER $chown installed files to USER.
+-s strip installed files (using $stripprog).
+-t=TRANSFORM
--help display this help and exit.
--version display version info and exit.
@@ -110,11 +94,16 @@
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
-while test $# -ne 0; do
+while test -n "$1"; do
case $1 in
- -c) shift
+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+ shift
continue;;
+ -c) instcmd=$cpprog
+ shift
+ continue;;
+
-d) dir_arg=true
shift
continue;;
@@ -124,17 +113,11 @@
shift
continue;;
- --help) echo "$usage"; exit $?;;
+ --help) echo "$usage"; exit 0;;
- -m) mode=$2
+ -m) chmodcmd="$chmodprog $2"
shift
shift
- case $mode in
- *' '* | *' '* | *'
-'* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
continue;;
-o) chowncmd="$chownprog $2"
@@ -146,44 +129,30 @@
shift
continue;;
- -t) dstarg=$2
- shift
- shift
- continue;;
+ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+ shift
+ continue;;
- -T) no_target_directory=true
- shift
- continue;;
+ --version) echo "$0 $scriptversion"; exit 0;;
- --version) echo "$0 $scriptversion"; exit $?;;
-
- --) shift
+ *) # When -d is used, all remaining arguments are directories to create.
+ test -n "$dir_arg" && break
+ # Otherwise, the last argument is the destination. Remove it from
address@hidden
+ for arg
+ do
+ if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dstarg"
+ shift # fnord
+ fi
+ shift # arg
+ dstarg=$arg
+ done
break;;
-
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
-
- *) break;;
esac
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
- # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- # Otherwise, the last argument is the destination. Remove it from
address@hidden
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
-fi
-
-if test $# -eq 0; then
+if test -z "$1"; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
@@ -193,33 +162,6 @@
exit 0
fi
-if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
-
- # Set umask so as not to create temps with too-generous modes.
- # However, 'strip' requires both read and write access to temps.
- case $mode in
- # Optimize common cases.
- *644) cp_umask=133;;
- *755) cp_umask=22;;
-
- *[0-7])
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw='% 200'
- fi
- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
- *)
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw=,u+rw
- fi
- cp_umask=$mode$u_plus_rw;;
- esac
-fi
-
for src
do
# Protect names starting with `-'.
@@ -229,12 +171,16 @@
if test -n "$dir_arg"; then
dst=$src
- dstdir=$dst
- test -d "$dstdir"
- dstdir_status=$?
- else
+ src=
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ if test -d "$dst"; then
+ instcmd=:
+ chmodcmd=
+ else
+ instcmd=$mkdirprog
+ fi
+ else
+ # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if test ! -f "$src" && test ! -d "$src"; then
@@ -256,216 +202,86 @@
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
- if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
- exit 1
- fi
- dstdir=$dst
- dst=$dstdir/`basename "$src"`
- dstdir_status=0
- else
- # Prefer dirname, but fall back on a substitute if dirname fails.
- dstdir=`
- (dirname "$dst") 2>/dev/null ||
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$dst" : 'X\(//\)[^/]' \| \
- X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'
- `
-
- test -d "$dstdir"
- dstdir_status=$?
+ dst=$dst/`basename "$src"`
fi
fi
- obsolete_mkdir_used=false
+ # This sed command emulates the dirname command.
+ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
- if test $dstdir_status != 0; then
- case $posix_mkdir in
- '')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+ # Make sure that the destination directory exists.
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
+ # Skip lots of stat calls in the usual case.
+ if test ! -d "$dstdir"; then
+ defaultIFS='
+ '
+ IFS="${IFS-$defaultIFS}"
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
+ oIFS=$IFS
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
+ set - `echo "$dstdir" | sed -e 's@/@address@hidden' -e 'address@hidden@/@'`
+ IFS=$oIFS
- posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ pathcomp=
- if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/d" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
- fi
- trap '' 0;;
- esac;;
- esac
-
- if
- $posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
- )
- then :
- else
-
- # The umask is ridiculous, or mkdir does not conform to POSIX,
- # or it failed possibly due to a race condition. Create the
- # directory the slow way, step by step, checking for races as we go.
-
- case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
- esac
-
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
-
- oIFS=$IFS
- IFS=/
- $posix_glob && set -f
- set fnord $dstdir
+ while test $# -ne 0 ; do
+ pathcomp=$pathcomp$1
shift
- $posix_glob && set +f
- IFS=$oIFS
-
- prefixes=
-
- for d
- do
- test -z "$d" && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask=$mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
- done
-
- if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
+ if test ! -d "$pathcomp"; then
+ $mkdirprog "$pathcomp" || lasterr=$?
+ # mkdir can fail with a `File exist' error in case several
+ # install-sh are creating the directory concurrently. This
+ # is OK.
+ test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
fi
- fi
+ pathcomp=$pathcomp/
+ done
fi
if test -n "$dir_arg"; then
- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ $doit $instcmd "$dst" \
+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
else
+ # If we're going to rename the final executable, determine the name now.
+ if test -z "$transformarg"; then
+ dstfile=`basename "$dst"`
+ else
+ dstfile=`basename "$dst" $transformbasename \
+ | sed $transformarg`$transformbasename
+ fi
+ # don't allow the sed command to completely eliminate the filename.
+ test -z "$dstfile" && dstfile=`basename "$dst"`
+
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+ trap '(exit $?); exit' 1 2 13 15
- # Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+ # Move or copy the file name to the temp name
+ $doit $instcmd "$src" "$dsttmp" &&
# and set any options; do chmod last to preserve setuid bits.
#
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $cpprog $src $dsttmp" command.
+ # errors from the above "$doit $instcmd $src $dsttmp" command.
#
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
# Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
@@ -477,13 +293,12 @@
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ if test -f "$dstdir/$dstfile"; then
+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ (exit 1); exit
}
else
:
@@ -491,14 +306,17 @@
} &&
# Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
}
- } || exit 1
-
- trap '' 0
- fi
+ }
+ fi || { (exit 1); exit; }
done
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+ (exit 0); exit
+}
+
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
Modified: GNUnet/libltdl/ltdl.c
===================================================================
--- GNUnet/libltdl/ltdl.c 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/libltdl/ltdl.c 2007-09-29 22:47:47 UTC (rev 5670)
@@ -131,10 +131,10 @@
#if WITH_DMALLOC
# include <dmalloc.h>
#endif
+
-
/* --- WINDOWS SUPPORT --- */
@@ -162,7 +162,7 @@
struct dirent
{
char d_name[2048];
- int d_namlen;
+ int d_namlen;
};
typedef struct _DIR
@@ -174,8 +174,8 @@
} DIR;
#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
+
-
/* --- MANIFEST CONSTANTS --- */
@@ -199,30 +199,32 @@
/* This accounts for the _LTX_ separator */
#undef LT_SYMBOL_OVERHEAD
#define LT_SYMBOL_OVERHEAD 5
+
-
/* --- MEMORY HANDLING --- */
/* These are the functions used internally. In addition to making
use of the associated function pointers above, they also perform
error handling. */
-static char *lt_estrdup LT_PARAMS((const char *str));
-static lt_ptr lt_emalloc LT_PARAMS((size_t size));
-static lt_ptr lt_erealloc LT_PARAMS((lt_ptr addr, size_t size));
+static char *lt_estrdup LT_PARAMS ((const char *str));
+static lt_ptr lt_emalloc LT_PARAMS ((size_t size));
+static lt_ptr lt_erealloc LT_PARAMS ((lt_ptr addr, size_t size));
/* static lt_ptr rpl_realloc LT_PARAMS((lt_ptr ptr, size_t size)); */
#define rpl_realloc realloc
/* These are the pointers that can be changed by the caller: */
-LT_GLOBAL_DATA lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size))
- = (lt_ptr (*) LT_PARAMS((size_t))) malloc;
-LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size))
- = (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) rpl_realloc;
-LT_GLOBAL_DATA void (*lt_dlfree) LT_PARAMS((lt_ptr ptr))
- = (void (*) LT_PARAMS((lt_ptr))) free;
+LT_GLOBAL_DATA
+lt_ptr (*lt_dlmalloc)
+LT_PARAMS ((size_t size)) = (lt_ptr (*)LT_PARAMS ((size_t))) malloc;
+ LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc)
+ LT_PARAMS ((lt_ptr ptr, size_t size)) =
+ (lt_ptr (*)LT_PARAMS ((lt_ptr, size_t))) rpl_realloc;
+ LT_GLOBAL_DATA void (*lt_dlfree) LT_PARAMS ((lt_ptr ptr)) =
+ (void (*)LT_PARAMS ((lt_ptr))) free;
/* The following macros reduce the amount of typing needed to cast
assigned memory. */
@@ -251,29 +253,28 @@
#define LT_DLMEM_REASSIGN(p, q) LT_STMT_START { \
if ((p) != (q)) { if (p) lt_dlfree (p); (p) = (q); (q) = 0; } \
} LT_STMT_END
+
-
/* --- REPLACEMENT FUNCTIONS --- */
#undef strdup
#define strdup rpl_strdup
-static char *strdup LT_PARAMS((const char *str));
+ static char *strdup LT_PARAMS ((const char *str));
-static char *
-strdup(str)
+ static char *strdup (str)
const char *str;
{
char *tmp = 0;
if (str)
{
- tmp = LT_DLMALLOC (char, 1+ strlen (str));
+ tmp = LT_DLMALLOC (char, 1 + strlen (str));
if (tmp)
- {
- strcpy(tmp, str);
- }
+ {
+ strcpy (tmp, str);
+ }
}
return tmp;
@@ -285,7 +286,7 @@
#undef strcmp
#define strcmp rpl_strcmp
-static int strcmp LT_PARAMS((const char *str1, const char *str2));
+static int strcmp LT_PARAMS ((const char *str1, const char *str2));
static int
strcmp (str1, str2)
@@ -299,13 +300,13 @@
if (str2 == 0)
return 1;
- for (;*str1 && *str2; ++str1, ++str2)
+ for (; *str1 && *str2; ++str1, ++str2)
{
if (*str1 != *str2)
- break;
+ break;
}
- return (int)(*str1 - *str2);
+ return (int) (*str1 - *str2);
}
#endif
@@ -317,19 +318,19 @@
# else
# define strchr rpl_strchr
-static const char *strchr LT_PARAMS((const char *str, int ch));
+static const char *strchr LT_PARAMS ((const char *str, int ch));
-static const char*
-strchr(str, ch)
+static const char *
+strchr (str, ch)
const char *str;
int ch;
{
const char *p;
- for (p = str; *p != (char)ch && *p != LT_EOS_CHAR; ++p)
- /*NOWORK*/;
+ for (p = str; *p != (char) ch && *p != LT_EOS_CHAR; ++p)
+ /*NOWORK*/;
- return (*p == (char)ch) ? p : 0;
+ return (*p == (char) ch) ? p : 0;
}
# endif
@@ -343,10 +344,10 @@
# else
# define strrchr rpl_strrchr
-static const char *strrchr LT_PARAMS((const char *str, int ch));
+static const char *strrchr LT_PARAMS ((const char *str, int ch));
-static const char*
-strrchr(str, ch)
+static const char *
+strrchr (str, ch)
const char *str;
int ch;
{
@@ -355,9 +356,9 @@
for (p = str; *p != LT_EOS_CHAR; ++p)
{
if (*p == (char) ch)
- {
- q = p;
- }
+ {
+ q = p;
+ }
}
return q;
@@ -377,7 +378,7 @@
# else
# define memcpy rpl_memcpy
-static lt_ptr memcpy LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
+static lt_ptr memcpy LT_PARAMS ((lt_ptr dest, const lt_ptr src, size_t size));
static lt_ptr
memcpy (dest, src, size)
@@ -385,9 +386,9 @@
const lt_ptr src;
size_t size;
{
- const char * s = src;
- char * d = dest;
- size_t i = 0;
+ const char *s = src;
+ char *d = dest;
+ size_t i = 0;
for (i = 0; i < size; ++i)
{
@@ -398,12 +399,13 @@
}
# endif /* !HAVE_BCOPY */
-#endif /* !HAVE_MEMCPY */
+#endif /* !HAVE_MEMCPY */
#if ! HAVE_MEMMOVE
# define memmove rpl_memmove
-static lt_ptr memmove LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
+static lt_ptr memmove
+LT_PARAMS ((lt_ptr dest, const lt_ptr src, size_t size));
static lt_ptr
memmove (dest, src, size)
@@ -411,21 +413,21 @@
const lt_ptr src;
size_t size;
{
- const char * s = src;
- char * d = dest;
- size_t i;
+ const char *s = src;
+ char *d = dest;
+ size_t i;
if (d < s)
for (i = 0; i < size; ++i)
{
- d[i] = s[i];
+ d[i] = s[i];
}
else if (d > s && size > 0)
- for (i = size -1; ; --i)
+ for (i = size - 1;; --i)
{
- d[i] = s[i];
- if (i == 0)
- break;
+ d[i] = s[i];
+ if (i == 0)
+ break;
}
return dest;
@@ -435,74 +437,76 @@
#ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-static void closedir LT_PARAMS((DIR *entry));
+static void closedir LT_PARAMS ((DIR * entry));
static void
-closedir(entry)
- DIR *entry;
+closedir (entry)
+ DIR *entry;
{
- assert(entry != (DIR *) NULL);
- FindClose(entry->hSearch);
- lt_dlfree((lt_ptr)entry);
+ assert (entry != (DIR *) NULL);
+ FindClose (entry->hSearch);
+ lt_dlfree ((lt_ptr) entry);
}
-static DIR * opendir LT_PARAMS((const char *path));
+static DIR *opendir LT_PARAMS ((const char *path));
-static DIR*
+static DIR *
opendir (path)
- const char *path;
+ const char *path;
{
char file_specification[LT_FILENAME_MAX];
DIR *entry;
- assert(path != (char *) NULL);
+ assert (path != (char *) NULL);
/* allow space for: path + '\\' '\\' '*' '.' '*' + '\0' */
- (void) strncpy (file_specification, path, LT_FILENAME_MAX-6);
- file_specification[LT_FILENAME_MAX-6] = LT_EOS_CHAR;
- (void) strcat(file_specification,"\\");
- entry = LT_DLMALLOC (DIR,sizeof(DIR));
+ (void) strncpy (file_specification, path, LT_FILENAME_MAX - 6);
+ file_specification[LT_FILENAME_MAX - 6] = LT_EOS_CHAR;
+ (void) strcat (file_specification, "\\");
+ entry = LT_DLMALLOC (DIR, sizeof (DIR));
if (entry != (DIR *) 0)
{
entry->firsttime = TRUE;
- entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
+ entry->hSearch =
+ FindFirstFile (file_specification, &entry->Win32FindData);
}
if (entry->hSearch == INVALID_HANDLE_VALUE)
{
- (void) strcat(file_specification,"\\*.*");
- entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
+ (void) strcat (file_specification, "\\*.*");
+ entry->hSearch =
+ FindFirstFile (file_specification, &entry->Win32FindData);
if (entry->hSearch == INVALID_HANDLE_VALUE)
{
LT_DLFREE (entry);
return (DIR *) 0;
}
}
- return(entry);
+ return (entry);
}
-static struct dirent *readdir LT_PARAMS((DIR *entry));
+static struct dirent *readdir LT_PARAMS ((DIR * entry));
-static struct dirent *readdir(entry)
- DIR *entry;
+static struct dirent *
+readdir (entry)
+ DIR *entry;
{
- int
- status;
+ int status;
if (entry == (DIR *) 0)
- return((struct dirent *) 0);
+ return ((struct dirent *) 0);
if (!entry->firsttime)
{
- status = FindNextFile(entry->hSearch,&entry->Win32FindData);
+ status = FindNextFile (entry->hSearch, &entry->Win32FindData);
if (status == 0)
- return((struct dirent *) 0);
+ return ((struct dirent *) 0);
}
entry->firsttime = FALSE;
- (void) strncpy(entry->file_info.d_name,entry->Win32FindData.cFileName,
- LT_FILENAME_MAX-1);
+ (void) strncpy (entry->file_info.d_name, entry->Win32FindData.cFileName,
+ LT_FILENAME_MAX - 1);
entry->file_info.d_name[LT_FILENAME_MAX - 1] = LT_EOS_CHAR;
- entry->file_info.d_namlen = strlen(entry->file_info.d_name);
- return(&entry->file_info);
+ entry->file_info.d_namlen = strlen (entry->file_info.d_name);
+ return (&entry->file_info);
}
#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
@@ -533,9 +537,9 @@
{
/* For zero or less bytes, free the original memory */
if (ptr != 0)
- {
- lt_dlfree (ptr);
- }
+ {
+ lt_dlfree (ptr);
+ }
return (lt_ptr) 0;
}
@@ -550,13 +554,13 @@
lt_ptr mem = lt_dlmalloc (size);
if (mem)
- {
- memcpy (mem, ptr, size);
- lt_dlfree (ptr);
- }
+ {
+ memcpy (mem, ptr, size);
+ lt_dlfree (ptr);
+ }
/* Note that the contents of PTR are not damaged if there is
- insufficient memory to realloc. */
+ insufficient memory to realloc. */
return mem;
}
}
@@ -566,8 +570,8 @@
#if ! HAVE_ARGZ_APPEND
# define argz_append rpl_argz_append
-static error_t argz_append LT_PARAMS((char **pargz, size_t *pargz_len,
- const char *buf, size_t buf_len));
+static error_t argz_append LT_PARAMS ((char **pargz, size_t * pargz_len,
+ const char *buf, size_t buf_len));
static error_t
argz_append (pargz, pargz_len, buf, buf_len)
@@ -577,7 +581,7 @@
size_t buf_len;
{
size_t argz_len;
- char *argz;
+ char *argz;
assert (pargz);
assert (pargz_len);
@@ -608,8 +612,8 @@
#if ! HAVE_ARGZ_CREATE_SEP
# define argz_create_sep rpl_argz_create_sep
-static error_t argz_create_sep LT_PARAMS((const char *str, int delim,
- char **pargz, size_t *pargz_len));
+static error_t argz_create_sep LT_PARAMS ((const char *str, int delim,
+ char **pargz, size_t * pargz_len));
static error_t
argz_create_sep (str, delim, pargz, pargz_len)
@@ -627,7 +631,7 @@
/* Make a copy of STR, but replacing each occurrence of
DELIM with '\0'. */
- argz_len = 1+ LT_STRLEN (str);
+ argz_len = 1 + LT_STRLEN (str);
if (argz_len)
{
const char *p;
@@ -635,22 +639,22 @@
argz = LT_DLMALLOC (char, argz_len);
if (!argz)
- return ENOMEM;
+ return ENOMEM;
for (p = str, q = argz; *p != LT_EOS_CHAR; ++p)
- {
- if (*p == delim)
- {
- /* Ignore leading delimiters, and fold consecutive
- delimiters in STR into a single '\0' in ARGZ. */
- if ((q > argz) && (q[-1] != LT_EOS_CHAR))
- *q++ = LT_EOS_CHAR;
- else
- --argz_len;
- }
- else
- *q++ = *p;
- }
+ {
+ if (*p == delim)
+ {
+ /* Ignore leading delimiters, and fold consecutive
+ delimiters in STR into a single '\0' in ARGZ. */
+ if ((q > argz) && (q[-1] != LT_EOS_CHAR))
+ *q++ = LT_EOS_CHAR;
+ else
+ --argz_len;
+ }
+ else
+ *q++ = *p;
+ }
/* Copy terminating LT_EOS_CHAR. */
*q = *p;
}
@@ -671,8 +675,8 @@
#if ! HAVE_ARGZ_INSERT
# define argz_insert rpl_argz_insert
-static error_t argz_insert LT_PARAMS((char **pargz, size_t *pargz_len,
- char *before, const char *entry));
+static error_t argz_insert LT_PARAMS ((char **pargz, size_t * pargz_len,
+ char *before, const char *entry));
static error_t
argz_insert (pargz, pargz_len, before, entry)
@@ -688,7 +692,7 @@
/* No BEFORE address indicates ENTRY should be inserted after the
current last element. */
if (!before)
- return argz_append (pargz, pargz_len, entry, 1+ LT_STRLEN (entry));
+ return argz_append (pargz, pargz_len, entry, 1 + LT_STRLEN (entry));
/* This probably indicates a programmer error, but to preserve
semantics, scan back to the start of an entry if BEFORE points
@@ -697,10 +701,10 @@
--before;
{
- size_t entry_len = 1+ LT_STRLEN (entry);
- size_t argz_len = *pargz_len + entry_len;
- size_t offset = before - *pargz;
- char *argz = LT_DLREALLOC (char, *pargz, argz_len);
+ size_t entry_len = 1 + LT_STRLEN (entry);
+ size_t argz_len = *pargz_len + entry_len;
+ size_t offset = before - *pargz;
+ char *argz = LT_DLREALLOC (char, *pargz, argz_len);
if (!argz)
return ENOMEM;
@@ -713,7 +717,7 @@
space at the end -- making room to copy ENTRY into the
resulting gap. */
memmove (before + entry_len, before, *pargz_len - offset);
- memcpy (before, entry, entry_len);
+ memcpy (before, entry, entry_len);
/* Assign new values. */
*pargz = argz;
@@ -728,8 +732,8 @@
#if ! HAVE_ARGZ_NEXT
# define argz_next rpl_argz_next
-static char *argz_next LT_PARAMS((char *argz, size_t argz_len,
- const char *entry));
+static char *argz_next LT_PARAMS ((char *argz, size_t argz_len,
+ const char *entry));
static char *
argz_next (argz, argz_len, entry)
@@ -742,28 +746,28 @@
if (entry)
{
/* Either ARGZ/ARGZ_LEN is empty, or ENTRY points into an address
- within the ARGZ vector. */
+ within the ARGZ vector. */
assert ((!argz && !argz_len)
- || ((argz <= entry) && (entry < (argz + argz_len))));
+ || ((argz <= entry) && (entry < (argz + argz_len))));
/* Move to the char immediately after the terminating
- '\0' of ENTRY. */
- entry = 1+ strchr (entry, LT_EOS_CHAR);
+ '\0' of ENTRY. */
+ entry = 1 + strchr (entry, LT_EOS_CHAR);
/* Return either the new ENTRY, or else NULL if ARGZ is
- exhausted. */
+ exhausted. */
return (entry >= argz + argz_len) ? 0 : (char *) entry;
}
else
{
/* This should probably be flagged as a programmer error,
- since starting an argz_next loop with the iterator set
- to ARGZ is safer. To preserve semantics, handle the NULL
- case by returning the start of ARGZ (if any). */
+ since starting an argz_next loop with the iterator set
+ to ARGZ is safer. To preserve semantics, handle the NULL
+ case by returning the start of ARGZ (if any). */
if (argz_len > 0)
- return argz;
+ return argz;
else
- return 0;
+ return 0;
}
}
#endif /* !HAVE_ARGZ_NEXT */
@@ -773,8 +777,7 @@
#if ! HAVE_ARGZ_STRINGIFY
# define argz_stringify rpl_argz_stringify
-static void argz_stringify LT_PARAMS((char *argz, size_t argz_len,
- int sep));
+static void argz_stringify LT_PARAMS ((char *argz, size_t argz_len, int sep));
static void
argz_stringify (argz, argz_len, sep)
@@ -786,68 +789,69 @@
if (sep)
{
- --argz_len; /* don't stringify the terminating EOS */
+ --argz_len; /* don't stringify the terminating EOS */
while (--argz_len > 0)
- {
- if (argz[argz_len] == LT_EOS_CHAR)
- argz[argz_len] = sep;
- }
+ {
+ if (argz[argz_len] == LT_EOS_CHAR)
+ argz[argz_len] = sep;
+ }
}
}
#endif /* !HAVE_ARGZ_STRINGIFY */
+
-
/* --- TYPE DEFINITIONS -- */
/* This type is used for the array of caller data sets in each handler. */
-typedef struct {
- lt_dlcaller_id key;
- lt_ptr data;
+typedef struct
+{
+ lt_dlcaller_id key;
+ lt_ptr data;
} lt_caller_data;
+
-
/* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */
/* Extract the diagnostic strings from the error table macro in the same
order as the enumerated indices in ltdl.h. */
-static const char *lt_dlerror_strings[] =
- {
+static const char *lt_dlerror_strings[] = {
#define LT_ERROR(name, diagnostic) (diagnostic),
- lt_dlerror_table
+ lt_dlerror_table
#undef LT_ERROR
+ 0
+};
- 0
- };
-
/* This structure is used for the list of registered loaders. */
-struct lt_dlloader {
- struct lt_dlloader *next;
- const char *loader_name; /* identifying name for each loader */
- const char *sym_prefix; /* prefix for symbols */
- lt_module_open *module_open;
- lt_module_close *module_close;
- lt_find_sym *find_sym;
- lt_dlloader_exit *dlloader_exit;
- lt_user_data dlloader_data;
+struct lt_dlloader
+{
+ struct lt_dlloader *next;
+ const char *loader_name; /* identifying name for each loader */
+ const char *sym_prefix; /* prefix for symbols */
+ lt_module_open *module_open;
+ lt_module_close *module_close;
+ lt_find_sym *find_sym;
+ lt_dlloader_exit *dlloader_exit;
+ lt_user_data dlloader_data;
};
-struct lt_dlhandle_struct {
- struct lt_dlhandle_struct *next;
- lt_dlloader *loader; /* dlopening interface */
- lt_dlinfo info;
- int depcount; /* number of dependencies */
- lt_dlhandle *deplibs; /* dependencies */
- lt_module module; /* system module handle */
- lt_ptr system; /* system specific data */
- lt_caller_data *caller_data; /* per caller associated data */
- int flags; /* various boolean stats */
+struct lt_dlhandle_struct
+{
+ struct lt_dlhandle_struct *next;
+ lt_dlloader *loader; /* dlopening interface */
+ lt_dlinfo info;
+ int depcount; /* number of dependencies */
+ lt_dlhandle *deplibs; /* dependencies */
+ lt_module module; /* system module handle */
+ lt_ptr system; /* system specific data */
+ lt_caller_data *caller_data; /* per caller associated data */
+ int flags; /* various boolean stats */
};
/* Various boolean flags can be stored in the flags field of an
@@ -863,18 +867,18 @@
#define LT_DLSTRERROR(name) lt_dlerror_strings[LT_CONC(LT_ERROR_,name)]
-static const char objdir[] = LTDL_OBJDIR;
-static const char archive_ext[] = LTDL_ARCHIVE_EXT;
+static const char objdir[] = LTDL_OBJDIR;
+static const char archive_ext[] = LTDL_ARCHIVE_EXT;
#ifdef LTDL_SHLIB_EXT
-static const char shlib_ext[] = LTDL_SHLIB_EXT;
+static const char shlib_ext[] = LTDL_SHLIB_EXT;
#endif
#ifdef LTDL_SYSSEARCHPATH
-static const char sys_search_path[] = LTDL_SYSSEARCHPATH;
+static const char sys_search_path[] = LTDL_SYSSEARCHPATH;
#endif
+
-
/* --- MUTEX LOCKING --- */
@@ -900,11 +904,11 @@
/* The mutex functions stored here are global, and are necessarily the
same for all threads that wish to share access to libltdl. */
-static lt_dlmutex_lock *lt_dlmutex_lock_func = 0;
-static lt_dlmutex_unlock *lt_dlmutex_unlock_func = 0;
-static lt_dlmutex_seterror *lt_dlmutex_seterror_func = 0;
-static lt_dlmutex_geterror *lt_dlmutex_geterror_func = 0;
-static const char *lt_dllast_error = 0;
+static lt_dlmutex_lock *lt_dlmutex_lock_func = 0;
+static lt_dlmutex_unlock *lt_dlmutex_unlock_func = 0;
+static lt_dlmutex_seterror *lt_dlmutex_seterror_func = 0;
+static lt_dlmutex_geterror *lt_dlmutex_geterror_func = 0;
+static const char *lt_dllast_error = 0;
/* Either set or reset the mutex functions. Either all the arguments must
@@ -919,7 +923,7 @@
lt_dlmutex_geterror *geterror;
{
lt_dlmutex_unlock *old_unlock = unlock;
- int errors = 0;
+ int errors = 0;
/* Lock using the old lock() callback, if any. */
LT_DLMUTEX_LOCK ();
@@ -927,8 +931,8 @@
if ((lock && unlock && seterror && geterror)
|| !(lock || unlock || seterror || geterror))
{
- lt_dlmutex_lock_func = lock;
- lt_dlmutex_unlock_func = unlock;
+ lt_dlmutex_lock_func = lock;
+ lt_dlmutex_unlock_func = unlock;
lt_dlmutex_geterror_func = geterror;
}
else
@@ -946,23 +950,23 @@
this function. */
return errors;
}
+
-
/* --- ERROR HANDLING --- */
-static const char **user_error_strings = 0;
-static int errorcount = LT_ERROR_MAX;
+static const char **user_error_strings = 0;
+static int errorcount = LT_ERROR_MAX;
int
lt_dladderror (diagnostic)
const char *diagnostic;
{
- int errindex = 0;
- int result = -1;
- const char **temp = (const char **) 0;
+ int errindex = 0;
+ int result = -1;
+ const char **temp = (const char **) 0;
assert (diagnostic);
@@ -972,9 +976,9 @@
temp = LT_EREALLOC (const char *, user_error_strings, 1 + errindex);
if (temp)
{
- user_error_strings = temp;
- user_error_strings[errindex] = diagnostic;
- result = errorcount++;
+ user_error_strings = temp;
+ user_error_strings[errindex] = diagnostic;
+ result = errorcount++;
}
LT_DLMUTEX_UNLOCK ();
@@ -986,7 +990,7 @@
lt_dlseterror (errindex)
int errindex;
{
- int errors = 0;
+ int errors = 0;
LT_DLMUTEX_LOCK ();
@@ -1042,10 +1046,10 @@
LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
return copy;
}
+
-
/* --- DLOPEN() INTERFACE LOADER --- */
@@ -1096,7 +1100,7 @@
lt_user_data loader_data;
const char *filename;
{
- lt_module module = dlopen (filename, LT_LAZY_OR_NOW);
+ lt_module module = dlopen (filename, LT_LAZY_OR_NOW);
if (!module)
{
@@ -1138,20 +1142,20 @@
return address;
}
-static struct lt_user_dlloader sys_dl =
- {
+static struct lt_user_dlloader sys_dl = {
# ifdef NEED_USCORE
- "_",
+ "_",
# else
- 0,
+ 0,
# endif
- sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0 };
+ sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0
+};
#endif /* HAVE_LIBDL */
+
-
/* --- SHL_LOAD() INTERFACE LOADER --- */
#if HAVE_SHL_LOAD
@@ -1229,9 +1233,9 @@
module = shl_load (filename, LT_BIND_FLAGS, 0L);
if (!module)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
- }
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
+ }
}
return module;
@@ -1263,15 +1267,16 @@
/* sys_shl_open should never return a NULL module handle */
if (module == (lt_module) 0)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
- }
- else if (!shl_findsym((shl_t*) &module, symbol, TYPE_UNDEFINED, &address))
{
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
+ }
+ else
+ if (!shl_findsym ((shl_t *) & module, symbol, TYPE_UNDEFINED, &address))
+ {
if (!address)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
- }
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
+ }
}
return address;
@@ -1282,10 +1287,10 @@
};
#endif /* HAVE_SHL_LOAD */
+
-
/* --- LOADLIBRARY() INTERFACE LOADER --- */
#ifdef __WINDOWS__
@@ -1302,12 +1307,12 @@
lt_user_data loader_data;
const char *filename;
{
- lt_dlhandle cur;
- lt_module module = 0;
- const char *errormsg = 0;
- char *searchname = 0;
- char *ext;
- char self_name_buf[MAX_PATH];
+ lt_dlhandle cur;
+ lt_module module = 0;
+ const char *errormsg = 0;
+ char *searchname = 0;
+ char *ext;
+ char self_name_buf[MAX_PATH];
if (!filename)
{
@@ -1329,10 +1334,10 @@
else
{
/* Append a `.' to stop Windows from adding an
- implicit `.dll' extension. */
- searchname = LT_EMALLOC (char, 2+ LT_STRLEN (filename));
+ implicit `.dll' extension. */
+ searchname = LT_EMALLOC (char, 2 + LT_STRLEN (filename));
if (searchname)
- sprintf (searchname, "%s.", filename);
+ sprintf (searchname, "%s.", filename);
}
if (!searchname)
return 0;
@@ -1341,8 +1346,8 @@
/* Silence dialog from LoadLibrary on some failures.
No way to get the error mode, but to set it,
so set it twice to preserve any previous flags. */
- UINT errormode = SetErrorMode(SEM_FAILCRITICALERRORS);
- SetErrorMode(errormode | SEM_FAILCRITICALERRORS);
+ UINT errormode = SetErrorMode (SEM_FAILCRITICALERRORS);
+ SetErrorMode (errormode | SEM_FAILCRITICALERRORS);
#if defined(__CYGWIN__)
{
@@ -1355,7 +1360,7 @@
#endif
/* Restore the error mode. */
- SetErrorMode(errormode);
+ SetErrorMode (errormode);
}
LT_DLFREE (searchname);
@@ -1373,18 +1378,18 @@
while (cur)
{
if (!cur->module)
- {
- cur = 0;
- break;
- }
+ {
+ cur = 0;
+ break;
+ }
if (cur->module == module)
- {
- break;
- }
+ {
+ break;
+ }
cur = cur->next;
- }
+ }
LT_DLMUTEX_UNLOCK ();
if (cur || !module)
@@ -1401,9 +1406,9 @@
lt_user_data loader_data;
lt_module module;
{
- int errors = 0;
+ int errors = 0;
- if (FreeLibrary(module) == 0)
+ if (FreeLibrary (module) == 0)
{
LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
++errors;
@@ -1418,7 +1423,7 @@
lt_module module;
const char *symbol;
{
- lt_ptr address = GetProcAddress (module, symbol);
+ lt_ptr address = GetProcAddress (module, symbol);
if (!address)
{
@@ -1433,10 +1438,10 @@
};
#endif /* __WINDOWS__ */
+
-
/* --- LOAD_ADD_ON() INTERFACE LOADER --- */
@@ -1462,7 +1467,7 @@
image_info info;
int32 cookie = 0;
if (get_next_image_info (0, &cookie, &info) == B_OK)
- image = load_add_on (info.name);
+ image = load_add_on (info.name);
}
if (image <= 0)
@@ -1513,10 +1518,10 @@
};
#endif /* __BEOS__ */
+
-
/* --- DLD_LINK() INTERFACE LOADER --- */
@@ -1552,7 +1557,7 @@
{
int errors = 0;
- if (dld_unlink_by_file ((char*)(module), 1) != 0)
+ if (dld_unlink_by_file ((char *) (module), 1) != 0)
{
LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
++errors;
@@ -1605,10 +1610,11 @@
# define ENUM_DYLD_BOOL
# undef FALSE
# undef TRUE
- enum DYLD_BOOL {
- FALSE,
- TRUE
- };
+enum DYLD_BOOL
+{
+ FALSE,
+ TRUE
+};
#endif
#ifndef LC_REQ_DYLD
# define LC_REQ_DYLD 0x80000000
@@ -1616,10 +1622,18 @@
#ifndef LC_LOAD_WEAK_DYLIB
# define LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
#endif
-static const struct mach_header * (*ltdl_NSAddImage)(const char *image_name,
unsigned long options) = 0;
-static NSSymbol (*ltdl_NSLookupSymbolInImage)(const struct mach_header
*image,const char *symbolName, unsigned long options) = 0;
-static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage)(const struct
mach_header *image, const char *symbolName) = 0;
-static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic)(NSModule module) = 0;
+static const struct mach_header *(*ltdl_NSAddImage) (const char *image_name,
+ unsigned long options) =
+ 0;
+static NSSymbol (*ltdl_NSLookupSymbolInImage) (const struct mach_header *
+ image, const char *symbolName,
+ unsigned long options) = 0;
+static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage) (const struct
+ mach_header *
+ image,
+ const char
+ *symbolName) = 0;
+static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic) (NSModule module) = 0;
#ifndef NSADDIMAGE_OPTION_NONE
#define NSADDIMAGE_OPTION_NONE 0x0
@@ -1651,144 +1665,170 @@
static const char *
-lt_int_dyld_error(othererror)
- char* othererror;
+lt_int_dyld_error (othererror)
+ char *othererror;
{
/* return the dyld error string, or the passed in error string if none */
- NSLinkEditErrors ler;
- int lerno;
- const char *errstr;
- const char *file;
- NSLinkEditError(&ler,&lerno,&file,&errstr);
- if (!errstr || !strlen(errstr)) errstr = othererror;
- return errstr;
+ NSLinkEditErrors ler;
+ int lerno;
+ const char *errstr;
+ const char *file;
+ NSLinkEditError (&ler, &lerno, &file, &errstr);
+ if (!errstr || !strlen (errstr))
+ errstr = othererror;
+ return errstr;
}
static const struct mach_header *
-lt_int_dyld_get_mach_header_from_nsmodule(module)
- NSModule module;
+lt_int_dyld_get_mach_header_from_nsmodule (module)
+ NSModule module;
{
/* There should probably be an apple dyld api for this */
- int i=_dyld_image_count();
- int j;
- const char *modname=NSNameOfModule(module);
- const struct mach_header *mh=NULL;
- if (!modname) return NULL;
- for (j = 0; j < i; j++)
- {
- if (!strcmp(_dyld_get_image_name(j),modname))
- {
- mh=_dyld_get_image_header(j);
- break;
- }
- }
- return mh;
+ int i = _dyld_image_count ();
+ int j;
+ const char *modname = NSNameOfModule (module);
+ const struct mach_header *mh = NULL;
+ if (!modname)
+ return NULL;
+ for (j = 0; j < i; j++)
+ {
+ if (!strcmp (_dyld_get_image_name (j), modname))
+ {
+ mh = _dyld_get_image_header (j);
+ break;
+ }
+ }
+ return mh;
}
-static const char* lt_int_dyld_lib_install_name(mh)
- const struct mach_header *mh;
+static const char *
+lt_int_dyld_lib_install_name (mh)
+ const struct mach_header *mh;
{
/* NSAddImage is also used to get the loaded image, but it only works if the
lib
is installed, for uninstalled libs we need to check the install_names
against
each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
different lib was loaded as a result
*/
- int j;
- struct load_command *lc;
- unsigned long offset = sizeof(struct mach_header);
- const char* retStr=NULL;
- for (j = 0; j < mh->ncmds; j++)
- {
- lc = (struct load_command*)(((unsigned long)mh) + offset);
- if (LC_ID_DYLIB == lc->cmd)
- {
- retStr=(char*)(((struct
dylib_command*)lc)->dylib.name.offset +
-
(unsigned long)lc);
- }
- offset += lc->cmdsize;
- }
- return retStr;
+ int j;
+ struct load_command *lc;
+ unsigned long offset = sizeof (struct mach_header);
+ const char *retStr = NULL;
+ for (j = 0; j < mh->ncmds; j++)
+ {
+ lc = (struct load_command *) (((unsigned long) mh) + offset);
+ if (LC_ID_DYLIB == lc->cmd)
+ {
+ retStr =
+ (char *) (((struct dylib_command *) lc)->dylib.name.offset +
+ (unsigned long) lc);
+ }
+ offset += lc->cmdsize;
+ }
+ return retStr;
}
static const struct mach_header *
-lt_int_dyld_match_loaded_lib_by_install_name(const char *name)
+lt_int_dyld_match_loaded_lib_by_install_name (const char *name)
{
- int i=_dyld_image_count();
- int j;
- const struct mach_header *mh=NULL;
- const char *id=NULL;
- for (j = 0; j < i; j++)
- {
- id=lt_int_dyld_lib_install_name(_dyld_get_image_header(j));
- if ((id) && (!strcmp(id,name)))
- {
- mh=_dyld_get_image_header(j);
- break;
- }
- }
- return mh;
+ int i = _dyld_image_count ();
+ int j;
+ const struct mach_header *mh = NULL;
+ const char *id = NULL;
+ for (j = 0; j < i; j++)
+ {
+ id = lt_int_dyld_lib_install_name (_dyld_get_image_header (j));
+ if ((id) && (!strcmp (id, name)))
+ {
+ mh = _dyld_get_image_header (j);
+ break;
+ }
+ }
+ return mh;
}
static NSSymbol
-lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh)
- const char *symbol;
- const struct mach_header *mh;
+lt_int_dyld_NSlookupSymbolInLinkedLibs (symbol, mh)
+ const char *symbol;
+ const struct mach_header *mh;
{
- /* Safe to assume our mh is good */
- int j;
- struct load_command *lc;
- unsigned long offset = sizeof(struct mach_header);
- NSSymbol retSym = 0;
- const struct mach_header *mh1;
- if ((ltdl_NSLookupSymbolInImage) && NSIsSymbolNameDefined(symbol) )
- {
- for (j = 0; j < mh->ncmds; j++)
- {
- lc = (struct load_command*)(((unsigned long)mh) +
offset);
- if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB
== lc->cmd))
- {
-
mh1=lt_int_dyld_match_loaded_lib_by_install_name((char*)(((struct
dylib_command*)lc)->dylib.name.offset +
-
(unsigned long)lc));
- if (!mh1)
- {
- /* Maybe NSAddImage can find it */
- mh1=ltdl_NSAddImage((char*)(((struct
dylib_command*)lc)->dylib.name.offset +
-
(unsigned long)lc),
-
NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED +
-
NSADDIMAGE_OPTION_WITH_SEARCHING +
-
NSADDIMAGE_OPTION_RETURN_ON_ERROR );
- }
- if (mh1)
- {
- retSym = ltdl_NSLookupSymbolInImage(mh1,
-
symbol,
-
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-
| NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-
);
- if (retSym) break;
- }
- }
- offset += lc->cmdsize;
- }
- }
- return retSym;
+ /* Safe to assume our mh is good */
+ int j;
+ struct load_command *lc;
+ unsigned long offset = sizeof (struct mach_header);
+ NSSymbol retSym = 0;
+ const struct mach_header *mh1;
+ if ((ltdl_NSLookupSymbolInImage) && NSIsSymbolNameDefined (symbol))
+ {
+ for (j = 0; j < mh->ncmds; j++)
+ {
+ lc = (struct load_command *) (((unsigned long) mh) + offset);
+ if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd))
+ {
+ mh1 =
+ lt_int_dyld_match_loaded_lib_by_install_name ((char
+ *) (((struct
+
dylib_command
+ *) lc)->
+ dylib.name.
+ offset +
+ (unsigned
+ long)
+ lc));
+ if (!mh1)
+ {
+ /* Maybe NSAddImage can find it */
+ mh1 =
+ ltdl_NSAddImage ((char *) (((struct dylib_command *) lc)->
+ dylib.name.offset +
+ (unsigned long) lc),
+ NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED +
+ NSADDIMAGE_OPTION_WITH_SEARCHING +
+ NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+ }
+ if (mh1)
+ {
+ retSym = ltdl_NSLookupSymbolInImage (mh1,
+ symbol,
+
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+ |
+
NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
+ if (retSym)
+ break;
+ }
+ }
+ offset += lc->cmdsize;
+ }
+ }
+ return retSym;
}
static int
-sys_dyld_init()
+sys_dyld_init ()
{
- int retCode = 0;
- int err = 0;
- if (!_dyld_present()) {
- retCode=1;
- }
- else {
- err = _dyld_func_lookup("__dyld_NSAddImage",(unsigned
long*)<dl_NSAddImage);
- err = _dyld_func_lookup("__dyld_NSLookupSymbolInImage",(unsigned
long*)<dl_NSLookupSymbolInImage);
- err = _dyld_func_lookup("__dyld_NSIsSymbolNameDefinedInImage",(unsigned
long*)<dl_NSIsSymbolNameDefinedInImage);
- err = _dyld_func_lookup("__dyld_NSMakePrivateModulePublic",(unsigned
long*)<dl_NSMakePrivateModulePublic);
+ int retCode = 0;
+ int err = 0;
+ if (!_dyld_present ())
+ {
+ retCode = 1;
}
- return retCode;
+ else
+ {
+ err =
+ _dyld_func_lookup ("__dyld_NSAddImage",
+ (unsigned long *) <dl_NSAddImage);
+ err =
+ _dyld_func_lookup ("__dyld_NSLookupSymbolInImage",
+ (unsigned long *) <dl_NSLookupSymbolInImage);
+ err =
+ _dyld_func_lookup ("__dyld_NSIsSymbolNameDefinedInImage",
+ (unsigned long *)
+ <dl_NSIsSymbolNameDefinedInImage);
+ err =
+ _dyld_func_lookup ("__dyld_NSMakePrivateModulePublic",
+ (unsigned long *) <dl_NSMakePrivateModulePublic);
+ }
+ return retCode;
}
static lt_module
@@ -1796,35 +1836,38 @@
lt_user_data loader_data;
const char *filename;
{
- lt_module module = 0;
- NSObjectFileImage ofi = 0;
- NSObjectFileImageReturnCode ofirc;
+ lt_module module = 0;
+ NSObjectFileImage ofi = 0;
+ NSObjectFileImageReturnCode ofirc;
- if (!filename)
- return (lt_module)-1;
- ofirc = NSCreateObjectFileImageFromFile(filename, &ofi);
- switch (ofirc)
- {
- case NSObjectFileImageSuccess:
- module = NSLinkModule(ofi, filename,
-
NSLINKMODULE_OPTION_RETURN_ON_ERROR
- | NSLINKMODULE_OPTION_PRIVATE
- | NSLINKMODULE_OPTION_BINDNOW);
- NSDestroyObjectFileImage(ofi);
- if (module)
- ltdl_NSMakePrivateModulePublic(module);
- break;
- case NSObjectFileImageInappropriateFile:
- if (ltdl_NSIsSymbolNameDefinedInImage &&
ltdl_NSLookupSymbolInImage)
- {
- module = (lt_module)ltdl_NSAddImage(filename,
NSADDIMAGE_OPTION_RETURN_ON_ERROR);
- break;
- }
- default:
- LT_DLMUTEX_SETERROR
(lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
- return 0;
- }
- if (!module) LT_DLMUTEX_SETERROR
(lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
+ if (!filename)
+ return (lt_module) - 1;
+ ofirc = NSCreateObjectFileImageFromFile (filename, &ofi);
+ switch (ofirc)
+ {
+ case NSObjectFileImageSuccess:
+ module = NSLinkModule (ofi, filename,
+ NSLINKMODULE_OPTION_RETURN_ON_ERROR
+ | NSLINKMODULE_OPTION_PRIVATE
+ | NSLINKMODULE_OPTION_BINDNOW);
+ NSDestroyObjectFileImage (ofi);
+ if (module)
+ ltdl_NSMakePrivateModulePublic (module);
+ break;
+ case NSObjectFileImageInappropriateFile:
+ if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
+ {
+ module =
+ (lt_module) ltdl_NSAddImage (filename,
+ NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+ break;
+ }
+ default:
+ LT_DLMUTEX_SETERROR (lt_int_dyld_error (LT_DLSTRERROR (CANNOT_OPEN)));
+ return 0;
+ }
+ if (!module)
+ LT_DLMUTEX_SETERROR (lt_int_dyld_error (LT_DLSTRERROR (CANNOT_OPEN)));
return module;
}
@@ -1833,43 +1876,45 @@
lt_user_data loader_data;
lt_module module;
{
- int retCode = 0;
- int flags = 0;
- if (module == (lt_module)-1) return 0;
+ int retCode = 0;
+ int flags = 0;
+ if (module == (lt_module) - 1)
+ return 0;
#ifdef __BIG_ENDIAN__
- if (((struct mach_header *)module)->magic == MH_MAGIC)
+ if (((struct mach_header *) module)->magic == MH_MAGIC)
#else
- if (((struct mach_header *)module)->magic == MH_CIGAM)
+ if (((struct mach_header *) module)->magic == MH_CIGAM)
#endif
- {
- LT_DLMUTEX_SETERROR("Can not close a dylib");
- retCode = 1;
- }
- else
- {
+ {
+ LT_DLMUTEX_SETERROR ("Can not close a dylib");
+ retCode = 1;
+ }
+ else
+ {
#if 1
/* Currently, if a module contains c++ static destructors and it is unloaded,
we
get a segfault in atexit(), due to compiler and dynamic loader differences
of
opinion, this works around that.
*/
- if ((const struct section *)NULL !=
-
getsectbynamefromheader(lt_int_dyld_get_mach_header_from_nsmodule(module),
- "__DATA","__mod_term_func"))
- {
- flags += NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
- }
+ if ((const struct section *) NULL !=
+ getsectbynamefromheader (lt_int_dyld_get_mach_header_from_nsmodule
+ (module), "__DATA", "__mod_term_func"))
+ {
+ flags += NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
+ }
#endif
#ifdef __ppc__
- flags += NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
+ flags += NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
#endif
- if (!NSUnLinkModule(module,flags))
- {
- retCode=1;
- LT_DLMUTEX_SETERROR
(lt_int_dyld_error(LT_DLSTRERROR(CANNOT_CLOSE)));
- }
- }
+ if (!NSUnLinkModule (module, flags))
+ {
+ retCode = 1;
+ LT_DLMUTEX_SETERROR (lt_int_dyld_error
+ (LT_DLSTRERROR (CANNOT_CLOSE)));
+ }
+ }
- return retCode;
+ return retCode;
}
static lt_ptr
@@ -1878,52 +1923,57 @@
lt_module module;
const char *symbol;
{
- lt_ptr address = 0;
- NSSymbol *nssym = 0;
- void *unused;
- const struct mach_header *mh=NULL;
- char saveError[256] = "Symbol not found";
- if (module == (lt_module)-1)
- {
- _dyld_lookup_and_bind(symbol,(unsigned long*)&address,&unused);
- return address;
- }
+ lt_ptr address = 0;
+ NSSymbol *nssym = 0;
+ void *unused;
+ const struct mach_header *mh = NULL;
+ char saveError[256] = "Symbol not found";
+ if (module == (lt_module) - 1)
+ {
+ _dyld_lookup_and_bind (symbol, (unsigned long *) &address, &unused);
+ return address;
+ }
#ifdef __BIG_ENDIAN__
- if (((struct mach_header *)module)->magic == MH_MAGIC)
+ if (((struct mach_header *) module)->magic == MH_MAGIC)
#else
- if (((struct mach_header *)module)->magic == MH_CIGAM)
+ if (((struct mach_header *) module)->magic == MH_CIGAM)
#endif
- {
- if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
- {
- mh=module;
- if (ltdl_NSIsSymbolNameDefinedInImage((struct
mach_header*)module,symbol))
- {
- nssym = ltdl_NSLookupSymbolInImage((struct
mach_header*)module,
-
symbol,
-
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-
| NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-
);
- }
- }
+ {
+ if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
+ {
+ mh = module;
+ if (ltdl_NSIsSymbolNameDefinedInImage
+ ((struct mach_header *) module, symbol))
+ {
+ nssym =
+ ltdl_NSLookupSymbolInImage ((struct mach_header *) module,
+ symbol,
+
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+ |
+
NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
+ }
+ }
- }
- else {
- nssym = NSLookupSymbolInModule(module, symbol);
- }
- if (!nssym)
- {
- strncpy(saveError,
lt_int_dyld_error(LT_DLSTRERROR(SYMBOL_NOT_FOUND)), 255);
- saveError[255] = 0;
- if (!mh) mh=lt_int_dyld_get_mach_header_from_nsmodule(module);
- nssym = lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh);
- }
- if (!nssym)
- {
- LT_DLMUTEX_SETERROR (saveError);
- return NULL;
- }
- return NSAddressOfSymbol(nssym);
+ }
+ else
+ {
+ nssym = NSLookupSymbolInModule (module, symbol);
+ }
+ if (!nssym)
+ {
+ strncpy (saveError,
+ lt_int_dyld_error (LT_DLSTRERROR (SYMBOL_NOT_FOUND)), 255);
+ saveError[255] = 0;
+ if (!mh)
+ mh = lt_int_dyld_get_mach_header_from_nsmodule (module);
+ nssym = lt_int_dyld_NSlookupSymbolInLinkedLibs (symbol, mh);
+ }
+ if (!nssym)
+ {
+ LT_DLMUTEX_SETERROR (saveError);
+ return NULL;
+ }
+ return NSAddressOfSymbol (nssym);
}
static struct lt_user_dlloader sys_dyld =
@@ -1931,8 +1981,8 @@
#endif /* HAVE_DYLD */
+
-
/* --- DLPREOPEN() INTERFACE LOADER --- */
@@ -1940,12 +1990,12 @@
typedef struct lt_dlsymlists_t
{
- struct lt_dlsymlists_t *next;
- const lt_dlsymlist *syms;
+ struct lt_dlsymlists_t *next;
+ const lt_dlsymlist *syms;
} lt_dlsymlists_t;
-static const lt_dlsymlist *default_preloaded_symbols = 0;
-static lt_dlsymlists_t *preloaded_symbols = 0;
+static const lt_dlsymlist *default_preloaded_symbols = 0;
+static lt_dlsymlists_t *preloaded_symbols = 0;
static int
presym_init (loader_data)
@@ -1976,7 +2026,7 @@
lists = preloaded_symbols;
while (lists)
{
- lt_dlsymlists_t *tmp = lists;
+ lt_dlsymlists_t *tmp = lists;
lists = lists->next;
LT_DLFREE (tmp);
@@ -2002,7 +2052,7 @@
{
lt_dlsymlists_t *tmp;
lt_dlsymlists_t *lists;
- int errors = 0;
+ int errors = 0;
LT_DLMUTEX_LOCK ();
@@ -2010,16 +2060,16 @@
while (lists)
{
if (lists->syms == preloaded)
- {
- goto done;
- }
+ {
+ goto done;
+ }
lists = lists->next;
}
tmp = LT_EMALLOC (lt_dlsymlists_t, 1);
if (tmp)
{
- memset (tmp, 0, sizeof(lt_dlsymlists_t));
+ memset (tmp, 0, sizeof (lt_dlsymlists_t));
tmp->syms = preloaded;
tmp->next = preloaded_symbols;
preloaded_symbols = tmp;
@@ -2029,7 +2079,7 @@
++errors;
}
- done:
+done:
LT_DLMUTEX_UNLOCK ();
return errors;
}
@@ -2040,7 +2090,7 @@
const char *filename;
{
lt_dlsymlists_t *lists;
- lt_module module = (lt_module) 0;
+ lt_module module = (lt_module) 0;
LT_DLMUTEX_LOCK ();
lists = preloaded_symbols;
@@ -2065,21 +2115,21 @@
const lt_dlsymlist *syms = lists->syms;
while (syms->name)
- {
- if (!syms->address && strcmp(syms->name, filename) == 0)
- {
- module = (lt_module) syms;
- goto done;
- }
- ++syms;
- }
+ {
+ if (!syms->address && strcmp (syms->name, filename) == 0)
+ {
+ module = (lt_module) syms;
+ goto done;
+ }
+ ++syms;
+ }
lists = lists->next;
}
LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
- done:
+done:
LT_DLMUTEX_UNLOCK ();
return module;
}
@@ -2100,18 +2150,18 @@
lt_module module;
const char *symbol;
{
- lt_dlsymlist *syms = (lt_dlsymlist*) module;
+ lt_dlsymlist *syms = (lt_dlsymlist *) module;
++syms;
while (syms->address)
{
- if (strcmp(syms->name, symbol) == 0)
- {
- return syms->address;
- }
+ if (strcmp (syms->name, symbol) == 0)
+ {
+ return syms->address;
+ }
- ++syms;
- }
+ ++syms;
+ }
LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
@@ -2121,88 +2171,80 @@
static struct lt_user_dlloader presym = {
0, presym_open, presym_close, presym_sym, presym_exit, 0
};
+
-
/* --- DYNAMIC MODULE LOADING --- */
/* The type of a function used at each iteration of foreach_dirinpath(). */
-typedef int foreach_callback_func LT_PARAMS((char *filename, lt_ptr data1,
- lt_ptr data2));
+typedef int foreach_callback_func LT_PARAMS ((char *filename, lt_ptr data1,
+ lt_ptr data2));
-static int foreach_dirinpath LT_PARAMS((const char *search_path,
- const char *base_name,
- foreach_callback_func *func,
- lt_ptr data1, lt_ptr data2));
+static int foreach_dirinpath LT_PARAMS ((const char *search_path,
+ const char *base_name,
+ foreach_callback_func * func,
+ lt_ptr data1, lt_ptr data2));
-static int find_file_callback LT_PARAMS((char *filename, lt_ptr data,
- lt_ptr ignored));
-static int find_handle_callback LT_PARAMS((char *filename, lt_ptr data,
- lt_ptr ignored));
-static int foreachfile_callback LT_PARAMS((char *filename, lt_ptr data1,
- lt_ptr data2));
+static int find_file_callback LT_PARAMS ((char *filename, lt_ptr data,
+ lt_ptr ignored));
+static int find_handle_callback LT_PARAMS ((char *filename, lt_ptr data,
+ lt_ptr ignored));
+static int foreachfile_callback LT_PARAMS ((char *filename, lt_ptr data1,
+ lt_ptr data2));
-static int canonicalize_path LT_PARAMS((const char *path,
- char **pcanonical));
-static int argzize_path LT_PARAMS((const char *path,
- char **pargz,
- size_t *pargz_len));
-static FILE *find_file LT_PARAMS((const char *search_path,
- const char *base_name,
- char **pdir));
-static lt_dlhandle *find_handle LT_PARAMS((const char *search_path,
- const char *base_name,
- lt_dlhandle *handle));
-static int find_module LT_PARAMS((lt_dlhandle *handle,
- const char *dir,
- const char *libdir,
- const char *dlname,
- const char *old_name,
- int installed));
-static int free_vars LT_PARAMS((char *dlname, char *oldname,
- char *libdir, char *deplibs));
-static int load_deplibs LT_PARAMS((lt_dlhandle handle,
- char *deplibs));
-static int trim LT_PARAMS((char **dest,
- const char *str));
-static int try_dlopen LT_PARAMS((lt_dlhandle *handle,
- const char *filename));
-static int tryall_dlopen LT_PARAMS((lt_dlhandle *handle,
- const char *filename));
-static int unload_deplibs LT_PARAMS((lt_dlhandle handle));
-static int lt_argz_insert LT_PARAMS((char **pargz,
- size_t *pargz_len,
- char *before,
- const char *entry));
-static int lt_argz_insertinorder LT_PARAMS((char **pargz,
- size_t *pargz_len,
- const char *entry));
-static int lt_argz_insertdir LT_PARAMS((char **pargz,
- size_t *pargz_len,
- const char *dirnam,
- struct dirent *dp));
-static int lt_dlpath_insertdir LT_PARAMS((char **ppath,
- char *before,
- const char *dir));
-static int list_files_by_dir LT_PARAMS((const char *dirnam,
- char **pargz,
- size_t *pargz_len));
-static int file_not_found LT_PARAMS((void));
+static int canonicalize_path LT_PARAMS ((const char *path,
+ char **pcanonical));
+static int argzize_path LT_PARAMS ((const char *path,
+ char **pargz, size_t * pargz_len));
+static FILE *find_file LT_PARAMS ((const char *search_path,
+ const char *base_name, char **pdir));
+static lt_dlhandle *find_handle LT_PARAMS ((const char *search_path,
+ const char *base_name,
+ lt_dlhandle * handle));
+static int find_module LT_PARAMS ((lt_dlhandle * handle,
+ const char *dir,
+ const char *libdir,
+ const char *dlname,
+ const char *old_name, int installed));
+static int free_vars LT_PARAMS ((char *dlname, char *oldname,
+ char *libdir, char *deplibs));
+static int load_deplibs LT_PARAMS ((lt_dlhandle handle, char *deplibs));
+static int trim LT_PARAMS ((char **dest, const char *str));
+static int try_dlopen LT_PARAMS ((lt_dlhandle * handle,
+ const char *filename));
+static int tryall_dlopen LT_PARAMS ((lt_dlhandle * handle,
+ const char *filename));
+static int unload_deplibs LT_PARAMS ((lt_dlhandle handle));
+static int lt_argz_insert LT_PARAMS ((char **pargz,
+ size_t * pargz_len,
+ char *before, const char *entry));
+static int lt_argz_insertinorder LT_PARAMS ((char **pargz,
+ size_t * pargz_len,
+ const char *entry));
+static int lt_argz_insertdir LT_PARAMS ((char **pargz,
+ size_t * pargz_len,
+ const char *dirnam,
+ struct dirent * dp));
+static int lt_dlpath_insertdir LT_PARAMS ((char **ppath,
+ char *before, const char *dir));
+static int list_files_by_dir LT_PARAMS ((const char *dirnam,
+ char **pargz, size_t * pargz_len));
+static int file_not_found LT_PARAMS ((void));
-static char *user_search_path= 0;
-static lt_dlloader *loaders = 0;
-static lt_dlhandle handles = 0;
-static int initialized = 0;
+static char *user_search_path = 0;
+static lt_dlloader *loaders = 0;
+static lt_dlhandle handles = 0;
+static int initialized = 0;
/* Initialize libltdl. */
int
lt_dlinit ()
{
- int errors = 0;
+ int errors = 0;
LT_DLMUTEX_LOCK ();
@@ -2210,7 +2252,7 @@
if (++initialized == 1)
{
handles = 0;
- user_search_path = 0; /* empty search path */
+ user_search_path = 0; /* empty search path */
#if HAVE_LIBDL
errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dl, "dlopen");
@@ -2228,21 +2270,21 @@
errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dld, "dld");
#endif
#if HAVE_DYLD
- errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dyld, "dyld");
- errors += sys_dyld_init();
+ errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dyld, "dyld");
+ errors += sys_dyld_init ();
#endif
errors += lt_dlloader_add (lt_dlloader_next (0), &presym, "dlpreload");
if (presym_init (presym.dlloader_data))
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INIT_LOADER));
- ++errors;
- }
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INIT_LOADER));
+ ++errors;
+ }
else if (errors != 0)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (DLOPEN_NOT_SUPPORTED));
- ++errors;
- }
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (DLOPEN_NOT_SUPPORTED));
+ ++errors;
+ }
}
LT_DLMUTEX_UNLOCK ();
@@ -2262,13 +2304,13 @@
}
else
{
- presym_free_symlists();
+ presym_free_symlists ();
LT_DLMUTEX_LOCK ();
if (default_preloaded_symbols)
- {
- errors = lt_dlpreload (default_preloaded_symbols);
- }
+ {
+ errors = lt_dlpreload (default_preloaded_symbols);
+ }
LT_DLMUTEX_UNLOCK ();
}
@@ -2290,7 +2332,7 @@
{
/* shut down libltdl */
lt_dlloader *loader;
- int errors = 0;
+ int errors = 0;
LT_DLMUTEX_LOCK ();
loader = loaders;
@@ -2305,54 +2347,54 @@
/* shut down only at last call. */
if (--initialized == 0)
{
- int level;
+ int level;
while (handles && LT_DLIS_RESIDENT (handles))
- {
- handles = handles->next;
- }
+ {
+ handles = handles->next;
+ }
/* close all modules */
for (level = 1; handles; ++level)
- {
- lt_dlhandle cur = handles;
- int saw_nonresident = 0;
+ {
+ lt_dlhandle cur = handles;
+ int saw_nonresident = 0;
- while (cur)
- {
- lt_dlhandle tmp = cur;
- cur = cur->next;
- if (!LT_DLIS_RESIDENT (tmp))
- saw_nonresident = 1;
- if (!LT_DLIS_RESIDENT (tmp) && tmp->info.ref_count <= level)
- {
- if (lt_dlclose (tmp))
- {
- ++errors;
- }
- }
- }
- /* done if only resident modules are left */
- if (!saw_nonresident)
- break;
- }
+ while (cur)
+ {
+ lt_dlhandle tmp = cur;
+ cur = cur->next;
+ if (!LT_DLIS_RESIDENT (tmp))
+ saw_nonresident = 1;
+ if (!LT_DLIS_RESIDENT (tmp) && tmp->info.ref_count <= level)
+ {
+ if (lt_dlclose (tmp))
+ {
+ ++errors;
+ }
+ }
+ }
+ /* done if only resident modules are left */
+ if (!saw_nonresident)
+ break;
+ }
/* close all loaders */
while (loader)
- {
- lt_dlloader *next = loader->next;
- lt_user_data data = loader->dlloader_data;
- if (loader->dlloader_exit && loader->dlloader_exit (data))
- {
- ++errors;
- }
+ {
+ lt_dlloader *next = loader->next;
+ lt_user_data data = loader->dlloader_data;
+ if (loader->dlloader_exit && loader->dlloader_exit (data))
+ {
+ ++errors;
+ }
- LT_DLMEM_REASSIGN (loader, next);
- }
+ LT_DLMEM_REASSIGN (loader, next);
+ }
loaders = 0;
}
- done:
+done:
LT_DLMUTEX_UNLOCK ();
return errors;
}
@@ -2362,15 +2404,15 @@
lt_dlhandle *handle;
const char *filename;
{
- lt_dlhandle cur;
- lt_dlloader *loader;
- const char *saved_error;
- int errors = 0;
+ lt_dlhandle cur;
+ lt_dlloader *loader;
+ const char *saved_error;
+ int errors = 0;
LT_DLMUTEX_GETERROR (saved_error);
LT_DLMUTEX_LOCK ();
- cur = handles;
+ cur = handles;
loader = loaders;
/* check whether the module was already opened */
@@ -2378,15 +2420,15 @@
{
/* try to dlopen the program itself? */
if (!cur->info.filename && !filename)
- {
- break;
- }
+ {
+ break;
+ }
if (cur->info.filename && filename
- && strcmp (cur->info.filename, filename) == 0)
- {
- break;
- }
+ && strcmp (cur->info.filename, filename) == 0)
+ {
+ break;
+ }
cur = cur->next;
}
@@ -2402,23 +2444,23 @@
if (filename)
{
/* Comment out the check of file permissions using access.
- This call seems to always return -1 with error EACCES.
- */
+ This call seems to always return -1 with error EACCES.
+ */
/* We need to catch missing file errors early so that
- file_not_found() can detect what happened.
- if (access (filename, R_OK) != 0)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
- ++errors;
- goto done;
- } */
+ file_not_found() can detect what happened.
+ if (access (filename, R_OK) != 0)
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
+ ++errors;
+ goto done;
+ } */
cur->info.filename = lt_estrdup (filename);
if (!cur->info.filename)
- {
- ++errors;
- goto done;
- }
+ {
+ ++errors;
+ goto done;
+ }
}
else
{
@@ -2432,9 +2474,9 @@
cur->module = loader->module_open (data, filename);
if (cur->module != 0)
- {
- break;
- }
+ {
+ break;
+ }
loader = loader->next;
}
@@ -2445,10 +2487,10 @@
goto done;
}
- cur->loader = loader;
+ cur->loader = loader;
LT_DLMUTEX_SETERROR (saved_error);
- done:
+done:
LT_DLMUTEX_UNLOCK ();
return errors;
@@ -2461,10 +2503,10 @@
const char *dirname;
const char *dlname;
{
- int error = 0;
- char *filename = 0;
- size_t filename_len = 0;
- size_t dirname_len = LT_STRLEN (dirname);
+ int error = 0;
+ char *filename = 0;
+ size_t filename_len = 0;
+ size_t dirname_len = LT_STRLEN (dirname);
assert (handle);
assert (dirname);
@@ -2476,13 +2518,13 @@
#endif
if (dirname_len > 0)
- if (dirname[dirname_len -1] == '/')
+ if (dirname[dirname_len - 1] == '/')
--dirname_len;
filename_len = dirname_len + 1 + LT_STRLEN (dlname);
/* Allocate memory, and combine DIRNAME and MODULENAME into it.
The PREFIX (if any) is handled below. */
- filename = LT_EMALLOC (char, dirname_len + 1 + filename_len + 1);
+ filename = LT_EMALLOC (char, dirname_len + 1 + filename_len + 1);
if (!filename)
return 1;
@@ -2494,7 +2536,7 @@
if (prefix)
{
error += tryall_dlopen_module (handle,
- (const char *) 0, prefix, filename);
+ (const char *) 0, prefix, filename);
}
else if (tryall_dlopen (handle, filename) != 0)
{
@@ -2527,24 +2569,25 @@
{
/* try to open the installed module */
if (installed && libdir)
- {
- if (tryall_dlopen_module (handle,
- (const char *) 0, libdir, dlname) == 0)
- return 0;
- }
+ {
+ if (tryall_dlopen_module (handle,
+ (const char *) 0, libdir, dlname) == 0)
+ return 0;
+ }
/* try to open the not-installed module */
if (!installed)
- {
- if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
- return 0;
- }
+ {
+ if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
+ return 0;
+ }
/* maybe it was moved to another directory */
{
- if (dir && (tryall_dlopen_module (handle,
- (const char *) 0, dir, dlname) == 0))
- return 0;
+ if (dir && (tryall_dlopen_module (handle,
+ (const char *) 0, dir,
+ dlname) == 0))
+ return 0;
}
}
@@ -2562,7 +2605,7 @@
assert (path && *path);
assert (pcanonical);
- canonical = LT_EMALLOC (char, 1+ LT_STRLEN (path));
+ canonical = LT_EMALLOC (char, 1 + LT_STRLEN (path));
if (!canonical)
return 1;
@@ -2571,38 +2614,38 @@
size_t src;
for (src = 0; path[src] != LT_EOS_CHAR; ++src)
{
- /* Path separators are not copied to the beginning or end of
- the destination, or if another separator would follow
- immediately. */
- if (path[src] == LT_PATHSEP_CHAR)
- {
- if ((dest == 0)
- || (path[1+ src] == LT_PATHSEP_CHAR)
- || (path[1+ src] == LT_EOS_CHAR))
- continue;
- }
+ /* Path separators are not copied to the beginning or end of
+ the destination, or if another separator would follow
+ immediately. */
+ if (path[src] == LT_PATHSEP_CHAR)
+ {
+ if ((dest == 0)
+ || (path[1 + src] == LT_PATHSEP_CHAR)
+ || (path[1 + src] == LT_EOS_CHAR))
+ continue;
+ }
- /* Anything other than a directory separator is copied verbatim. */
- if ((path[src] != '/')
+ /* Anything other than a directory separator is copied verbatim. */
+ if ((path[src] != '/')
#ifdef LT_DIRSEP_CHAR
- && (path[src] != LT_DIRSEP_CHAR)
+ && (path[src] != LT_DIRSEP_CHAR)
#endif
- )
- {
- canonical[dest++] = path[src];
- }
- /* Directory separators are converted and copied only if they are
- not at the end of a path -- i.e. before a path separator or
- NULL terminator. */
- else if ((path[1+ src] != LT_PATHSEP_CHAR)
- && (path[1+ src] != LT_EOS_CHAR)
+ )
+ {
+ canonical[dest++] = path[src];
+ }
+ /* Directory separators are converted and copied only if they are
+ not at the end of a path -- i.e. before a path separator or
+ NULL terminator. */
+ else if ((path[1 + src] != LT_PATHSEP_CHAR)
+ && (path[1 + src] != LT_EOS_CHAR)
#ifdef LT_DIRSEP_CHAR
- && (path[1+ src] != LT_DIRSEP_CHAR)
+ && (path[1 + src] != LT_DIRSEP_CHAR)
#endif
- && (path[1+ src] != '/'))
- {
- canonical[dest++] = '/';
- }
+ && (path[1 + src] != '/'))
+ {
+ canonical[dest++] = '/';
+ }
}
/* Add an end-of-string marker at the end. */
@@ -2630,14 +2673,14 @@
if ((error = argz_create_sep (path, LT_PATHSEP_CHAR, pargz, pargz_len)))
{
switch (error)
- {
- case ENOMEM:
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
- break;
- default:
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
- break;
- }
+ {
+ case ENOMEM:
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
+ break;
+ default:
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
+ break;
+ }
return 1;
}
@@ -2657,13 +2700,13 @@
lt_ptr data1;
lt_ptr data2;
{
- int result = 0;
- int filenamesize = 0;
- size_t lenbase = LT_STRLEN (base_name);
- size_t argz_len = 0;
- char *argz = 0;
- char *filename = 0;
- char *canonical = 0;
+ int result = 0;
+ int filenamesize = 0;
+ size_t lenbase = LT_STRLEN (base_name);
+ size_t argz_len = 0;
+ char *argz = 0;
+ char *filename = 0;
+ char *canonical = 0;
LT_DLMUTEX_LOCK ();
@@ -2683,35 +2726,35 @@
char *dir_name = 0;
while ((dir_name = argz_next (argz, argz_len, dir_name)))
{
- size_t lendir = LT_STRLEN (dir_name);
+ size_t lendir = LT_STRLEN (dir_name);
- if (lendir +1 +lenbase >= filenamesize)
- {
- LT_DLFREE (filename);
- filenamesize = lendir +1 +lenbase +1; /* "/d" + '/' + "f" + '\0' */
- filename = LT_EMALLOC (char, filenamesize);
- if (!filename)
- goto cleanup;
- }
+ if (lendir + 1 + lenbase >= filenamesize)
+ {
+ LT_DLFREE (filename);
+ filenamesize = lendir + 1 + lenbase + 1; /* "/d" + '/' + "f" +
'\0' */
+ filename = LT_EMALLOC (char, filenamesize);
+ if (!filename)
+ goto cleanup;
+ }
- assert (filenamesize > lendir);
- strcpy (filename, dir_name);
+ assert (filenamesize > lendir);
+ strcpy (filename, dir_name);
- if (base_name && *base_name)
- {
- if (filename[lendir -1] != '/')
- filename[lendir++] = '/';
- strcpy (filename +lendir, base_name);
- }
+ if (base_name && *base_name)
+ {
+ if (filename[lendir - 1] != '/')
+ filename[lendir++] = '/';
+ strcpy (filename + lendir, base_name);
+ }
- if ((result = (*func) (filename, data1, data2)))
- {
- break;
- }
+ if ((result = (*func) (filename, data1, data2)))
+ {
+ break;
+ }
}
}
- cleanup:
+cleanup:
LT_DLFREE (argz);
LT_DLFREE (canonical);
LT_DLFREE (filename);
@@ -2730,9 +2773,9 @@
lt_ptr data1;
lt_ptr data2;
{
- char **pdir = (char **) data1;
- FILE **pfile = (FILE **) data2;
- int is_done = 0;
+ char **pdir = (char **) data1;
+ FILE **pfile = (FILE **) data2;
+ int is_done = 0;
assert (filename && *filename);
assert (pdir);
@@ -2743,10 +2786,10 @@
char *dirend = strrchr (filename, '/');
if (dirend > filename)
- *dirend = LT_EOS_CHAR;
+ *dirend = LT_EOS_CHAR;
LT_DLFREE (*pdir);
- *pdir = lt_estrdup (filename);
+ *pdir = lt_estrdup (filename);
is_done = (*pdir == 0) ? -1 : 1;
}
@@ -2772,8 +2815,8 @@
lt_ptr data;
lt_ptr ignored;
{
- lt_dlhandle *handle = (lt_dlhandle *) data;
- int notfound = access (filename, R_OK);
+ lt_dlhandle *handle = (lt_dlhandle *) data;
+ int notfound = access (filename, R_OK);
/* Bail out if file cannot be read... */
if (notfound)
@@ -2799,7 +2842,7 @@
return 0;
if (!foreach_dirinpath (search_path, base_name, find_handle_callback,
- handle, 0))
+ handle, 0))
return 0;
return handle;
@@ -2811,12 +2854,12 @@
char *deplibs;
{
#if LTDL_DLOPEN_DEPLIBS
- char *p, *save_search_path = 0;
- int depcount = 0;
- int i;
- char **names = 0;
+ char *p, *save_search_path = 0;
+ int depcount = 0;
+ int i;
+ char **names = 0;
#endif
- int errors = 0;
+ int errors = 0;
handle->depcount = 0;
@@ -2832,7 +2875,7 @@
{
save_search_path = lt_estrdup (user_search_path);
if (!save_search_path)
- goto cleanup;
+ goto cleanup;
}
/* extract search paths and count deplibs */
@@ -2840,34 +2883,34 @@
while (*p)
{
if (!isspace ((int) *p))
- {
- char *end = p+1;
- while (*end && !isspace((int) *end))
- {
- ++end;
- }
+ {
+ char *end = p + 1;
+ while (*end && !isspace ((int) *end))
+ {
+ ++end;
+ }
- if (strncmp(p, "-L", 2) == 0 || strncmp(p, "-R", 2) == 0)
- {
- char save = *end;
- *end = 0; /* set a temporary string terminator */
- if (lt_dladdsearchdir(p+2))
- {
- goto cleanup;
- }
- *end = save;
- }
- else
- {
- ++depcount;
- }
+ if (strncmp (p, "-L", 2) == 0 || strncmp (p, "-R", 2) == 0)
+ {
+ char save = *end;
+ *end = 0; /* set a temporary string terminator */
+ if (lt_dladdsearchdir (p + 2))
+ {
+ goto cleanup;
+ }
+ *end = save;
+ }
+ else
+ {
+ ++depcount;
+ }
- p = end;
- }
+ p = end;
+ }
else
- {
- ++p;
- }
+ {
+ ++p;
+ }
}
if (!depcount)
@@ -2876,7 +2919,7 @@
goto cleanup;
}
- names = LT_EMALLOC (char *, depcount * sizeof (char*));
+ names = LT_EMALLOC (char *, depcount * sizeof (char *));
if (!names)
goto cleanup;
@@ -2886,40 +2929,40 @@
while (*p)
{
if (isspace ((int) *p))
- {
- ++p;
- }
+ {
+ ++p;
+ }
else
- {
- char *end = p+1;
- while (*end && !isspace ((int) *end))
- {
- ++end;
- }
+ {
+ char *end = p + 1;
+ while (*end && !isspace ((int) *end))
+ {
+ ++end;
+ }
- if (strncmp(p, "-L", 2) != 0 && strncmp(p, "-R", 2) != 0)
- {
- char *name;
- char save = *end;
- *end = 0; /* set a temporary string terminator */
- if (strncmp(p, "-l", 2) == 0)
- {
- size_t name_len = 3+ /* "lib" */ LT_STRLEN (p + 2);
- name = LT_EMALLOC (char, 1+ name_len);
- if (name)
- sprintf (name, "lib%s", p+2);
- }
- else
- name = lt_estrdup(p);
+ if (strncmp (p, "-L", 2) != 0 && strncmp (p, "-R", 2) != 0)
+ {
+ char *name;
+ char save = *end;
+ *end = 0; /* set a temporary string terminator */
+ if (strncmp (p, "-l", 2) == 0)
+ {
+ size_t name_len = 3 + /* "lib" */ LT_STRLEN (p + 2);
+ name = LT_EMALLOC (char, 1 + name_len);
+ if (name)
+ sprintf (name, "lib%s", p + 2);
+ }
+ else
+ name = lt_estrdup (p);
- if (!name)
- goto cleanup_names;
+ if (!name)
+ goto cleanup_names;
- names[depcount++] = name;
- *end = save;
- }
- p = end;
- }
+ names[depcount++] = name;
+ *end = save;
+ }
+ p = end;
+ }
}
/* load the deplibs (in reverse order)
@@ -2929,38 +2972,39 @@
later on if the loaded module cannot resolve all of its symbols. */
if (depcount)
{
- int j = 0;
+ int j = 0;
- handle->deplibs = (lt_dlhandle*) LT_EMALLOC (lt_dlhandle *, depcount);
+ handle->deplibs = (lt_dlhandle *) LT_EMALLOC (lt_dlhandle *, depcount);
if (!handle->deplibs)
- goto cleanup;
+ goto cleanup;
for (i = 0; i < depcount; ++i)
- {
- handle->deplibs[j] = lt_dlopenext(names[depcount-1-i]);
- if (handle->deplibs[j])
- {
- ++j;
- }
- }
+ {
+ handle->deplibs[j] = lt_dlopenext (names[depcount - 1 - i]);
+ if (handle->deplibs[j])
+ {
+ ++j;
+ }
+ }
- handle->depcount = j; /* Number of successfully loaded deplibs */
- errors = 0;
+ handle->depcount = j; /* Number of successfully loaded deplibs */
+ errors = 0;
}
- cleanup_names:
+cleanup_names:
for (i = 0; i < depcount; ++i)
{
LT_DLFREE (names[i]);
}
- cleanup:
+cleanup:
LT_DLFREE (names);
/* restore the old search path */
- if (user_search_path) {
- LT_DLFREE (user_search_path);
- user_search_path = save_search_path;
- }
+ if (user_search_path)
+ {
+ LT_DLFREE (user_search_path);
+ user_search_path = save_search_path;
+ }
LT_DLMUTEX_UNLOCK ();
#endif
@@ -2978,12 +3022,12 @@
if (handle->depcount)
{
for (i = 0; i < handle->depcount; ++i)
- {
- if (!LT_DLIS_RESIDENT (handle->deplibs[i]))
- {
- errors += lt_dlclose (handle->deplibs[i]);
- }
- }
+ {
+ if (!LT_DLIS_RESIDENT (handle->deplibs[i]))
+ {
+ errors += lt_dlclose (handle->deplibs[i]);
+ }
+ }
}
return errors;
@@ -2996,8 +3040,8 @@
{
/* remove the leading and trailing "'" from str
and store the result in dest */
- const char *end = strrchr (str, '\'');
- size_t len = LT_STRLEN (str);
+ const char *end = strrchr (str, '\'');
+ size_t len = LT_STRLEN (str);
char *tmp;
LT_DLFREE (*dest);
@@ -3009,10 +3053,10 @@
{
tmp = LT_EMALLOC (char, end - str);
if (!tmp)
- return 1;
+ return 1;
- strncpy(tmp, &str[1], (end - str) - 1);
- tmp[len-3] = LT_EOS_CHAR;
+ strncpy (tmp, &str[1], (end - str) - 1);
+ tmp[len - 3] = LT_EOS_CHAR;
*dest = tmp;
}
else
@@ -3043,14 +3087,14 @@
lt_dlhandle *phandle;
const char *filename;
{
- const char * ext = 0;
- const char * saved_error = 0;
- char * canonical = 0;
- char * base_name = 0;
- char * dir = 0;
- char * name = 0;
- int errors = 0;
- lt_dlhandle newhandle;
+ const char *ext = 0;
+ const char *saved_error = 0;
+ char *canonical = 0;
+ char *base_name = 0;
+ char *dir = 0;
+ char *name = 0;
+ int errors = 0;
+ lt_dlhandle newhandle;
assert (phandle);
assert (*phandle == 0);
@@ -3062,19 +3106,19 @@
{
*phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
if (*phandle == 0)
- return 1;
+ return 1;
- memset (*phandle, 0, sizeof(struct lt_dlhandle_struct));
- newhandle = *phandle;
+ memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
+ newhandle = *phandle;
/* lt_dlclose()ing yourself is very bad! Disallow it. */
LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
if (tryall_dlopen (&newhandle, 0) != 0)
- {
- LT_DLFREE (*phandle);
- return 1;
- }
+ {
+ LT_DLFREE (*phandle);
+ return 1;
+ }
goto register_handle;
}
@@ -3094,14 +3138,14 @@
base_name = strrchr (canonical, '/');
if (base_name)
{
- size_t dirlen = (1+ base_name) - canonical;
+ size_t dirlen = (1 + base_name) - canonical;
- dir = LT_EMALLOC (char, 1+ dirlen);
+ dir = LT_EMALLOC (char, 1 + dirlen);
if (!dir)
- {
- ++errors;
- goto cleanup;
- }
+ {
+ ++errors;
+ goto cleanup;
+ }
strncpy (dir, canonical, dirlen);
dir[dirlen] = LT_EOS_CHAR;
@@ -3118,41 +3162,41 @@
if (ext && strcmp (ext, archive_ext) == 0)
{
/* this seems to be a libtool module */
- FILE * file = 0;
- char * dlname = 0;
- char * old_name = 0;
- char * libdir = 0;
- char * deplibs = 0;
- char * line = 0;
- size_t line_len;
+ FILE *file = 0;
+ char *dlname = 0;
+ char *old_name = 0;
+ char *libdir = 0;
+ char *deplibs = 0;
+ char *line = 0;
+ size_t line_len;
/* if we can't find the installed flag, it is probably an
- installed libtool archive, produced with an old version
- of libtool */
- int installed = 1;
+ installed libtool archive, produced with an old version
+ of libtool */
+ int installed = 1;
/* extract the module name from the file name */
name = LT_EMALLOC (char, ext - base_name + 1);
if (!name)
- {
- ++errors;
- goto cleanup;
- }
+ {
+ ++errors;
+ goto cleanup;
+ }
/* canonicalize the module name */
{
size_t i;
for (i = 0; i < ext - base_name; ++i)
- {
- if (isalnum ((int)(base_name[i])))
- {
- name[i] = base_name[i];
- }
- else
- {
- name[i] = '_';
- }
- }
+ {
+ if (isalnum ((int) (base_name[i])))
+ {
+ name[i] = base_name[i];
+ }
+ else
+ {
+ name[i] = '_';
+ }
+ }
name[ext - base_name] = LT_EOS_CHAR;
}
@@ -3161,146 +3205,145 @@
prescribed paths. Otherwise (or in any case if the module was not
yet found) try opening just the module name as passed. */
if (!dir)
- {
- const char *search_path;
+ {
+ const char *search_path;
- LT_DLMUTEX_LOCK ();
- search_path = user_search_path;
- if (search_path)
- file = find_file (user_search_path, base_name, &dir);
- LT_DLMUTEX_UNLOCK ();
+ LT_DLMUTEX_LOCK ();
+ search_path = user_search_path;
+ if (search_path)
+ file = find_file (user_search_path, base_name, &dir);
+ LT_DLMUTEX_UNLOCK ();
- if (!file)
- {
- search_path = getenv (LTDL_SEARCHPATH_VAR);
- if (search_path)
- file = find_file (search_path, base_name, &dir);
- }
+ if (!file)
+ {
+ search_path = getenv (LTDL_SEARCHPATH_VAR);
+ if (search_path)
+ file = find_file (search_path, base_name, &dir);
+ }
#ifdef LTDL_SHLIBPATH_VAR
- if (!file)
- {
- search_path = getenv (LTDL_SHLIBPATH_VAR);
- if (search_path)
- file = find_file (search_path, base_name, &dir);
- }
+ if (!file)
+ {
+ search_path = getenv (LTDL_SHLIBPATH_VAR);
+ if (search_path)
+ file = find_file (search_path, base_name, &dir);
+ }
#endif
#ifdef LTDL_SYSSEARCHPATH
- if (!file && sys_search_path)
- {
- file = find_file (sys_search_path, base_name, &dir);
- }
+ if (!file && sys_search_path)
+ {
+ file = find_file (sys_search_path, base_name, &dir);
+ }
#endif
- }
+ }
if (!file)
- {
- file = fopen (filename, LT_READTEXT_MODE);
- }
+ {
+ file = fopen (filename, LT_READTEXT_MODE);
+ }
/* If we didn't find the file by now, it really isn't there. Set
- the status flag, and bail out. */
+ the status flag, and bail out. */
if (!file)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
- ++errors;
- goto cleanup;
- }
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
+ ++errors;
+ goto cleanup;
+ }
line_len = LT_FILENAME_MAX;
line = LT_EMALLOC (char, line_len);
if (!line)
- {
- fclose (file);
- ++errors;
- goto cleanup;
- }
+ {
+ fclose (file);
+ ++errors;
+ goto cleanup;
+ }
/* read the .la file */
while (!feof (file))
- {
- if (!fgets (line, (int) line_len, file))
- {
- break;
- }
+ {
+ if (!fgets (line, (int) line_len, file))
+ {
+ break;
+ }
- /* Handle the case where we occasionally need to read a line
- that is longer than the initial buffer size. */
- while ((line[LT_STRLEN(line) -1] != '\n') && (!feof (file)))
- {
- line = LT_DLREALLOC (char, line, line_len *2);
- if (!fgets (&line[line_len -1], (int) line_len +1, file))
- {
- break;
- }
- line_len *= 2;
- }
+ /* Handle the case where we occasionally need to read a line
+ that is longer than the initial buffer size. */
+ while ((line[LT_STRLEN (line) - 1] != '\n') && (!feof (file)))
+ {
+ line = LT_DLREALLOC (char, line, line_len * 2);
+ if (!fgets (&line[line_len - 1], (int) line_len + 1, file))
+ {
+ break;
+ }
+ line_len *= 2;
+ }
- if (line[0] == '\n' || line[0] == '#')
- {
- continue;
- }
+ if (line[0] == '\n' || line[0] == '#')
+ {
+ continue;
+ }
#undef STR_DLNAME
#define STR_DLNAME "dlname="
- if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0)
- {
- errors += trim (&dlname, &line[sizeof (STR_DLNAME) - 1]);
- }
+ if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0)
+ {
+ errors += trim (&dlname, &line[sizeof (STR_DLNAME) - 1]);
+ }
#undef STR_OLD_LIBRARY
#define STR_OLD_LIBRARY "old_library="
- else if (strncmp (line, STR_OLD_LIBRARY,
- sizeof (STR_OLD_LIBRARY) - 1) == 0)
- {
- errors += trim (&old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
- }
+ else if (strncmp (line, STR_OLD_LIBRARY,
+ sizeof (STR_OLD_LIBRARY) - 1) == 0)
+ {
+ errors += trim (&old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
+ }
#undef STR_LIBDIR
#define STR_LIBDIR "libdir="
- else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
- {
- errors += trim (&libdir, &line[sizeof(STR_LIBDIR) - 1]);
- }
+ else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
+ {
+ errors += trim (&libdir, &line[sizeof (STR_LIBDIR) - 1]);
+ }
#undef STR_DL_DEPLIBS
#define STR_DL_DEPLIBS "dependency_libs="
- else if (strncmp (line, STR_DL_DEPLIBS,
- sizeof (STR_DL_DEPLIBS) - 1) == 0)
- {
- errors += trim (&deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]);
- }
- else if (strcmp (line, "installed=yes\n") == 0)
- {
- installed = 1;
- }
- else if (strcmp (line, "installed=no\n") == 0)
- {
- installed = 0;
- }
+ else if (strncmp (line, STR_DL_DEPLIBS,
+ sizeof (STR_DL_DEPLIBS) - 1) == 0)
+ {
+ errors += trim (&deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]);
+ }
+ else if (strcmp (line, "installed=yes\n") == 0)
+ {
+ installed = 1;
+ }
+ else if (strcmp (line, "installed=no\n") == 0)
+ {
+ installed = 0;
+ }
#undef STR_LIBRARY_NAMES
#define STR_LIBRARY_NAMES "library_names="
- else if (! dlname && strncmp (line, STR_LIBRARY_NAMES,
- sizeof (STR_LIBRARY_NAMES) - 1) == 0)
- {
- char *last_libname;
- errors += trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]);
- if (!errors
- && dlname
- && (last_libname = strrchr (dlname, ' ')) != 0)
- {
- last_libname = lt_estrdup (last_libname + 1);
- if (!last_libname)
- {
- ++errors;
- goto cleanup;
- }
- LT_DLMEM_REASSIGN (dlname, last_libname);
- }
- }
+ else if (!dlname && strncmp (line, STR_LIBRARY_NAMES,
+ sizeof (STR_LIBRARY_NAMES) - 1) == 0)
+ {
+ char *last_libname;
+ errors += trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]);
+ if (!errors
+ && dlname && (last_libname = strrchr (dlname, ' ')) != 0)
+ {
+ last_libname = lt_estrdup (last_libname + 1);
+ if (!last_libname)
+ {
+ ++errors;
+ goto cleanup;
+ }
+ LT_DLMEM_REASSIGN (dlname, last_libname);
+ }
+ }
- if (errors)
- break;
- }
+ if (errors)
+ break;
+ }
fclose (file);
LT_DLFREE (line);
@@ -3308,105 +3351,106 @@
/* allocate the handle */
*phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
if (*phandle == 0)
- ++errors;
+ ++errors;
if (errors)
- {
- free_vars (dlname, old_name, libdir, deplibs);
- LT_DLFREE (*phandle);
- goto cleanup;
- }
+ {
+ free_vars (dlname, old_name, libdir, deplibs);
+ LT_DLFREE (*phandle);
+ goto cleanup;
+ }
assert (*phandle);
- memset (*phandle, 0, sizeof(struct lt_dlhandle_struct));
+ memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
if (load_deplibs (*phandle, deplibs) == 0)
- {
- newhandle = *phandle;
- /* find_module may replace newhandle */
- if (find_module (&newhandle, dir, libdir, dlname, old_name,
installed))
- {
- unload_deplibs (*phandle);
- ++errors;
- }
- }
+ {
+ newhandle = *phandle;
+ /* find_module may replace newhandle */
+ if (find_module
+ (&newhandle, dir, libdir, dlname, old_name, installed))
+ {
+ unload_deplibs (*phandle);
+ ++errors;
+ }
+ }
else
- {
- ++errors;
- }
+ {
+ ++errors;
+ }
free_vars (dlname, old_name, libdir, deplibs);
if (errors)
- {
- LT_DLFREE (*phandle);
- goto cleanup;
- }
+ {
+ LT_DLFREE (*phandle);
+ goto cleanup;
+ }
if (*phandle != newhandle)
- {
- unload_deplibs (*phandle);
- }
+ {
+ unload_deplibs (*phandle);
+ }
}
else
{
/* not a libtool module */
*phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
if (*phandle == 0)
- {
- ++errors;
- goto cleanup;
- }
+ {
+ ++errors;
+ goto cleanup;
+ }
memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
newhandle = *phandle;
/* If the module has no directory name component, try to find it
- first in user_search_path and then other prescribed paths.
- Otherwise (or in any case if the module was not yet found) try
- opening just the module name as passed. */
+ first in user_search_path and then other prescribed paths.
+ Otherwise (or in any case if the module was not yet found) try
+ opening just the module name as passed. */
if ((dir || (!find_handle (user_search_path, base_name, &newhandle)
- && !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name,
- &newhandle)
+ && !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name,
+ &newhandle)
#ifdef LTDL_SHLIBPATH_VAR
- && !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name,
- &newhandle)
+ && !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name,
+ &newhandle)
#endif
#ifdef LTDL_SYSSEARCHPATH
- && !find_handle (sys_search_path, base_name, &newhandle)
+ && !find_handle (sys_search_path, base_name, &newhandle)
#endif
- )))
- {
+ )))
+ {
if (tryall_dlopen (&newhandle, filename) != 0)
{
newhandle = NULL;
}
- }
+ }
if (!newhandle)
- {
- LT_DLFREE (*phandle);
- ++errors;
- goto cleanup;
- }
+ {
+ LT_DLFREE (*phandle);
+ ++errors;
+ goto cleanup;
+ }
}
- register_handle:
+register_handle:
LT_DLMEM_REASSIGN (*phandle, newhandle);
if ((*phandle)->info.ref_count == 0)
{
- (*phandle)->info.ref_count = 1;
+ (*phandle)->info.ref_count = 1;
LT_DLMEM_REASSIGN ((*phandle)->info.name, name);
LT_DLMUTEX_LOCK ();
- (*phandle)->next = handles;
- handles = *phandle;
+ (*phandle)->next = handles;
+ handles = *phandle;
LT_DLMUTEX_UNLOCK ();
}
LT_DLMUTEX_SETERROR (saved_error);
- cleanup:
+cleanup:
LT_DLFREE (dir);
LT_DLFREE (name);
LT_DLFREE (canonical);
@@ -3450,11 +3494,11 @@
lt_dlopenext (filename)
const char *filename;
{
- lt_dlhandle handle = 0;
- char * tmp = 0;
- char * ext = 0;
- size_t len;
- int errors = 0;
+ lt_dlhandle handle = 0;
+ char *tmp = 0;
+ char *ext = 0;
+ size_t len;
+ int errors = 0;
if (!filename)
{
@@ -3470,7 +3514,7 @@
to try appending additional extensions. */
if (ext && ((strcmp (ext, archive_ext) == 0)
#ifdef LTDL_SHLIB_EXT
- || (strcmp (ext, shlib_ext) == 0)
+ || (strcmp (ext, shlib_ext) == 0)
#endif
))
{
@@ -3504,7 +3548,7 @@
LT_DLFREE (tmp);
tmp = LT_EMALLOC (char, len + LT_STRLEN (shlib_ext) + 1);
if (!tmp)
- return 0;
+ return 0;
strcpy (tmp, filename);
}
@@ -3513,7 +3557,7 @@
tmp[len] = LT_EOS_CHAR;
}
- strcat(tmp, shlib_ext);
+ strcat (tmp, shlib_ext);
errors = try_dlopen (&handle, tmp);
/* As before, if the file was found but loading failed, return now
@@ -3552,14 +3596,14 @@
if (error)
{
switch (error)
- {
- case ENOMEM:
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
- break;
- default:
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
- break;
- }
+ {
+ case ENOMEM:
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
+ break;
+ default:
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
+ break;
+ }
return 1;
}
@@ -3581,10 +3625,12 @@
if (*pargz)
while ((before = argz_next (*pargz, *pargz_len, before)))
{
- int cmp = strcmp (entry, before);
+ int cmp = strcmp (entry, before);
- if (cmp < 0) break;
- if (cmp == 0) return 0; /* No duplicates! */
+ if (cmp < 0)
+ break;
+ if (cmp == 0)
+ return 0; /* No duplicates! */
}
return lt_argz_insert (pargz, pargz_len, before, entry);
@@ -3597,26 +3643,26 @@
const char *dirnam;
struct dirent *dp;
{
- char *buf = 0;
- size_t buf_len = 0;
- char *end = 0;
+ char *buf = 0;
+ size_t buf_len = 0;
+ char *end = 0;
size_t end_offset = 0;
- size_t dir_len = 0;
- int errors = 0;
+ size_t dir_len = 0;
+ int errors = 0;
assert (pargz);
assert (pargz_len);
assert (dp);
dir_len = LT_STRLEN (dirnam);
- end = dp->d_name + LT_D_NAMLEN(dp);
+ end = dp->d_name + LT_D_NAMLEN (dp);
/* Ignore version numbers. */
{
char *p;
- for (p = end; p -1 > dp->d_name; --p)
+ for (p = end; p - 1 > dp->d_name; --p)
if (strchr (".0123456789", p[-1]) == 0)
- break;
+ break;
if (*p == '.')
end = p;
@@ -3625,25 +3671,25 @@
/* Ignore filename extension. */
{
char *p;
- for (p = end -1; p > dp->d_name; --p)
+ for (p = end - 1; p > dp->d_name; --p)
if (*p == '.')
- {
- end = p;
- break;
- }
+ {
+ end = p;
+ break;
+ }
}
/* Prepend the directory name. */
- end_offset = end - dp->d_name;
- buf_len = dir_len + 1+ end_offset;
- buf = LT_EMALLOC (char, 1+ buf_len);
+ end_offset = end - dp->d_name;
+ buf_len = dir_len + 1 + end_offset;
+ buf = LT_EMALLOC (char, 1 + buf_len);
if (!buf)
return ++errors;
assert (buf);
- strcpy (buf, dirnam);
- strcat (buf, "/");
+ strcpy (buf, dirnam);
+ strcat (buf, "/");
strncat (buf, dp->d_name, end_offset);
buf[buf_len] = LT_EOS_CHAR;
@@ -3662,26 +3708,26 @@
char **pargz;
size_t *pargz_len;
{
- DIR *dirp = 0;
- int errors = 0;
+ DIR *dirp = 0;
+ int errors = 0;
assert (dirnam && *dirnam);
assert (pargz);
assert (pargz_len);
- assert (dirnam[LT_STRLEN(dirnam) -1] != '/');
+ assert (dirnam[LT_STRLEN (dirnam) - 1] != '/');
dirp = opendir (dirnam);
if (dirp)
{
- struct dirent *dp = 0;
+ struct dirent *dp = 0;
while ((dp = readdir (dirp)))
- if (dp->d_name[0] != '.')
- if (lt_argz_insertdir (pargz, pargz_len, dirnam, dp))
- {
- ++errors;
- break;
- }
+ if (dp->d_name[0] != '.')
+ if (lt_argz_insertdir (pargz, pargz_len, dirnam, dp))
+ {
+ ++errors;
+ break;
+ }
closedir (dirp);
}
@@ -3700,12 +3746,12 @@
lt_ptr data1;
lt_ptr data2;
{
- int (*func) LT_PARAMS((const char *filename, lt_ptr data))
- = (int (*) LT_PARAMS((const char *filename, lt_ptr data))) data1;
+ int (*func) LT_PARAMS ((const char *filename, lt_ptr data))
+ = (int (*)LT_PARAMS ((const char *filename, lt_ptr data))) data1;
- int is_done = 0;
- char *argz = 0;
- size_t argz_len = 0;
+ int is_done = 0;
+ char *argz = 0;
+ size_t argz_len = 0;
if (list_files_by_dir (dirname, &argz, &argz_len) != 0)
goto cleanup;
@@ -3716,10 +3762,10 @@
char *filename = 0;
while ((filename = argz_next (argz, argz_len, filename)))
if ((is_done = (*func) (filename, data2)))
- break;
+ break;
}
- cleanup:
+cleanup:
LT_DLFREE (argz);
return is_done;
@@ -3743,34 +3789,34 @@
if (search_path)
{
/* If a specific path was passed, search only the directories
- listed in it. */
+ listed in it. */
is_done = foreach_dirinpath (search_path, 0,
- foreachfile_callback, func, data);
+ foreachfile_callback, func, data);
}
else
{
/* Otherwise search the default paths. */
is_done = foreach_dirinpath (user_search_path, 0,
- foreachfile_callback, func, data);
+ foreachfile_callback, func, data);
if (!is_done)
- {
- is_done = foreach_dirinpath (getenv("LTDL_LIBRARY_PATH"), 0,
- foreachfile_callback, func, data);
- }
+ {
+ is_done = foreach_dirinpath (getenv ("LTDL_LIBRARY_PATH"), 0,
+ foreachfile_callback, func, data);
+ }
#ifdef LTDL_SHLIBPATH_VAR
if (!is_done)
- {
- is_done = foreach_dirinpath (getenv(LTDL_SHLIBPATH_VAR), 0,
- foreachfile_callback, func, data);
- }
+ {
+ is_done = foreach_dirinpath (getenv (LTDL_SHLIBPATH_VAR), 0,
+ foreachfile_callback, func, data);
+ }
#endif
#ifdef LTDL_SYSSEARCHPATH
if (!is_done)
- {
- is_done = foreach_dirinpath (getenv(LTDL_SYSSEARCHPATH), 0,
- foreachfile_callback, func, data);
- }
+ {
+ is_done = foreach_dirinpath (getenv (LTDL_SYSSEARCHPATH), 0,
+ foreachfile_callback, func, data);
+ }
#endif
}
@@ -3812,16 +3858,16 @@
lt_user_data data = handle->loader->dlloader_data;
if (handle != handles)
- {
- last->next = handle->next;
- }
+ {
+ last->next = handle->next;
+ }
else
- {
- handles = handle->next;
- }
+ {
+ handles = handle->next;
+ }
errors += handle->loader->module_close (data, handle->module);
- errors += unload_deplibs(handle);
+ errors += unload_deplibs (handle);
/* It is up to the callers to free the data itself. */
LT_DLFREE (handle->caller_data);
@@ -3839,7 +3885,7 @@
++errors;
}
- done:
+done:
LT_DLMUTEX_UNLOCK ();
return errors;
@@ -3851,8 +3897,8 @@
const char *symbol;
{
size_t lensym;
- char lsym[LT_SYMBOL_LENGTH];
- char *sym;
+ char lsym[LT_SYMBOL_LENGTH];
+ char *sym;
lt_ptr address;
lt_user_data data;
@@ -3869,7 +3915,7 @@
}
lensym = LT_STRLEN (symbol) + LT_STRLEN (handle->loader->sym_prefix)
- + LT_STRLEN (handle->info.name);
+ + LT_STRLEN (handle->info.name);
if (lensym + LT_SYMBOL_OVERHEAD < LT_SYMBOL_LENGTH)
{
@@ -3879,10 +3925,10 @@
{
sym = LT_EMALLOC (char, lensym + LT_SYMBOL_OVERHEAD + 1);
if (!sym)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (BUFFER_OVERFLOW));
- return 0;
- }
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (BUFFER_OVERFLOW));
+ return 0;
+ }
}
data = handle->loader->dlloader_data;
@@ -3894,40 +3940,40 @@
/* this is a libtool module */
if (handle->loader->sym_prefix)
- {
- strcpy(sym, handle->loader->sym_prefix);
- strcat(sym, handle->info.name);
- }
+ {
+ strcpy (sym, handle->loader->sym_prefix);
+ strcat (sym, handle->info.name);
+ }
else
- {
- strcpy(sym, handle->info.name);
- }
+ {
+ strcpy (sym, handle->info.name);
+ }
- strcat(sym, "_LTX_");
- strcat(sym, symbol);
+ strcat (sym, "_LTX_");
+ strcat (sym, symbol);
/* try "modulename_LTX_symbol" */
address = handle->loader->find_sym (data, handle->module, sym);
if (address)
- {
- if (sym != lsym)
- {
- LT_DLFREE (sym);
- }
- return address;
- }
+ {
+ if (sym != lsym)
+ {
+ LT_DLFREE (sym);
+ }
+ return address;
+ }
LT_DLMUTEX_SETERROR (saved_error);
}
/* otherwise try "symbol" */
if (handle->loader->sym_prefix)
{
- strcpy(sym, handle->loader->sym_prefix);
- strcat(sym, symbol);
+ strcpy (sym, handle->loader->sym_prefix);
+ strcat (sym, symbol);
}
else
{
- strcpy(sym, symbol);
+ strcpy (sym, symbol);
}
address = handle->loader->find_sym (data, handle->module, sym);
@@ -3956,10 +4002,10 @@
char *before;
const char *dir;
{
- int errors = 0;
- char *canonical = 0;
- char *argz = 0;
- size_t argz_len = 0;
+ int errors = 0;
+ char *canonical = 0;
+ char *argz = 0;
+ size_t argz_len = 0;
assert (ppath);
assert (dir && *dir);
@@ -3975,12 +4021,12 @@
/* If *PPATH is empty, set it to DIR. */
if (*ppath == 0)
{
- assert (!before); /* BEFORE cannot be set without PPATH.
*/
- assert (dir); /* Without DIR, don't call this function! */
+ assert (!before); /* BEFORE cannot be set without PPATH. */
+ assert (dir); /* Without DIR, don't call this function! */
*ppath = lt_estrdup (dir);
if (*ppath == 0)
- ++errors;
+ ++errors;
return errors;
}
@@ -4013,9 +4059,9 @@
}
argz_stringify (argz, argz_len, LT_PATHSEP_CHAR);
- LT_DLMEM_REASSIGN (*ppath, argz);
+ LT_DLMEM_REASSIGN (*ppath, argz);
- cleanup:
+cleanup:
LT_DLFREE (canonical);
LT_DLFREE (argz);
@@ -4032,7 +4078,7 @@
{
LT_DLMUTEX_LOCK ();
if (lt_dlpath_insertdir (&user_search_path, 0, search_dir) != 0)
- ++errors;
+ ++errors;
LT_DLMUTEX_UNLOCK ();
}
@@ -4050,12 +4096,12 @@
{
LT_DLMUTEX_LOCK ();
if ((before < user_search_path)
- || (before >= user_search_path + LT_STRLEN (user_search_path)))
- {
- LT_DLMUTEX_UNLOCK ();
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_POSITION));
- return 1;
- }
+ || (before >= user_search_path + LT_STRLEN (user_search_path)))
+ {
+ LT_DLMUTEX_UNLOCK ();
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_POSITION));
+ return 1;
+ }
LT_DLMUTEX_UNLOCK ();
}
@@ -4063,10 +4109,10 @@
{
LT_DLMUTEX_LOCK ();
if (lt_dlpath_insertdir (&user_search_path,
- (char *) before, search_dir) != 0)
- {
- ++errors;
- }
+ (char *) before, search_dir) != 0)
+ {
+ ++errors;
+ }
LT_DLMUTEX_UNLOCK ();
}
@@ -4077,7 +4123,7 @@
lt_dlsetsearchpath (search_path)
const char *search_path;
{
- int errors = 0;
+ int errors = 0;
LT_DLMUTEX_LOCK ();
LT_DLFREE (user_search_path);
@@ -4128,7 +4174,7 @@
}
int
-lt_dlisresident (handle)
+lt_dlisresident (handle)
lt_dlhandle handle;
{
if (!handle)
@@ -4139,10 +4185,10 @@
return LT_DLIS_RESIDENT (handle);
}
+
-
/* --- MODULE INFORMATION --- */
const lt_dlinfo *
@@ -4167,7 +4213,7 @@
int
lt_dlforeach (func, data)
- int (*func) LT_PARAMS((lt_dlhandle handle, lt_ptr data));
+ int (*func) LT_PARAMS ((lt_dlhandle handle, lt_ptr data));
lt_ptr data;
{
int errors = 0;
@@ -4182,10 +4228,10 @@
cur = cur->next;
if ((*func) (tmp, data))
- {
- ++errors;
- break;
- }
+ {
+ ++errors;
+ break;
+ }
}
LT_DLMUTEX_UNLOCK ();
@@ -4227,10 +4273,10 @@
for (i = 0; i < n_elements; ++i)
{
if (handle->caller_data[i].key == key)
- {
- stale = handle->caller_data[i].data;
- break;
- }
+ {
+ stale = handle->caller_data[i].data;
+ break;
+ }
}
/* Ensure that there is enough room in this handle's caller_data
@@ -4238,31 +4284,31 @@
if (i == n_elements)
{
lt_caller_data *temp
- = LT_DLREALLOC (lt_caller_data, handle->caller_data, 2+ n_elements);
+ = LT_DLREALLOC (lt_caller_data, handle->caller_data, 2 + n_elements);
if (!temp)
- {
- stale = 0;
- goto done;
- }
+ {
+ stale = 0;
+ goto done;
+ }
handle->caller_data = temp;
/* We only need this if we needed to allocate a new caller_data. */
- handle->caller_data[i].key = key;
- handle->caller_data[1+ i].key = 0;
+ handle->caller_data[i].key = key;
+ handle->caller_data[1 + i].key = 0;
}
handle->caller_data[i].data = data;
- done:
+done:
LT_DLMUTEX_UNLOCK ();
return stale;
}
lt_ptr
-lt_dlcaller_get_data (key, handle)
+lt_dlcaller_get_data (key, handle)
lt_dlcaller_id key;
lt_dlhandle handle;
{
@@ -4277,11 +4323,11 @@
int i;
for (i = 0; handle->caller_data[i].key; ++i)
{
- if (handle->caller_data[i].key == key)
- {
- result = handle->caller_data[i].data;
- break;
- }
+ if (handle->caller_data[i].key == key)
+ {
+ result = handle->caller_data[i].data;
+ break;
+ }
}
}
@@ -4289,9 +4335,9 @@
return result;
}
+
-
/* --- USER MODULE LOADER API --- */
@@ -4304,10 +4350,9 @@
int errors = 0;
lt_dlloader *node = 0, *ptr = 0;
- if ((dlloader == 0) /* diagnose null parameters */
+ if ((dlloader == 0) /* diagnose null parameters */
|| (dlloader->module_open == 0)
- || (dlloader->module_close == 0)
- || (dlloader->find_sym == 0))
+ || (dlloader->module_close == 0) || (dlloader->find_sym == 0))
{
LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
return 1;
@@ -4318,14 +4363,14 @@
if (!node)
return 1;
- node->next = 0;
- node->loader_name = loader_name;
- node->sym_prefix = dlloader->sym_prefix;
- node->dlloader_exit = dlloader->dlloader_exit;
- node->module_open = dlloader->module_open;
- node->module_close = dlloader->module_close;
- node->find_sym = dlloader->find_sym;
- node->dlloader_data = dlloader->dlloader_data;
+ node->next = 0;
+ node->loader_name = loader_name;
+ node->sym_prefix = dlloader->sym_prefix;
+ node->dlloader_exit = dlloader->dlloader_exit;
+ node->module_open = dlloader->module_open;
+ node->module_close = dlloader->module_close;
+ node->find_sym = dlloader->find_sym;
+ node->dlloader_data = dlloader->dlloader_data;
LT_DLMUTEX_LOCK ();
if (!loaders)
@@ -4336,11 +4381,11 @@
else if (!place)
{
/* If PLACE is not set, add NODE to the end of the
- LOADERS list. */
+ LOADERS list. */
for (ptr = loaders; ptr->next; ptr = ptr->next)
- {
- /*NOWORK*/;
- }
+ {
+ /*NOWORK*/;
+ }
ptr->next = node;
}
@@ -4354,21 +4399,21 @@
{
/* Find the node immediately preceding PLACE. */
for (ptr = loaders; ptr->next != place; ptr = ptr->next)
- {
- /*NOWORK*/;
- }
+ {
+ /*NOWORK*/;
+ }
if (ptr->next != place)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
- ++errors;
- }
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
+ ++errors;
+ }
else
- {
- /* Insert NODE between PTR and PLACE. */
- node->next = place;
- ptr->next = node;
- }
+ {
+ /* Insert NODE between PTR and PLACE. */
+ node->next = place;
+ ptr->next = node;
+ }
}
LT_DLMUTEX_UNLOCK ();
@@ -4393,14 +4438,14 @@
LT_DLMUTEX_LOCK ();
/* Fail if there are any open modules which use this loader. */
- for (handle = handles; handle; handle = handle->next)
+ for (handle = handles; handle; handle = handle->next)
{
if (handle->loader == place)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER));
- ++errors;
- goto done;
- }
+ {
+ LT_DLMUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER));
+ ++errors;
+ goto done;
+ }
}
if (place == loaders)
@@ -4413,12 +4458,12 @@
/* Find the loader before the one being removed. */
lt_dlloader *prev;
for (prev = loaders; prev->next; prev = prev->next)
- {
- if (!strcmp (prev->next->loader_name, loader_name))
- {
- break;
- }
- }
+ {
+ if (!strcmp (prev->next->loader_name, loader_name))
+ {
+ break;
+ }
+ }
place = prev->next;
prev->next = prev->next->next;
@@ -4431,7 +4476,7 @@
LT_DLFREE (place);
- done:
+done:
LT_DLMUTEX_UNLOCK ();
return errors;
@@ -4500,9 +4545,9 @@
for (place = loaders; place; place = place->next)
{
if (strcmp (place->loader_name, loader_name) == 0)
- {
- break;
- }
+ {
+ break;
+ }
}
LT_DLMUTEX_UNLOCK ();
Modified: GNUnet/libltdl/ltdl.h
===================================================================
--- GNUnet/libltdl/ltdl.h 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/libltdl/ltdl.h 2007-09-29 22:47:47 UTC (rev 5670)
@@ -28,9 +28,9 @@
#ifndef LTDL_H
#define LTDL_H 1
-#include <sys/types.h> /* for size_t declaration */
-
+#include <sys/types.h> /* for size_t declaration */
+
/* --- MACROS FOR PORTABILITY --- */
@@ -44,13 +44,11 @@
# define LT_BEGIN_C_DECLS extern "C" {
# define LT_END_C_DECLS }
#else
-# define LT_BEGIN_C_DECLS /* empty */
-# define LT_END_C_DECLS /* empty */
+# define LT_BEGIN_C_DECLS /* empty */
+# define LT_END_C_DECLS /* empty */
#endif
LT_BEGIN_C_DECLS
-
-
/* LT_PARAMS is a macro used to wrap function prototypes, so that compilers
that don't understand ANSI C prototypes still work, and ANSI C
compilers can issue warnings about type mismatches. */
@@ -61,7 +59,6 @@
# define LT_PARAMS(protos) ()
# define lt_ptr char*
#endif
-
/* LT_STMT_START/END are used to create macros which expand to a
a single compound statement in a portable way. */
#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
@@ -76,7 +73,6 @@
# define LT_STMT_END while (0)
# endif
#endif
-
/* LT_CONC creates a new concatenated symbol for the compiler
in a portable way. */
#if defined(__STDC__) || defined(__cplusplus) || defined(_MSC_VER)
@@ -84,15 +80,9 @@
#else
# define LT_CONC(s,t) s/**/t
#endif
-
/* LT_STRLEN can be used safely on NULL pointers. */
#define LT_STRLEN(s) (((s) && (s)[0]) ? strlen (s) : 0)
-
-
-
-/* --- WINDOWS SUPPORT --- */
-
-
+/* --- WINDOWS SUPPORT --- */
/* Canonicalise Windows and Cygwin recognition macros. */
#ifdef __CYGWIN32__
# ifndef __CYGWIN__
@@ -110,8 +100,6 @@
# endif
# endif
#endif
-
-
#ifdef __WINDOWS__
# ifndef __CYGWIN__
/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory
@@ -123,81 +111,72 @@
#ifndef LT_PATHSEP_CHAR
# define LT_PATHSEP_CHAR ':'
#endif
-
/* DLL building support on win32 hosts; mostly to workaround their
ridiculous implementation of data symbol exporting. */
#ifndef LT_SCOPE
# ifdef __WINDOWS__
-# ifdef DLL_EXPORT /* defined by libtool (if required) */
+# ifdef DLL_EXPORT /* defined by libtool (if required) */
# define LT_SCOPE __declspec(dllexport)
# endif
-# ifdef LIBLTDL_DLL_IMPORT /* define if linking with this dll */
+# ifdef LIBLTDL_DLL_IMPORT /* define if linking with this dll */
# define LT_SCOPE extern __declspec(dllimport)
# endif
# endif
-# ifndef LT_SCOPE /* static linking or !__WINDOWS__ */
+# ifndef LT_SCOPE /* static linking or !__WINDOWS__ */
# define LT_SCOPE extern
# endif
#endif
-
-
-#if defined(_MSC_VER) /* Visual Studio */
+#if defined(_MSC_VER) /* Visual Studio */
# define R_OK 4
#endif
+/* --- DYNAMIC MODULE LOADING API --- */
+typedef struct lt_dlhandle_struct *lt_dlhandle; /* A loaded module. */
-
-
-/* --- DYNAMIC MODULE LOADING API --- */
-
-
-typedef struct lt_dlhandle_struct *lt_dlhandle; /* A loaded module. */
-
/* Initialisation and finalisation functions for libltdl. */
-LT_SCOPE int lt_dlinit LT_PARAMS((void));
-LT_SCOPE int lt_dlexit LT_PARAMS((void));
+LT_SCOPE int lt_dlinit LT_PARAMS ((void));
+LT_SCOPE int lt_dlexit LT_PARAMS ((void));
/* Module search path manipulation. */
-LT_SCOPE int lt_dladdsearchdir LT_PARAMS((const char
*search_dir));
-LT_SCOPE int lt_dlinsertsearchdir LT_PARAMS((const char *before,
- const char *search_dir));
-LT_SCOPE int lt_dlsetsearchpath LT_PARAMS((const char
*search_path));
-LT_SCOPE const char *lt_dlgetsearchpath LT_PARAMS((void));
-LT_SCOPE int lt_dlforeachfile LT_PARAMS((
- const char *search_path,
- int (*func) (const char *filename, lt_ptr data),
- lt_ptr data));
+LT_SCOPE int lt_dladdsearchdir LT_PARAMS ((const char *search_dir));
+LT_SCOPE int lt_dlinsertsearchdir LT_PARAMS ((const char *before,
+ const char *search_dir));
+LT_SCOPE int lt_dlsetsearchpath LT_PARAMS ((const char *search_path));
+LT_SCOPE const char *lt_dlgetsearchpath LT_PARAMS ((void));
+LT_SCOPE int lt_dlforeachfile LT_PARAMS ((const char *search_path,
+ int (*func) (const char *filename,
+ lt_ptr data),
+ lt_ptr data));
/* Portable libltdl versions of the system dlopen() API. */
-LT_SCOPE lt_dlhandle lt_dlopen LT_PARAMS((const char
*filename));
-LT_SCOPE lt_dlhandle lt_dlopenext LT_PARAMS((const char
*filename));
-LT_SCOPE lt_ptr lt_dlsym LT_PARAMS((lt_dlhandle handle,
- const char *name));
-LT_SCOPE const char *lt_dlerror LT_PARAMS((void));
-LT_SCOPE int lt_dlclose LT_PARAMS((lt_dlhandle handle));
+LT_SCOPE lt_dlhandle lt_dlopen LT_PARAMS ((const char *filename));
+LT_SCOPE lt_dlhandle lt_dlopenext LT_PARAMS ((const char *filename));
+LT_SCOPE lt_ptr lt_dlsym LT_PARAMS ((lt_dlhandle handle, const char *name));
+LT_SCOPE const char *lt_dlerror LT_PARAMS ((void));
+LT_SCOPE int lt_dlclose LT_PARAMS ((lt_dlhandle handle));
/* Module residency management. */
-LT_SCOPE int lt_dlmakeresident LT_PARAMS((lt_dlhandle handle));
-LT_SCOPE int lt_dlisresident LT_PARAMS((lt_dlhandle handle));
+LT_SCOPE int lt_dlmakeresident LT_PARAMS ((lt_dlhandle handle));
+LT_SCOPE int lt_dlisresident LT_PARAMS ((lt_dlhandle handle));
+
-
/* --- MUTEX LOCKING --- */
-typedef void lt_dlmutex_lock LT_PARAMS((void));
-typedef void lt_dlmutex_unlock LT_PARAMS((void));
-typedef void lt_dlmutex_seterror LT_PARAMS((const char *errmsg));
-typedef const char *lt_dlmutex_geterror LT_PARAMS((void));
+typedef void lt_dlmutex_lock LT_PARAMS ((void));
+typedef void lt_dlmutex_unlock LT_PARAMS ((void));
+typedef void lt_dlmutex_seterror LT_PARAMS ((const char *errmsg));
+typedef const char *lt_dlmutex_geterror LT_PARAMS ((void));
-LT_SCOPE int lt_dlmutex_register LT_PARAMS((lt_dlmutex_lock
*lock,
- lt_dlmutex_unlock *unlock,
- lt_dlmutex_seterror *seterror,
- lt_dlmutex_geterror *geterror));
+LT_SCOPE int lt_dlmutex_register LT_PARAMS ((lt_dlmutex_lock * lock,
+ lt_dlmutex_unlock * unlock,
+ lt_dlmutex_seterror * seterror,
+ lt_dlmutex_geterror * geterror));
+
-
/* --- MEMORY HANDLING --- */
@@ -206,103 +185,109 @@
libltdl relies on a featureful realloc, but if you are sure yours
has the right semantics then you can assign it directly. Generally,
it is safe to assign just a malloc() and a free() function. */
-LT_SCOPE lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size));
-LT_SCOPE lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size));
-LT_SCOPE void (*lt_dlfree) LT_PARAMS((lt_ptr ptr));
+LT_SCOPE
+lt_ptr (*lt_dlmalloc)
+LT_PARAMS ((size_t size));
+ LT_SCOPE lt_ptr (*lt_dlrealloc) LT_PARAMS ((lt_ptr ptr, size_t size));
+ LT_SCOPE void (*lt_dlfree) LT_PARAMS ((lt_ptr ptr));
+
-
/* --- PRELOADED MODULE SUPPORT --- */
/* A preopened symbol. Arrays of this type comprise the exported
symbols for a dlpreopened module. */
-typedef struct {
- const char *name;
- lt_ptr address;
-} lt_dlsymlist;
+ typedef struct
+ {
+ const char *name;
+ lt_ptr address;
+ } lt_dlsymlist;
-LT_SCOPE int lt_dlpreload LT_PARAMS((const lt_dlsymlist
*preloaded));
-LT_SCOPE int lt_dlpreload_default
- LT_PARAMS((const lt_dlsymlist *preloaded));
+ LT_SCOPE int lt_dlpreload LT_PARAMS ((const lt_dlsymlist * preloaded));
+ LT_SCOPE int lt_dlpreload_default
+ LT_PARAMS ((const lt_dlsymlist * preloaded));
#define LTDL_SET_PRELOADED_SYMBOLS() LT_STMT_START{ \
extern const lt_dlsymlist lt_preloaded_symbols[]; \
lt_dlpreload_default(lt_preloaded_symbols); \
}LT_STMT_END
+
-
/* --- MODULE INFORMATION --- */
/* Read only information pertaining to a loaded module. */
-typedef struct {
- char *filename; /* file name */
- char *name; /* module name */
- int ref_count; /* number of times lt_dlopened minus
- number of times lt_dlclosed. */
-} lt_dlinfo;
+ typedef struct
+ {
+ char *filename; /* file name */
+ char *name; /* module name */
+ int ref_count; /* number of times lt_dlopened minus
+ number of times lt_dlclosed. */
+ } lt_dlinfo;
-LT_SCOPE const lt_dlinfo *lt_dlgetinfo LT_PARAMS((lt_dlhandle
handle));
-LT_SCOPE lt_dlhandle lt_dlhandle_next LT_PARAMS((lt_dlhandle
place));
-LT_SCOPE int lt_dlforeach LT_PARAMS((
- int (*func) (lt_dlhandle handle, lt_ptr data),
- lt_ptr data));
+ LT_SCOPE const lt_dlinfo *lt_dlgetinfo LT_PARAMS ((lt_dlhandle handle));
+ LT_SCOPE lt_dlhandle lt_dlhandle_next LT_PARAMS ((lt_dlhandle place));
+ LT_SCOPE int lt_dlforeach
+ LT_PARAMS ((int (*func) (lt_dlhandle handle, lt_ptr data),
+ lt_ptr data));
/* Associating user data with loaded modules. */
-typedef unsigned lt_dlcaller_id;
+ typedef unsigned lt_dlcaller_id;
-LT_SCOPE lt_dlcaller_id lt_dlcaller_register LT_PARAMS((void));
-LT_SCOPE lt_ptr lt_dlcaller_set_data LT_PARAMS((lt_dlcaller_id
key,
- lt_dlhandle handle,
- lt_ptr data));
-LT_SCOPE lt_ptr lt_dlcaller_get_data LT_PARAMS((lt_dlcaller_id
key,
- lt_dlhandle handle));
+ LT_SCOPE lt_dlcaller_id lt_dlcaller_register LT_PARAMS ((void));
+ LT_SCOPE lt_ptr lt_dlcaller_set_data LT_PARAMS ((lt_dlcaller_id key,
+ lt_dlhandle handle,
+ lt_ptr data));
+ LT_SCOPE lt_ptr lt_dlcaller_get_data LT_PARAMS ((lt_dlcaller_id key,
+ lt_dlhandle handle));
+
-
/* --- USER MODULE LOADER API --- */
-typedef struct lt_dlloader lt_dlloader;
-typedef lt_ptr lt_user_data;
-typedef lt_ptr lt_module;
+ typedef struct lt_dlloader lt_dlloader;
+ typedef lt_ptr lt_user_data;
+ typedef lt_ptr lt_module;
/* Function pointer types for creating user defined module loaders. */
-typedef lt_module lt_module_open LT_PARAMS((lt_user_data loader_data,
- const char *filename));
-typedef int lt_module_close LT_PARAMS((lt_user_data loader_data,
- lt_module handle));
-typedef lt_ptr lt_find_sym LT_PARAMS((lt_user_data loader_data,
- lt_module handle,
- const char *symbol));
-typedef int lt_dlloader_exit LT_PARAMS((lt_user_data loader_data));
+ typedef lt_module lt_module_open LT_PARAMS ((lt_user_data loader_data,
+ const char *filename));
+ typedef int lt_module_close LT_PARAMS ((lt_user_data loader_data,
+ lt_module handle));
+ typedef lt_ptr lt_find_sym LT_PARAMS ((lt_user_data loader_data,
+ lt_module handle,
+ const char *symbol));
+ typedef int lt_dlloader_exit LT_PARAMS ((lt_user_data loader_data));
-struct lt_user_dlloader {
- const char *sym_prefix;
- lt_module_open *module_open;
- lt_module_close *module_close;
- lt_find_sym *find_sym;
- lt_dlloader_exit *dlloader_exit;
- lt_user_data dlloader_data;
-};
+ struct lt_user_dlloader
+ {
+ const char *sym_prefix;
+ lt_module_open *module_open;
+ lt_module_close *module_close;
+ lt_find_sym *find_sym;
+ lt_dlloader_exit *dlloader_exit;
+ lt_user_data dlloader_data;
+ };
-LT_SCOPE lt_dlloader *lt_dlloader_next LT_PARAMS((lt_dlloader
*place));
-LT_SCOPE lt_dlloader *lt_dlloader_find LT_PARAMS((
- const char *loader_name));
-LT_SCOPE const char *lt_dlloader_name LT_PARAMS((lt_dlloader
*place));
-LT_SCOPE lt_user_data *lt_dlloader_data LT_PARAMS((lt_dlloader
*place));
-LT_SCOPE int lt_dlloader_add LT_PARAMS((lt_dlloader
*place,
- const struct lt_user_dlloader *dlloader,
- const char *loader_name));
-LT_SCOPE int lt_dlloader_remove LT_PARAMS((
- const char *loader_name));
+ LT_SCOPE lt_dlloader *lt_dlloader_next LT_PARAMS ((lt_dlloader * place));
+ LT_SCOPE lt_dlloader *lt_dlloader_find
+ LT_PARAMS ((const char *loader_name));
+ LT_SCOPE const char *lt_dlloader_name LT_PARAMS ((lt_dlloader * place));
+ LT_SCOPE lt_user_data *lt_dlloader_data
+ LT_PARAMS ((lt_dlloader * place));
+ LT_SCOPE int lt_dlloader_add
+ LT_PARAMS ((lt_dlloader * place,
+ const struct lt_user_dlloader * dlloader,
+ const char *loader_name));
+ LT_SCOPE int lt_dlloader_remove LT_PARAMS ((const char *loader_name));
+
-
/* --- ERROR MESSAGE HANDLING --- */
@@ -332,21 +317,21 @@
LT_ERROR(INVALID_POSITION, "invalid search path insert position")
/* Enumerate the symbolic error names. */
-enum {
+ enum
+ {
#define LT_ERROR(name, diagnostic) LT_CONC(LT_ERROR_, name),
- lt_dlerror_table
+ lt_dlerror_table
#undef LT_ERROR
+ LT_ERROR_MAX
+ };
- LT_ERROR_MAX
-};
-
/* These functions are only useful from inside custom module loaders. */
-LT_SCOPE int lt_dladderror LT_PARAMS((const char *diagnostic));
-LT_SCOPE int lt_dlseterror LT_PARAMS((int errorcode));
+ LT_SCOPE int lt_dladderror LT_PARAMS ((const char *diagnostic));
+ LT_SCOPE int lt_dlseterror LT_PARAMS ((int errorcode));
+
-
/* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */
@@ -362,5 +347,4 @@
#endif
LT_END_C_DECLS
-
#endif /* !LTDL_H */
Modified: GNUnet/libltdl/ltmain.sh
===================================================================
--- GNUnet/libltdl/ltmain.sh 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/libltdl/ltmain.sh 2007-09-29 22:47:47 UTC (rev 5670)
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <address@hidden>, 1996
#
# This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-4"
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+VERSION="1.5.24 Debian 1.5.24-1"
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
@@ -105,12 +113,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +146,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -196,7 +208,13 @@
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+ $SED -n -e '1,100{
+ / I /{
+ s,.*,import,
+ p
+ q
+ }
+ }'`
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@@ -327,7 +345,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -454,11 +482,12 @@
;;
--version)
- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
- $echo
- $echo "Copyright (C) 2005 Free Software Foundation, Inc."
- $echo "This is free software; see the source for copying conditions.
There is NO"
- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE."
+ echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit $?
;;
@@ -755,9 +784,10 @@
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
- *.f90) xform=f90 ;;
+ *.[fF][09]?) xform=[fF][09]. ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1168,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag";
then
$echo "$modename: warning: complete static linking is impossible in
this configuration" 1>&2
fi
@@ -1147,12 +1178,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1600,7 +1639,7 @@
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -1620,10 +1659,11 @@
# -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC
- # -pg pass through profiling flag for GCC
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # -F/path gives path to uninstalled frameworks, gcc on darwin
# @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
- -t[45]*|-txscale*|@*)
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
@@ -1651,9 +1691,9 @@
-no-install)
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
# The PATH hackery in wrapper scripts is required on Windows
- # in order for the loader to find any dlls it needs.
+ # and Darwin in order for the loader to find any dlls it needs.
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
@@ -1712,7 +1752,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2097,7 +2137,7 @@
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@@ -2493,7 +2533,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; };
then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3189,7 +3231,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3200,9 +3242,10 @@
age="0"
;;
irix|nonstopux)
- current=`expr $number_major + $number_minor - 1`
+ current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_minor"
+ lt_irix_increment=no
;;
*)
$echo "$modename: unknown library version type \`$version_type'"
1>&2
@@ -3266,7 +3309,8 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
- verstring="${wl}-compatibility_version ${wl}$minor_current
${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current
${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version
$minor_current.$revision"
;;
freebsd-aout)
@@ -3280,8 +3324,11 @@
;;
irix | nonstopux)
- major=`expr $current - $age + 1`
-
+ if test "X$lt_irix_increment" = "Xno"; then
+ major=`expr $current - $age`
+ else
+ major=`expr $current - $age + 1`
+ fi
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
@@ -3418,11 +3465,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path %
%g"`
- done
+ #for path in $notinst_path; do
+ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s%
$path % %g"`
+ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s%
-L$path % %g"`
+ #done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3523,13 +3570,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ;
then
case " $predeps $postdeps " in
*" $i "*)
@@ -3568,9 +3614,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes"
; then
case " $predeps $postdeps " in
@@ -3602,7 +3646,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but
I was not able to"
- $echo "*** make it link in! You will probably need to
install it or some"
+ $echo "*** make it link in! You will probably need to
install it or some"
$echo "*** library that it depends on before this library
will be fully"
$echo "*** functional. Installing it before continuing would
be even better."
fi
@@ -3888,7 +3932,10 @@
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+ case $archive_cmds in
+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+ esac
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
@@ -4247,12 +4294,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" |
$Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4700,16 +4749,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e
"address@hidden@%$output_objdir/${outputname}.def
$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e
"address@hidden@%$output_objdir/${outputname}.def
$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e
"address@hidden@%$output_objdir/${outputname}.def
$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e
"address@hidden@%$output_objdir/${outputname}.def
$output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e
"address@hidden@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e
"address@hidden@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e
"address@hidden@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e
"address@hidden@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e
"address@hidden@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e
"address@hidden@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e
"address@hidden@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e
"address@hidden@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4724,13 +4773,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%
@address@hidden"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%
@address@hidden"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%
@address@hidden" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%
@address@hidden" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e
'address@hidden@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e
'address@hidden@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4817,7 +4866,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath"
| $Xsed -e 'address@hidden@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath"
| $SP2NL | $Xsed -e 'address@hidden@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4854,7 +4903,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e
"$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5261,6 +5310,20 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"address@hidden"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"address@hidden"}'='\"address@hidden"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5403,7 +5466,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"address@hidden"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5589,7 +5652,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink
$libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e
"$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5934,9 +5997,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED
"address@hidden@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED
"address@hidden@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "address@hidden@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED
"address@hidden@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6145,7 +6208,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e
'address@hidden@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e
'address@hidden@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6356,8 +6419,10 @@
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
- $echo "$modename: cannot find \`$dlname' in \`$dir' or
\`$dir/$objdir'" 1>&2
- exit $EXIT_FAILURE
+ if test ! -f "$dir/$dlname"; then
+ $echo "$modename: cannot find \`$dlname' in \`$dir' or
\`$dir/$objdir'" 1>&2
+ exit $EXIT_FAILURE
+ fi
fi
;;
@@ -6421,12 +6486,12 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ fi"
+ done
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6783,9 +6848,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6799,9 +6864,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool
libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
Modified: GNUnet/libltdl/missing
===================================================================
--- GNUnet/libltdl/missing 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/libltdl/missing 2007-09-29 22:47:47 UTC (rev 5670)
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2003-09-02.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <address@hidden>, 1996.
@@ -19,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -62,7 +60,12 @@
msg="probably too old"
fi
;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
@@ -79,7 +82,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -90,12 +92,10 @@
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <address@hidden>."
- exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing $scriptversion (GNU Automake)"
- exit $?
;;
-*)
@@ -104,42 +104,12 @@
exit 1
;;
-esac
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
- *)
+ aclocal*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
fi
- ;;
-esac
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
- aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
@@ -149,6 +119,11 @@
;;
autoconf)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -158,6 +133,11 @@
;;
autoheader)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -167,7 +147,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -177,6 +157,11 @@
;;
automake*)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
@@ -188,6 +173,11 @@
;;
autom4te)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -195,8 +185,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +207,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,32 +237,39 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -282,6 +279,11 @@
;;
makeinfo)
+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+ # We have makeinfo, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,29 +291,20 @@
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /address@hidden/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/address@hidden/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
touch $file
;;
tar)
shift
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/m4/Makefile.in 2007-09-29 22:47:47 UTC (rev 5670)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,11 +13,15 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -29,7 +33,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
subdir = m4
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
@@ -51,6 +54,8 @@
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
@@ -61,6 +66,8 @@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -68,6 +75,8 @@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
@@ -87,8 +96,31 @@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
+HAVE_ADNS_FALSE = @HAVE_ADNS_FALSE@
+HAVE_ADNS_TRUE = @HAVE_ADNS_TRUE@
+HAVE_DIALOG_FALSE = @HAVE_DIALOG_FALSE@
+HAVE_DIALOG_TRUE = @HAVE_DIALOG_TRUE@
+HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
+HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
+HAVE_GUILE_FALSE = @HAVE_GUILE_FALSE@
+HAVE_GUILE_TRUE = @HAVE_GUILE_TRUE@
+HAVE_IPV6_FALSE = @HAVE_IPV6_FALSE@
+HAVE_IPV6_TRUE = @HAVE_IPV6_TRUE@
+HAVE_MHD_FALSE = @HAVE_MHD_FALSE@
+HAVE_MHD_TRUE = @HAVE_MHD_TRUE@
+HAVE_MYSQLE_FALSE = @HAVE_MYSQLE_FALSE@
+HAVE_MYSQLE_TRUE = @HAVE_MYSQLE_TRUE@
+HAVE_MYSQL_FALSE = @HAVE_MYSQL_FALSE@
+HAVE_MYSQL_TRUE = @HAVE_MYSQL_TRUE@
+HAVE_SQLITE_FALSE = @HAVE_SQLITE_FALSE@
+HAVE_SQLITE_TRUE = @HAVE_SQLITE_TRUE@
+HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
+HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -106,12 +138,18 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LINUX_FALSE = @LINUX_FALSE@
+LINUX_TRUE = @LINUX_TRUE@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+MACOSX_FALSE = @MACOSX_FALSE@
+MACOSX_TRUE = @MACOSX_TRUE@
MAKEINFO = @MAKEINFO@
+MINGW_FALSE = @MINGW_FALSE@
+MINGW_TRUE = @MINGW_TRUE@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -120,6 +158,8 @@
MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OPENBSD_FALSE = @OPENBSD_FALSE@
+OPENBSD_TRUE = @OPENBSD_TRUE@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -133,35 +173,36 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SOLARIS_FALSE = @SOLARIS_FALSE@
+SOLARIS_TRUE = @SOLARIS_TRUE@
SQLITE_CPPFLAGS = @SQLITE_CPPFLAGS@
SQLITE_LDFLAGS = @SQLITE_LDFLAGS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+XFREEBSD_FALSE = @XFREEBSD_FALSE@
+XFREEBSD_TRUE = @XFREEBSD_TRUE@
XGETTEXT = @XGETTEXT@
XML2_CONFIG = @XML2_CONFIG@
XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
_libcurl_config = @_libcurl_config@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -189,12 +230,9 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
EXTRA_DIST = glibc2.m4 intl.m4 intldir.m4 lock.m4 visibility.m4 \
codeset.m4 \
freetype2.m4\
@@ -270,6 +308,10 @@
clean-libtool:
-rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
tags: TAGS
TAGS:
@@ -278,21 +320,22 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -326,7 +369,7 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -337,7 +380,7 @@
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-libtool
dvi: dvi-am
@@ -351,20 +394,12 @@
install-data-am:
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -383,20 +418,17 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-info-am
-.MAKE: install-am install-strip
-
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/po/GNUnet.pot 2007-09-29 22:47:47 UTC (rev 5670)
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <address@hidden>, YEAR.
#
+#: contrib/config-daemon.scm:555
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-30 00:16-0600\n"
+"POT-Creation-Date: 2007-09-29 16:44-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -51,45 +52,61 @@
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr ""
-#: src/transports/udp6.c:471 src/transports/udp.c:514
+#: src/transports/udp6.c:471 src/transports/udp.c:520
#, c-format
msgid "MTU %llu for `%s' is probably too low!\n"
msgstr ""
-#: src/transports/http.c:522
+#: src/transports/udp6.c:476
+msgid "# bytes received via UDP6"
+msgstr ""
+
+#: src/transports/udp6.c:477
+msgid "# bytes sent via UDP6"
+msgstr ""
+
+#: src/transports/udp6.c:479
+msgid "# bytes dropped by UDP6 (outgoing)"
+msgstr ""
+
+#: src/transports/udp6.c:481
+msgid "# UDP6 connections (right now)"
+msgstr ""
+
+#: src/transports/http.c:824
msgid "HTTP: Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/http.c:813 src/transports/http.c:892
-#: src/transports/http.c:1007 src/transports/http.c:1147
-#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
-#: src/applications/bootstrap_http/http.c:115
-#: src/applications/bootstrap_http/http.c:247
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:294
-#: src/applications/bootstrap_http/http.c:313
-#: src/applications/bootstrap_http/http.c:326
-#: src/applications/bootstrap_http/http.c:336
-#: src/applications/bootstrap_http/http.c:346
+#: src/transports/http.c:1235 src/transports/http.c:1309
+#: src/transports/http.c:1464 src/transports/http.c:1858
+#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
+#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
+#: src/applications/bootstrap_http/http.c:254
+#: src/applications/bootstrap_http/http.c:270
+#: src/applications/bootstrap_http/http.c:301
+#: src/applications/bootstrap_http/http.c:320
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:343
+#: src/applications/bootstrap_http/http.c:353
#, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr ""
-#: src/transports/http.c:1307
+#: src/transports/http.c:2080
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:1316
+#: src/transports/http.c:2089
msgid "# bytes received via HTTP"
msgstr ""
-#: src/transports/http.c:1317
+#: src/transports/http.c:2090
msgid "# bytes sent via HTTP"
msgstr ""
-#: src/transports/http.c:1319
+#: src/transports/http.c:2092
msgid "# bytes dropped by HTTP (outgoing)"
msgstr ""
@@ -133,59 +150,63 @@
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
msgstr ""
-#: src/transports/tcp.c:289
+#: src/transports/tcp.c:290
msgid "TCP: Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/tcp.c:384
+#: src/transports/tcp.c:389
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr ""
-#: src/transports/tcp.c:437 src/transports/tcp6.c:404
+#: src/transports/tcp.c:442 src/transports/tcp6.c:404
#, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr ""
-#: src/transports/tcp.c:556
+#: src/transports/tcp.c:561
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"TCP\" to \"NO\"\n"
msgstr ""
-#: src/transports/tcp.c:565
+#: src/transports/tcp.c:570
msgid "# bytes received via TCP"
msgstr ""
-#: src/transports/tcp.c:566
+#: src/transports/tcp.c:571
msgid "# bytes sent via TCP"
msgstr ""
-#: src/transports/tcp.c:568
+#: src/transports/tcp.c:573
msgid "# bytes dropped by TCP (outgoing)"
msgstr ""
-#: src/transports/udp.c:287
+#: src/transports/udp.c:288
msgid "UDP: Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/udp.c:378
+#: src/transports/udp.c:384
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
-#: src/transports/udp.c:529
+#: src/transports/udp.c:535
msgid "# bytes received via UDP"
msgstr ""
-#: src/transports/udp.c:530
+#: src/transports/udp.c:536
msgid "# bytes sent via UDP"
msgstr ""
-#: src/transports/udp.c:532
+#: src/transports/udp.c:538
msgid "# bytes dropped by UDP (outgoing)"
msgstr ""
+#: src/transports/udp.c:540
+msgid "# UDP connections (right now)"
+msgstr ""
+
#: src/transports/tcp6.c:245
msgid "Could not determine my public IPv6 address.\n"
msgstr ""
@@ -225,7 +246,7 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/udp_helper.c:94
+#: src/transports/udp_helper.c:96
msgid "Received malformed message from udp-peer connection. Closing.\n"
msgstr ""
@@ -238,42 +259,42 @@
"allow TIME ms to process a GET command or expire PUT content after ms TIME"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:98
+#: src/applications/dht/tools/dht-query.c:99
#, c-format
msgid "%s(%s) operation returned no results.\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:115
+#: src/applications/dht/tools/dht-query.c:116
#, c-format
msgid "Issuing '%s(%s,%s)' command.\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:122
+#: src/applications/dht/tools/dht-query.c:123
#, c-format
msgid "'%s(%s,%s)' succeeded\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:126
+#: src/applications/dht/tools/dht-query.c:127
#, c-format
msgid "'%s(%s,%s)' failed.\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:150
+#: src/applications/dht/tools/dht-query.c:151
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:164
#, c-format
msgid "Command `%s' requires an argument (`%s').\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:180
+#: src/applications/dht/tools/dht-query.c:181
#, c-format
msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:191
+#: src/applications/dht/tools/dht-query.c:192
#, c-format
msgid "Unsupported command `%s'. Aborting.\n"
msgstr ""
@@ -463,7 +484,7 @@
msgstr ""
#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:901
+#: src/applications/session/connect.c:913
#, c-format
msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
msgstr ""
@@ -521,12 +542,12 @@
msgstr ""
#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:896
+#: src/applications/session/connect.c:908
msgid "# encrypted PONG messages sent"
msgstr ""
#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:894
+#: src/applications/session/connect.c:906
msgid "# encrypted PING messages sent"
msgstr ""
@@ -547,33 +568,34 @@
#: src/applications/sqstore_sqlite/sqlite.c:54
#: src/applications/sqstore_mysql/mysql.c:145
#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:428
-#: src/applications/sqstore_mysql/mysql.c:438
-#: src/applications/sqstore_mysql/mysql.c:476
-#: src/applications/sqstore_mysql/mysql.c:486
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:529
-#: src/applications/sqstore_mysql/mysql.c:627
-#: src/applications/sqstore_mysql/mysql.c:639
-#: src/applications/sqstore_mysql/mysql.c:651
-#: src/applications/sqstore_mysql/mysql.c:665
-#: src/applications/sqstore_mysql/mysql.c:762
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:917
-#: src/applications/sqstore_mysql/mysql.c:929
-#: src/applications/sqstore_mysql/mysql.c:941
-#: src/applications/sqstore_mysql/mysql.c:1184
-#: src/applications/sqstore_mysql/mysql.c:1196
-#: src/applications/sqstore_mysql/mysql.c:1208
-#: src/applications/sqstore_mysql/mysql.c:1293
+#: src/applications/sqstore_mysql/mysql.c:468
+#: src/applications/sqstore_mysql/mysql.c:478
+#: src/applications/sqstore_mysql/mysql.c:516
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:558
+#: src/applications/sqstore_mysql/mysql.c:569
+#: src/applications/sqstore_mysql/mysql.c:667
+#: src/applications/sqstore_mysql/mysql.c:679
+#: src/applications/sqstore_mysql/mysql.c:691
+#: src/applications/sqstore_mysql/mysql.c:705
+#: src/applications/sqstore_mysql/mysql.c:802
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:965
+#: src/applications/sqstore_mysql/mysql.c:977
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1229
+#: src/applications/sqstore_mysql/mysql.c:1241
+#: src/applications/sqstore_mysql/mysql.c:1253
+#: src/applications/sqstore_mysql/mysql.c:1338
#: src/applications/kvstore_sqlite/kv_sqlite.c:44
#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
-#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
-#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
-#: src/util/crypto/hostkey_gcrypt.c:71
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
+#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
+#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
+#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
+#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
#, c-format
msgid "`%s' failed at %s:%d with error: %s\n"
msgstr ""
@@ -589,17 +611,17 @@
msgstr ""
#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:416
+#: src/applications/sqstore_sqlite/sqlite.c:431
msgid "sqlite datastore"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:415
+#: src/applications/sqstore_sqlite/sqlite.c:430
#, c-format
msgid "Invalid data in %s. Trying to fix (by deletion).\n"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:1206
-#: src/applications/sqstore_mysql/mysql.c:1401
+#: src/applications/sqstore_sqlite/sqlite.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1446
msgid "# bytes in datastore"
msgstr ""
@@ -623,46 +645,46 @@
msgid "Session key received from peer `%s' has invalid format (discarded).\n"
msgstr ""
-#: src/applications/session/connect.c:614
+#: src/applications/session/connect.c:624
#, c-format
msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
msgstr ""
-#: src/applications/session/connect.c:646
+#: src/applications/session/connect.c:656
#, c-format
msgid "Invalid `%s' message received from peer `%s'.\n"
msgstr ""
-#: src/applications/session/connect.c:656
+#: src/applications/session/connect.c:666
#, c-format
msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
msgstr ""
-#: src/applications/session/connect.c:719
+#: src/applications/session/connect.c:729
#, c-format
msgid ""
"Error parsing encrypted session key from `%s', given message part size is "
"invalid.\n"
msgstr ""
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:741
#, c-format
msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
msgstr ""
-#: src/applications/session/connect.c:886
+#: src/applications/session/connect.c:898
msgid "# session keys sent"
msgstr ""
-#: src/applications/session/connect.c:888
+#: src/applications/session/connect.c:900
msgid "# session keys rejected"
msgstr ""
-#: src/applications/session/connect.c:890
+#: src/applications/session/connect.c:902
msgid "# session keys accepted"
msgstr ""
-#: src/applications/session/connect.c:892
+#: src/applications/session/connect.c:904
msgid "# sessions established"
msgstr ""
@@ -729,24 +751,24 @@
msgid "async RPC reply not received.\n"
msgstr ""
-#: src/applications/sqstore_mysql/mysql.c:379
+#: src/applications/sqstore_mysql/mysql.c:419
#, c-format
msgid "`%s' failed at %s:%d with error: %s"
msgstr ""
-#: src/applications/sqstore_mysql/mysql.c:1311
+#: src/applications/sqstore_mysql/mysql.c:1356
#, c-format
msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
msgstr ""
-#: src/applications/sqstore_mysql/mysql.c:1423
-#: src/applications/sqstore_mysql/mysql.c:1570
+#: src/applications/sqstore_mysql/mysql.c:1468
+#: src/applications/sqstore_mysql/mysql.c:1615
#, c-format
msgid "Trying to use file `%s' for MySQL configuration.\n"
msgstr ""
-#: src/applications/sqstore_mysql/mysql.c:1448
-#: src/applications/sqstore_mysql/mysql.c:1593
+#: src/applications/sqstore_mysql/mysql.c:1493
+#: src/applications/sqstore_mysql/mysql.c:1638
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -923,7 +945,7 @@
msgstr ""
#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:52
+#: src/applications/vpn/gnunet-vpn.c:53
msgid "Print statistics about GNUnet operations."
msgstr ""
@@ -935,7 +957,7 @@
#: src/applications/tbench/gnunet-tbench.c:127
#: src/applications/tracekit/gnunet-tracekit.c:315
#: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:148
+#: src/applications/vpn/gnunet-vpn.c:149
#, c-format
msgid "Error establishing connection with gnunetd.\n"
msgstr ""
@@ -1906,15 +1928,15 @@
msgid "enables (anonymous) file-sharing"
msgstr ""
-#: src/applications/fs/module/migration.c:312
+#: src/applications/fs/module/migration.c:374
msgid "# blocks migrated"
msgstr ""
-#: src/applications/fs/module/migration.c:314
+#: src/applications/fs/module/migration.c:376
msgid "# blocks fetched for migration"
msgstr ""
-#: src/applications/fs/module/migration.c:317
+#: src/applications/fs/module/migration.c:379
msgid "# on-demand block migration attempts"
msgstr ""
@@ -2108,31 +2130,31 @@
msgid "Template description."
msgstr ""
-#: src/applications/bootstrap_http/http.c:102
+#: src/applications/bootstrap_http/http.c:109
#, c-format
msgid "Bootstrap data obtained from `%s' is invalid.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:170
+#: src/applications/bootstrap_http/http.c:177
msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:210
+#: src/applications/bootstrap_http/http.c:217
#, c-format
msgid "Bootstrapping using `%s'.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:224
+#: src/applications/bootstrap_http/http.c:231
#, c-format
msgid "Trying to download hostlist from `%s'\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:352
+#: src/applications/bootstrap_http/http.c:359
#, c-format
msgid "Downloaded %llu bytes from `%s'.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:385
+#: src/applications/bootstrap_http/http.c:392
msgid "# HELLOs downloaded via http"
msgstr ""
@@ -2155,7 +2177,7 @@
msgid "tracks bandwidth utilization by gnunetd"
msgstr ""
-#: src/applications/vpn/gnunet-vpn.c:56
+#: src/applications/vpn/gnunet-vpn.c:57
msgid "Suppress display of asynchronous log messages"
msgstr ""
@@ -2375,34 +2397,34 @@
msgid "No"
msgstr ""
-#: src/applications/vpn/vpn.c:1647
+#: src/applications/vpn/vpn.c:1651
#, c-format
msgid "`%s' initialising RFC4913 module %d and %d\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1650
+#: src/applications/vpn/vpn.c:1654
#, c-format
msgid "RFC4193 my First 4 hex digits of host id are %x\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1723
+#: src/applications/vpn/vpn.c:1727
msgid "enables IPv6 over GNUnet (incomplete)"
msgstr ""
-#: src/applications/vpn/vpn.c:1757
+#: src/applications/vpn/vpn.c:1761
msgid "RFC4193 Waiting for tun thread to end\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1771
+#: src/applications/vpn/vpn.c:1775
msgid "RFC4193 The tun thread has ended\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1788
+#: src/applications/vpn/vpn.c:1792
#, c-format
msgid "RFC4193 Closing tunnel %d fd %d\n"
msgstr ""
-#: src/applications/dstore/dstore.c:466
+#: src/applications/dstore/dstore.c:525
msgid "# bytes in dstore"
msgstr ""
@@ -2428,7 +2450,7 @@
msgid "Updates GNUnet datastructures after version change."
msgstr ""
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
msgid "run as user LOGIN"
msgstr ""
@@ -2436,86 +2458,94 @@
msgid "run in client mode (for getting client configuration values)"
msgstr ""
-#: src/server/connection.c:1188
+#: src/server/connection.c:1202
#, c-format
msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
msgstr ""
-#: src/server/connection.c:1197
+#: src/server/connection.c:1211
#, c-format
msgid "Message details: %u: length %d, priority: %d\n"
msgstr ""
-#: src/server/connection.c:2744
+#: src/server/connection.c:2897
#, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr ""
-#: src/server/connection.c:2829
+#: src/server/connection.c:2982
#, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr ""
-#: src/server/connection.c:2851
+#: src/server/connection.c:3004
msgid "Message received more than one day old. Dropped.\n"
msgstr ""
-#: src/server/connection.c:3337
+#: src/server/connection.c:3500
msgid "# outgoing messages dropped"
msgstr ""
-#: src/server/connection.c:3340
+#: src/server/connection.c:3503
msgid "# bytes of outgoing messages dropped"
msgstr ""
-#: src/server/connection.c:3342
+#: src/server/connection.c:3505
msgid "# connections closed (HANGUP sent)"
msgstr ""
-#: src/server/connection.c:3345
+#: src/server/connection.c:3509
+msgid "# connections closed (transport issue)"
+msgstr ""
+
+#: src/server/connection.c:3512
msgid "# bytes encrypted"
msgstr ""
-#: src/server/connection.c:3349
+#: src/server/connection.c:3516
msgid "# bytes transmitted"
msgstr ""
-#: src/server/connection.c:3353
+#: src/server/connection.c:3520
msgid "# bytes received"
msgstr ""
-#: src/server/connection.c:3355
+#: src/server/connection.c:3522
msgid "# bytes decrypted"
msgstr ""
-#: src/server/connection.c:3356
+#: src/server/connection.c:3523
msgid "# bytes noise sent"
msgstr ""
-#: src/server/connection.c:3359
+#: src/server/connection.c:3526
msgid "# total bytes per second send limit"
msgstr ""
-#: src/server/connection.c:3362
+#: src/server/connection.c:3529
msgid "# total bytes per second receive limit"
msgstr ""
-#: src/server/connection.c:3365
+#: src/server/connection.c:3532
msgid "# total number of messages in send buffers"
msgstr ""
-#: src/server/connection.c:3369
+#: src/server/connection.c:3536
msgid "# total number of bytes we were allowed to sent but did not"
msgstr ""
-#: src/server/connection.c:3373
+#: src/server/connection.c:3540
msgid "# total number of bytes we were allowed to sent"
msgstr ""
-#: src/server/connection.c:3377
+#: src/server/connection.c:3544
msgid "# total number of bytes we are currently allowed to send"
msgstr ""
+#: src/server/connection.c:3547
+msgid "# transports switched to stream transport"
+msgstr ""
+
#: src/server/startup.c:206
#, c-format
msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -2618,109 +2648,109 @@
msgid "Could not properly unload service `%s'!\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:121
+#: src/server/gnunet-transport-check.c:122
#, c-format
msgid "`%s': Could not create hello.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:128
+#: src/server/gnunet-transport-check.c:129
#, c-format
msgid "`%s': Could not connect.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:157
+#: src/server/gnunet-transport-check.c:161
#, c-format
msgid "`%s': Could not send.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:172
+#: src/server/gnunet-transport-check.c:176
#, c-format
msgid "`%s': Did not receive message within %llu ms.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:185
+#: src/server/gnunet-transport-check.c:189
#, c-format
msgid "`%s': Could not disconnect.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:192
+#: src/server/gnunet-transport-check.c:196
#, c-format
msgid ""
"`%s' transport OK. It took %ums to transmit %llu messages of %llu bytes "
"each.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:222
+#: src/server/gnunet-transport-check.c:226
#, c-format
msgid " Transport %d is not being tested\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:251
+#: src/server/gnunet-transport-check.c:255
#, c-format
msgid ""
"\n"
"Contacting `%s'."
msgstr ""
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:280
#, c-format
msgid " Connection failed\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:286
#, c-format
msgid " Connection failed (bug?)\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:319
+#: src/server/gnunet-transport-check.c:323
#, c-format
msgid "Timeout after %llums.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:321
+#: src/server/gnunet-transport-check.c:325
#, c-format
msgid "OK!\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:346
+#: src/server/gnunet-transport-check.c:350
msgid "Tool to test if GNUnet transport services are operational."
msgstr ""
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:354
msgid "ping peers from HOSTLISTURL that match transports"
msgstr ""
-#: src/server/gnunet-transport-check.c:353
+#: src/server/gnunet-transport-check.c:357
msgid "send COUNT messages"
msgstr ""
-#: src/server/gnunet-transport-check.c:356
+#: src/server/gnunet-transport-check.c:360
msgid "send messages with SIZE bytes payload"
msgstr ""
-#: src/server/gnunet-transport-check.c:359
+#: src/server/gnunet-transport-check.c:363
msgid "specifies which TRANSPORT should be tested"
msgstr ""
-#: src/server/gnunet-transport-check.c:362
+#: src/server/gnunet-transport-check.c:366
msgid "specifies after how many MS to time-out"
msgstr ""
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:374
msgid "repeat each test X times"
msgstr ""
-#: src/server/gnunet-transport-check.c:431
+#: src/server/gnunet-transport-check.c:435
#, c-format
msgid "Testing transport(s) %s\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:433
+#: src/server/gnunet-transport-check.c:437
#, c-format
msgid "Available transport(s): %s\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:478
#, c-format
msgid ""
"\n"
@@ -2830,12 +2860,12 @@
msgid "libgcrypt has not the expected version (version %s is required).\n"
msgstr ""
-#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
+#: src/util/os/statuscalls.c:195 src/util/os/statuscalls.c:336
#, c-format
msgid "Failed to parse interface data from `%s'.\n"
msgstr ""
-#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
+#: src/util/os/statuscalls.c:379 src/util/os/statuscalls.c:389
#, c-format
msgid ""
"No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -3888,12 +3918,18 @@
msgstr ""
#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
-#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
-#: src/include/gnunet_util_error.h:236
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:236
#, c-format
msgid "Internal error: assertion failed at %s:%d in %s.\n"
msgstr ""
+#: src/include/gnunet_util_error.h:230
+#, c-format
+msgid ""
+"External protocol violation: assertion failed at %s:%d in %s (no need to "
+"panic, we can handle this).\n"
+msgstr ""
+
#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
#, c-format
msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
@@ -4032,23 +4068,23 @@
"configuration here. Default is no proxy."
msgstr ""
-#: contrib/config-daemon.scm:237 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
msgid "How long should logs be kept?"
msgstr ""
-#: contrib/config-daemon.scm:239 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
msgid ""
"How long should logs be kept? If you specify a value greater than zero, a "
"log is created each day with the date appended to its filename. These logs "
"are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
msgstr ""
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:237
msgid ""
"What maximum number of open file descriptors should be requested from the OS?"
msgstr ""
-#: contrib/config-daemon.scm:252
+#: contrib/config-daemon.scm:239
msgid ""
"The default of 1024 should be fine for most systems. If your system can "
"support more, increasing the number might help support additional clients on "
@@ -4060,62 +4096,62 @@
"run with what it is given."
msgstr ""
-#: contrib/config-daemon.scm:263
+#: contrib/config-daemon.scm:250
msgid "Where should gnunetd write the logs?"
msgstr ""
-#: contrib/config-daemon.scm:275 contrib/config-client.scm:169
-msgid "Configuration of the logging system"
+#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+msgid "Logging"
msgstr ""
-#: contrib/config-daemon.scm:276 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
msgid "Specify which system messages should be logged how"
msgstr ""
-#: contrib/config-daemon.scm:280 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
msgid "Logging of events for users"
msgstr ""
-#: contrib/config-daemon.scm:281 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
msgid "Logging of events for the system administrator"
msgstr ""
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:280
msgid "Where should gnunetd write the PID?"
msgstr ""
-#: contrib/config-daemon.scm:294
+#: contrib/config-daemon.scm:281
msgid ""
"The default is no longer /var/run/gnunetd.pid since we could not delete the "
"file on shutdown at that location."
msgstr ""
-#: contrib/config-daemon.scm:306
+#: contrib/config-daemon.scm:293
msgid "As which user should gnunetd run?"
msgstr ""
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:295
msgid ""
"Empty means \"current user\". On computer startup, it is root/SYSTEM. Under "
"Windows, this setting affects the creation of a new system service only."
msgstr ""
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:308
msgid "Should gnunetd be automatically started when the system boots?"
msgstr ""
-#: contrib/config-daemon.scm:322
+#: contrib/config-daemon.scm:309
msgid ""
"Set to YES if gnunetd should be automatically started on boot. If this "
"option is set, gnunet-setup will install a script to start the daemon upon "
"completion. This option may not work on all systems."
msgstr ""
-#: contrib/config-daemon.scm:334
+#: contrib/config-daemon.scm:321
msgid "Which transport mechanisms should GNUnet use?"
msgstr ""
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:323
msgid ""
"Use space-separated list of the modules, e.g. \"udp smtp tcp\". The "
"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4129,11 +4165,11 @@
"itself."
msgstr ""
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:337
msgid "Which applications should gnunetd support?"
msgstr ""
-#: contrib/config-daemon.scm:352
+#: contrib/config-daemon.scm:339
msgid ""
"Whenever this option is changed, you MUST run gnunet-update. Currently, the "
"available applications are:\n"
@@ -4170,15 +4206,24 @@
"compromise your anonymity."
msgstr ""
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:368
msgid "Disable client-server connections"
msgstr ""
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:369
+msgid ""
+"This option can be used to tell gnunetd not to open the client port. When "
+"run like this, gnunetd will participate as a peer in the network but not "
+"support any user interfaces. This maybe useful for headless systems that "
+"are never expected to have end-user interactions. Note that this will also "
+"prevent you from running diagnostic tools like gnunet-stats!"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
msgid "Disable peer discovery"
msgstr ""
-#: contrib/config-daemon.scm:394
+#: contrib/config-daemon.scm:382
msgid ""
"The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
"peer to peers of which the hostkey has been copied by hand to data/hosts; "
@@ -4190,15 +4235,15 @@
"lines above would need some minor editing :-)."
msgstr ""
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:393
msgid "Disable advertising this peer to other peers"
msgstr ""
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:405
msgid "Disable automatic establishment of connections"
msgstr ""
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:406
msgid ""
"If this option is enabled, GNUnet will not automatically establish "
"connections to other peers, but instead wait for applications to "
@@ -4206,21 +4251,21 @@
"connect to us)."
msgstr ""
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:417
msgid "Disable advertising of other peers by this peer"
msgstr ""
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:418
msgid ""
"This option maybe useful during testing, but turning it off is dangerous! If "
"in any doubt, set it to YES (which is the default)."
msgstr ""
-#: contrib/config-daemon.scm:441
-msgid "Client/Server Port"
+#: contrib/config-daemon.scm:429
+msgid "Port for communication with GNUnet user interfaces"
msgstr ""
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:430
msgid ""
"Which is the client-server port that is used between gnunetd and the clients "
"(TCP only). You may firewall this port for non-local machines (but you do "
@@ -4228,11 +4273,11 @@
"connections from machines that are listed under TRUSTED)."
msgstr ""
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:441
msgid "IPs allowed to use gnunetd server"
msgstr ""
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:442
msgid ""
"This option specifies which hosts are trusted enough to connect as clients "
"(to the TCP port). This is useful if you run gnunetd on one host of your "
@@ -4243,71 +4288,69 @@
"separated by a semicolon, spaces are not allowed."
msgstr ""
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:454
msgid "Limit connections to the specfied set of peers."
msgstr ""
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:455
msgid ""
"If this option is not set, any peer is allowed to connect. If it is set, "
-"only the specified peers are allowed."
+"only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:478
-msgid "Run gnunetd as this user."
-msgstr ""
-
-#: contrib/config-daemon.scm:479
-msgid ""
-"When started as root, gnunetd will change permissions to the given user."
-msgstr ""
-
-#: contrib/config-daemon.scm:490
+#: contrib/config-daemon.scm:466
msgid "Run gnunetd as this group."
msgstr ""
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:467
msgid ""
"When started as root, gnunetd will change permissions to the given group."
msgstr ""
-#: contrib/config-daemon.scm:502
-msgid "Run gnunetd during system startup?"
+#: contrib/config-daemon.scm:478
+msgid "Prevent the specfied set of peers from connecting."
msgstr ""
-#: contrib/config-daemon.scm:515
-msgid "Prevent the specfied set of peers from connecting."
+#: contrib/config-daemon.scm:479
+msgid ""
+"If this option is not set, any peer is allowed to connect. If the ID of a "
+"peer is listed here, connections from that peer will be refused. Specify "
+"the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:516
-msgid "If this option is not set, any peer is allowed to connect."
+#: contrib/config-daemon.scm:490
+msgid "Topology Maintenance"
msgstr ""
-#: contrib/config-daemon.scm:527
+#: contrib/config-daemon.scm:491
msgid "Rarely used settings for peer advertisements and connections"
msgstr ""
-#: contrib/config-daemon.scm:547
+#: contrib/config-daemon.scm:511
msgid "General settings"
msgstr ""
-#: contrib/config-daemon.scm:548
+#: contrib/config-daemon.scm:512
msgid "Settings that change the behavior of GNUnet in general"
msgstr ""
-#: contrib/config-daemon.scm:576
-msgid "Path settings"
+#: contrib/config-daemon.scm:536
+msgid "Modules"
msgstr ""
-#: contrib/config-daemon.scm:577
-msgid "Prefixes for paths used by GNUnet"
+#: contrib/config-daemon.scm:537
+msgid "Settings that select specific implementations for GNUnet modules"
msgstr ""
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:554
+msgid "Fundamentals"
+msgstr ""
+
+#: contrib/config-daemon.scm:574
msgid "Which database should be used?"
msgstr ""
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:576
msgid ""
"Which database should be used? The options are \"sqstore_sqlite\" and "
"\"sqstore_mysql\". You must run gnunet-update after changing this value!\n"
@@ -4316,11 +4359,11 @@
"is relatively simple. Read the file doc/README.mysql for how to setup mysql."
msgstr ""
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:589
msgid "Which topology should be used?"
msgstr ""
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:591
msgid ""
"Which topology should be used? The only options at the moment are "
"\"topology_default\" and \"topology_f2f\". In default mode, GNUnet will try "
@@ -4333,42 +4376,34 @@
"afraid of establishing (direct) connections to unknown peers."
msgstr ""
-#: contrib/config-daemon.scm:625
-msgid "Modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:626
-msgid "Settings that select specific implementations for GNUnet modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:607
msgid "List of friends for friend-to-friend topology"
msgstr ""
-#: contrib/config-daemon.scm:644
+#: contrib/config-daemon.scm:608
msgid ""
"Specifies the name of a file which contains a list of GNUnet peer IDs that "
"are friends. If used with the friend-to-friend topology, this will ensure "
"that GNUnet only connects to these peers (via any available transport)."
msgstr ""
-#: contrib/config-daemon.scm:658
+#: contrib/config-daemon.scm:622
msgid "Name of the MySQL database GNUnet should use"
msgstr ""
-#: contrib/config-daemon.scm:670
+#: contrib/config-daemon.scm:634
msgid "Configuration file that specifies the MySQL username and password"
msgstr ""
-#: contrib/config-daemon.scm:682
+#: contrib/config-daemon.scm:646
msgid "Configuration of the MySQL database"
msgstr ""
-#: contrib/config-daemon.scm:701
+#: contrib/config-daemon.scm:665
msgid "MB of diskspace GNUnet can use for anonymous file sharing"
msgstr ""
-#: contrib/config-daemon.scm:703
+#: contrib/config-daemon.scm:667
msgid ""
"How much disk space (MB) is GNUnet allowed to use for anonymous file "
"sharing? This does not take indexed files into account, only the space "
@@ -4379,19 +4414,19 @@
"Note that if you change the quota, you need to run gnunet-update afterwards."
msgstr ""
-#: contrib/config-daemon.scm:717
+#: contrib/config-daemon.scm:681
msgid "Size of the routing table for anonymous routing."
msgstr ""
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:693
msgid "Size of the routing table for DHT routing."
msgstr ""
-#: contrib/config-daemon.scm:742
+#: contrib/config-daemon.scm:706
msgid "Allow migrating content to this peer."
msgstr ""
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:708
msgid ""
"If you say yes here, GNUnet will migrate content to your server, and you "
"will not be able to control what data is stored on your machine. \n"
@@ -4403,13 +4438,13 @@
"can be considered liable for it."
msgstr ""
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:722
msgid ""
"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
"stored in /tmp)"
msgstr ""
-#: contrib/config-daemon.scm:759
+#: contrib/config-daemon.scm:723
msgid ""
"DHT index data is inherently small and expires comparatively quickly. It is "
"deleted whenever gnunetd is shut down.\n"
@@ -4417,19 +4452,19 @@
"The size of the DSTORE QUOTA is specified in MB."
msgstr ""
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:737
msgid "Options for anonymous file sharing"
msgstr ""
-#: contrib/config-daemon.scm:792
+#: contrib/config-daemon.scm:756
msgid "Applications"
msgstr ""
-#: contrib/config-daemon.scm:808
+#: contrib/config-daemon.scm:772
msgid "Is this machine unreachable behind a NAT?"
msgstr ""
-#: contrib/config-daemon.scm:809
+#: contrib/config-daemon.scm:773
msgid ""
"Set to YES if this machine is behind a NAT that limits connections from the "
"outside to the GNUnet port and that cannot be traversed using UPnP. Note "
@@ -4442,15 +4477,15 @@
"connections. Use YES only if you get no connections otherwise."
msgstr ""
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:784
msgid "Which port should be used by the TCP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
msgid "Should we try to determine our external IP using UPnP?"
msgstr ""
-#: contrib/config-daemon.scm:833
+#: contrib/config-daemon.scm:797
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4458,34 +4493,46 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
-#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
msgid "Which IPs are not allowed to connect?"
msgstr ""
-#: contrib/config-daemon.scm:856
+#: contrib/config-daemon.scm:820
msgid ""
"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
"network interface."
msgstr ""
-#: contrib/config-daemon.scm:868
+#: contrib/config-daemon.scm:832
msgid "TCP transport"
msgstr ""
-#: contrib/config-daemon.scm:886
+#: contrib/config-daemon.scm:850
msgid "Which port should be used by the HTTP transport?"
msgstr ""
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:862
+msgid "Which is the external port of the HTTP transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:863
+msgid ""
+"Use this option if your firewall maps say port 80 to your real HTTP port. "
+"This can be useful in making the HTTP messages appear even more legit "
+"(without the need for running gnunetd as root due to the use of a "
+"priviledged port)."
+msgstr ""
+
+#: contrib/config-daemon.scm:874
msgid "HTTP transport"
msgstr ""
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:889
msgid "Which port should be used by the UDP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:926
+#: contrib/config-daemon.scm:902
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4493,74 +4540,74 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:913
msgid "What is the maximum transfer unit for UDP?"
msgstr ""
-#: contrib/config-daemon.scm:961
+#: contrib/config-daemon.scm:937
msgid ""
"Which IPs are allowed to connect? Leave empty to allow connections from any "
"IP."
msgstr ""
-#: contrib/config-daemon.scm:973
+#: contrib/config-daemon.scm:949
msgid "UDP transport"
msgstr ""
-#: contrib/config-daemon.scm:992
+#: contrib/config-daemon.scm:968
msgid "Which port should be used by the TCP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
+#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
msgid ""
"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
msgstr ""
-#: contrib/config-daemon.scm:1028
+#: contrib/config-daemon.scm:1004
msgid "TCP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1021
msgid "Which port should be used by the UDP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1033
msgid "What is the maximum transfer unit for UDP 6?"
msgstr ""
-#: contrib/config-daemon.scm:1093
+#: contrib/config-daemon.scm:1069
msgid "UDP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1087
msgid "Network interface"
msgstr ""
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1099
msgid "External IP address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1135
+#: contrib/config-daemon.scm:1111
msgid "External IPv6 address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1147
+#: contrib/config-daemon.scm:1123
msgid "Transports"
msgstr ""
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1146
msgid "What is the maximum number of bytes per second that we may receive?"
msgstr ""
-#: contrib/config-daemon.scm:1182
+#: contrib/config-daemon.scm:1158
msgid "What is the maximum number of bytes per second that we may send?"
msgstr ""
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1170
msgid "What is the maximum CPU load (percentage)?"
msgstr ""
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1172
msgid ""
"Which CPU load can be tolerated. Load here always refers to the total "
"system load, that is it includes CPU utilization by other processes. A "
@@ -4570,11 +4617,11 @@
"Multiprocessors may use values above 100."
msgstr ""
-#: contrib/config-daemon.scm:1207
+#: contrib/config-daemon.scm:1183
msgid "What is the maximum IO load (permille)?"
msgstr ""
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1185
msgid ""
"Which IO load can be tolerated. Load here refers to the percentage of CPU "
"cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4584,36 +4631,36 @@
"values are typically between 10 and 75."
msgstr ""
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1196
msgid "What is the maximum CPU load (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1221
+#: contrib/config-daemon.scm:1197
msgid ""
"Which CPU load can be tolerated. This is the hard limit, so once it is "
"reached, gnunetd will start to massively drop data to reduce the load. Use "
"with caution."
msgstr ""
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1208
msgid "What is the maximum upstream bandwidth (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1233
+#: contrib/config-daemon.scm:1209
msgid ""
"The limit is given as a percentage of the MAXNETUPBPS limit. Use 100 to "
"have MAXNETUPBPS be the hard limit. Use zero for no limit."
msgstr ""
-#: contrib/config-daemon.scm:1244
+#: contrib/config-daemon.scm:1220
msgid "Should we disable random padding (experimental option)?"
msgstr ""
-#: contrib/config-daemon.scm:1256
+#: contrib/config-daemon.scm:1232
msgid "Use basic bandwidth limitation? (YES/NO). If in doubt, say YES."
msgstr ""
-#: contrib/config-daemon.scm:1258
+#: contrib/config-daemon.scm:1234
msgid ""
"Basic bandwidth limitation (YES) means simply that the bandwidth limits "
"specified apply to GNUnet and only to GNUnet. If set to YES, you simply "
@@ -4658,11 +4705,11 @@
"since it is irrelevant)."
msgstr ""
-#: contrib/config-daemon.scm:1275
+#: contrib/config-daemon.scm:1251
msgid "Network interface to monitor"
msgstr ""
-#: contrib/config-daemon.scm:1276
+#: contrib/config-daemon.scm:1252
msgid ""
"For which interfaces should we do accounting? GNUnet will evaluate the "
"total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -4673,11 +4720,11 @@
"number reported by 'gnunet-win-tool -n'."
msgstr ""
-#: contrib/config-daemon.scm:1287
+#: contrib/config-daemon.scm:1263
msgid "Load management"
msgstr ""
-#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
msgid "Root node"
msgstr ""
Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/po/de.po 2007-09-29 22:47:47 UTC (rev 5670)
@@ -3,11 +3,12 @@
# Copyright (C) 2004, 2005 Christian Grothoff
# This file is distributed under the same license as the GNUnet package.
# Christian Grothoff <address@hidden>, 2004, 2005.
+#: contrib/config-daemon.scm:555
msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-30 00:16-0600\n"
+"POT-Creation-Date: 2007-09-29 16:44-0600\n"
"PO-Revision-Date: 2006-03-17 21:37+0100\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -55,47 +56,66 @@
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/udp6.c:471 src/transports/udp.c:514
+#: src/transports/udp6.c:471 src/transports/udp.c:520
#, fuzzy, c-format
msgid "MTU %llu for `%s' is probably too low!\n"
msgstr ""
"MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
"implementiert!)\n"
-#: src/transports/http.c:522
+#: src/transports/udp6.c:476
+#, fuzzy
+msgid "# bytes received via UDP6"
+msgstr "# Bytes empfangen über UDP"
+
+#: src/transports/udp6.c:477
+#, fuzzy
+msgid "# bytes sent via UDP6"
+msgstr "# Bytes gesendet über UDP"
+
+#: src/transports/udp6.c:479
+#, fuzzy
+msgid "# bytes dropped by UDP6 (outgoing)"
+msgstr "# Bytes verworfen von UDP (outgoing)"
+
+#: src/transports/udp6.c:481
+msgid "# UDP6 connections (right now)"
+msgstr ""
+
+#: src/transports/http.c:824
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/http.c:813 src/transports/http.c:892
-#: src/transports/http.c:1007 src/transports/http.c:1147
-#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
-#: src/applications/bootstrap_http/http.c:115
-#: src/applications/bootstrap_http/http.c:247
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:294
-#: src/applications/bootstrap_http/http.c:313
-#: src/applications/bootstrap_http/http.c:326
-#: src/applications/bootstrap_http/http.c:336
-#: src/applications/bootstrap_http/http.c:346
+#: src/transports/http.c:1235 src/transports/http.c:1309
+#: src/transports/http.c:1464 src/transports/http.c:1858
+#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
+#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
+#: src/applications/bootstrap_http/http.c:254
+#: src/applications/bootstrap_http/http.c:270
+#: src/applications/bootstrap_http/http.c:301
+#: src/applications/bootstrap_http/http.c:320
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:343
+#: src/applications/bootstrap_http/http.c:353
#, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
-#: src/transports/http.c:1307
+#: src/transports/http.c:2080
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:1316
+#: src/transports/http.c:2089
msgid "# bytes received via HTTP"
msgstr "# Bytes empfangen über HTTP"
-#: src/transports/http.c:1317
+#: src/transports/http.c:2090
msgid "# bytes sent via HTTP"
msgstr "# Bytes gesendet über HTTP"
-#: src/transports/http.c:1319
+#: src/transports/http.c:2092
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# Bytes verworfen von HTTP"
@@ -146,62 +166,66 @@
"MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
"implementiert!)\n"
-#: src/transports/tcp.c:289
+#: src/transports/tcp.c:290
#, fuzzy
msgid "TCP: Could not determine my public IP address.\n"
msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/tcp.c:384
+#: src/transports/tcp.c:389
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-#: src/transports/tcp.c:437 src/transports/tcp6.c:404
+#: src/transports/tcp.c:442 src/transports/tcp6.c:404
#, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-#: src/transports/tcp.c:556
+#: src/transports/tcp.c:561
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"TCP\" to \"NO\"\n"
msgstr ""
-#: src/transports/tcp.c:565
+#: src/transports/tcp.c:570
msgid "# bytes received via TCP"
msgstr "# Bytes empfangen über TCP"
-#: src/transports/tcp.c:566
+#: src/transports/tcp.c:571
msgid "# bytes sent via TCP"
msgstr "# Bytes gesendet über TCP"
-#: src/transports/tcp.c:568
+#: src/transports/tcp.c:573
msgid "# bytes dropped by TCP (outgoing)"
msgstr "# Bytes verworfen von TCP (ausgehend)"
-#: src/transports/udp.c:287
+#: src/transports/udp.c:288
msgid "UDP: Could not determine my public IP address.\n"
msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/udp.c:378
+#: src/transports/udp.c:384
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
"Eine Nachricht der Größe %d konnte nicht per UDP an %u.%u.%u.%u:%u versendet "
"werden: %s\n"
-#: src/transports/udp.c:529
+#: src/transports/udp.c:535
msgid "# bytes received via UDP"
msgstr "# Bytes empfangen über UDP"
-#: src/transports/udp.c:530
+#: src/transports/udp.c:536
msgid "# bytes sent via UDP"
msgstr "# Bytes gesendet über UDP"
-#: src/transports/udp.c:532
+#: src/transports/udp.c:538
msgid "# bytes dropped by UDP (outgoing)"
msgstr "# Bytes verworfen von UDP (outgoing)"
+#: src/transports/udp.c:540
+msgid "# UDP connections (right now)"
+msgstr ""
+
#: src/transports/tcp6.c:245
msgid "Could not determine my public IPv6 address.\n"
msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
@@ -250,7 +274,7 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/udp_helper.c:94
+#: src/transports/udp_helper.c:96
#, fuzzy
msgid "Received malformed message from udp-peer connection. Closing.\n"
msgstr ""
@@ -268,42 +292,42 @@
"allow TIME ms to process a GET command or expire PUT content after ms TIME"
msgstr "TIME ms erlauben, um jedes Kommando zu bearbeiten"
-#: src/applications/dht/tools/dht-query.c:98
+#: src/applications/dht/tools/dht-query.c:99
#, c-format
msgid "%s(%s) operation returned no results.\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:115
+#: src/applications/dht/tools/dht-query.c:116
#, fuzzy, c-format
msgid "Issuing '%s(%s,%s)' command.\n"
msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
-#: src/applications/dht/tools/dht-query.c:122
+#: src/applications/dht/tools/dht-query.c:123
#, c-format
msgid "'%s(%s,%s)' succeeded\n"
msgstr "'%s(%s,%s)' erfolgreich abgeschlossen\n"
-#: src/applications/dht/tools/dht-query.c:126
+#: src/applications/dht/tools/dht-query.c:127
#, c-format
msgid "'%s(%s,%s)' failed.\n"
msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
-#: src/applications/dht/tools/dht-query.c:150
+#: src/applications/dht/tools/dht-query.c:151
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:164
#, c-format
msgid "Command `%s' requires an argument (`%s').\n"
msgstr "Kommando `%s' benötigt eine zusätzliche Angabe (`%s').\n"
-#: src/applications/dht/tools/dht-query.c:180
+#: src/applications/dht/tools/dht-query.c:181
#, c-format
msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
msgstr "Kommando `%s' benötigt zwei zusätzliche Angaben (`%s' und `%s').\n"
-#: src/applications/dht/tools/dht-query.c:191
+#: src/applications/dht/tools/dht-query.c:192
#, c-format
msgid "Unsupported command `%s'. Aborting.\n"
msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
@@ -514,7 +538,7 @@
msgstr "# Klartext PING Nachrichten gesendet"
#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:901
+#: src/applications/session/connect.c:913
#, c-format
msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
@@ -578,12 +602,12 @@
msgstr "# PING Nachrichten erstellt"
#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:896
+#: src/applications/session/connect.c:908
msgid "# encrypted PONG messages sent"
msgstr "# verschlüsselter PONG Nachrichten gesendet"
#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:894
+#: src/applications/session/connect.c:906
msgid "# encrypted PING messages sent"
msgstr "# verschlüsselter PING Nachrichten gesendet"
@@ -606,33 +630,34 @@
#: src/applications/sqstore_sqlite/sqlite.c:54
#: src/applications/sqstore_mysql/mysql.c:145
#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:428
-#: src/applications/sqstore_mysql/mysql.c:438
-#: src/applications/sqstore_mysql/mysql.c:476
-#: src/applications/sqstore_mysql/mysql.c:486
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:529
-#: src/applications/sqstore_mysql/mysql.c:627
-#: src/applications/sqstore_mysql/mysql.c:639
-#: src/applications/sqstore_mysql/mysql.c:651
-#: src/applications/sqstore_mysql/mysql.c:665
-#: src/applications/sqstore_mysql/mysql.c:762
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:917
-#: src/applications/sqstore_mysql/mysql.c:929
-#: src/applications/sqstore_mysql/mysql.c:941
-#: src/applications/sqstore_mysql/mysql.c:1184
-#: src/applications/sqstore_mysql/mysql.c:1196
-#: src/applications/sqstore_mysql/mysql.c:1208
-#: src/applications/sqstore_mysql/mysql.c:1293
+#: src/applications/sqstore_mysql/mysql.c:468
+#: src/applications/sqstore_mysql/mysql.c:478
+#: src/applications/sqstore_mysql/mysql.c:516
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:558
+#: src/applications/sqstore_mysql/mysql.c:569
+#: src/applications/sqstore_mysql/mysql.c:667
+#: src/applications/sqstore_mysql/mysql.c:679
+#: src/applications/sqstore_mysql/mysql.c:691
+#: src/applications/sqstore_mysql/mysql.c:705
+#: src/applications/sqstore_mysql/mysql.c:802
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:965
+#: src/applications/sqstore_mysql/mysql.c:977
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1229
+#: src/applications/sqstore_mysql/mysql.c:1241
+#: src/applications/sqstore_mysql/mysql.c:1253
+#: src/applications/sqstore_mysql/mysql.c:1338
#: src/applications/kvstore_sqlite/kv_sqlite.c:44
#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
-#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
-#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
-#: src/util/crypto/hostkey_gcrypt.c:71
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
+#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
+#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
+#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
+#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
#, c-format
msgid "`%s' failed at %s:%d with error: %s\n"
msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -648,17 +673,17 @@
msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:416
+#: src/applications/sqstore_sqlite/sqlite.c:431
msgid "sqlite datastore"
msgstr "sqlite Datenspeicher"
-#: src/applications/sqstore_sqlite/sqlite.c:415
+#: src/applications/sqstore_sqlite/sqlite.c:430
#, c-format
msgid "Invalid data in %s. Trying to fix (by deletion).\n"
msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
-#: src/applications/sqstore_sqlite/sqlite.c:1206
-#: src/applications/sqstore_mysql/mysql.c:1401
+#: src/applications/sqstore_sqlite/sqlite.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1446
msgid "# bytes in datastore"
msgstr "# bytes in der Datenbank"
@@ -685,24 +710,24 @@
msgid "Session key received from peer `%s' has invalid format (discarded).\n"
msgstr "Empfangene Nachricht ist ungültig.\n"
-#: src/applications/session/connect.c:614
+#: src/applications/session/connect.c:624
#, fuzzy, c-format
msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
msgstr "Empfangene Nachricht ist ungültig.\n"
-#: src/applications/session/connect.c:646
+#: src/applications/session/connect.c:656
#, c-format
msgid "Invalid `%s' message received from peer `%s'.\n"
msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
-#: src/applications/session/connect.c:656
+#: src/applications/session/connect.c:666
#, c-format
msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
msgstr ""
"setkey `%s' von `%s' hat eine ungültige CRC Prüfsumme (tatsächlich: %u, "
"erwartet: %u).\n"
-#: src/applications/session/connect.c:719
+#: src/applications/session/connect.c:729
#, fuzzy, c-format
msgid ""
"Error parsing encrypted session key from `%s', given message part size is "
@@ -711,24 +736,24 @@
"Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
"Nachrichtenteilgröße ist ungültig.\n"
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:741
#, fuzzy, c-format
msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
msgstr "Unbekannter Typ in engebetteter Nachricht: %u (%u bytes)\n"
-#: src/applications/session/connect.c:886
+#: src/applications/session/connect.c:898
msgid "# session keys sent"
msgstr "# Sitzungsschlüssel gesendet"
-#: src/applications/session/connect.c:888
+#: src/applications/session/connect.c:900
msgid "# session keys rejected"
msgstr "# Sitzungsschlüssel abgelehnt"
-#: src/applications/session/connect.c:890
+#: src/applications/session/connect.c:902
msgid "# session keys accepted"
msgstr "# Sitzungsschlüssel akzeptiert"
-#: src/applications/session/connect.c:892
+#: src/applications/session/connect.c:904
msgid "# sessions established"
msgstr "# Sitzungen aufgebaut"
@@ -800,24 +825,24 @@
msgid "async RPC reply not received.\n"
msgstr "async RPC Antwort nicht empfangen.\n"
-#: src/applications/sqstore_mysql/mysql.c:379
+#: src/applications/sqstore_mysql/mysql.c:419
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error: %s"
msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-#: src/applications/sqstore_mysql/mysql.c:1311
+#: src/applications/sqstore_mysql/mysql.c:1356
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-#: src/applications/sqstore_mysql/mysql.c:1423
-#: src/applications/sqstore_mysql/mysql.c:1570
+#: src/applications/sqstore_mysql/mysql.c:1468
+#: src/applications/sqstore_mysql/mysql.c:1615
#, c-format
msgid "Trying to use file `%s' for MySQL configuration.\n"
msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
-#: src/applications/sqstore_mysql/mysql.c:1448
-#: src/applications/sqstore_mysql/mysql.c:1593
+#: src/applications/sqstore_mysql/mysql.c:1493
+#: src/applications/sqstore_mysql/mysql.c:1638
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -1008,7 +1033,7 @@
msgstr "unterstützte Client-Server Nachrichten:\n"
#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:52
+#: src/applications/vpn/gnunet-vpn.c:53
msgid "Print statistics about GNUnet operations."
msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
@@ -1020,7 +1045,7 @@
#: src/applications/tbench/gnunet-tbench.c:127
#: src/applications/tracekit/gnunet-tracekit.c:315
#: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:148
+#: src/applications/vpn/gnunet-vpn.c:149
#, c-format
msgid "Error establishing connection with gnunetd.\n"
msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
@@ -2079,16 +2104,16 @@
msgid "enables (anonymous) file-sharing"
msgstr "Ermöglicht (anonymes) Filesharing"
-#: src/applications/fs/module/migration.c:312
+#: src/applications/fs/module/migration.c:374
msgid "# blocks migrated"
msgstr "# Blöcke migriert"
-#: src/applications/fs/module/migration.c:314
+#: src/applications/fs/module/migration.c:376
#, fuzzy
msgid "# blocks fetched for migration"
msgstr "# Blöcke migriert"
-#: src/applications/fs/module/migration.c:317
+#: src/applications/fs/module/migration.c:379
msgid "# on-demand block migration attempts"
msgstr ""
@@ -2293,31 +2318,31 @@
msgid "Template description."
msgstr ""
-#: src/applications/bootstrap_http/http.c:102
+#: src/applications/bootstrap_http/http.c:109
#, fuzzy, c-format
msgid "Bootstrap data obtained from `%s' is invalid.\n"
msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
-#: src/applications/bootstrap_http/http.c:170
+#: src/applications/bootstrap_http/http.c:177
msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:210
+#: src/applications/bootstrap_http/http.c:217
#, c-format
msgid "Bootstrapping using `%s'.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:224
+#: src/applications/bootstrap_http/http.c:231
#, fuzzy, c-format
msgid "Trying to download hostlist from `%s'\n"
msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-#: src/applications/bootstrap_http/http.c:352
+#: src/applications/bootstrap_http/http.c:359
#, fuzzy, c-format
msgid "Downloaded %llu bytes from `%s'.\n"
msgstr "Dateien aus dem GNUnet herunterladen."
-#: src/applications/bootstrap_http/http.c:385
+#: src/applications/bootstrap_http/http.c:392
#, fuzzy
msgid "# HELLOs downloaded via http"
msgstr "# Hellos per HTTP heruntergeladen"
@@ -2341,7 +2366,7 @@
msgid "tracks bandwidth utilization by gnunetd"
msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
-#: src/applications/vpn/gnunet-vpn.c:56
+#: src/applications/vpn/gnunet-vpn.c:57
msgid "Suppress display of asynchronous log messages"
msgstr ""
@@ -2561,35 +2586,35 @@
msgid "No"
msgstr "Nein"
-#: src/applications/vpn/vpn.c:1647
+#: src/applications/vpn/vpn.c:1651
#, fuzzy, c-format
msgid "`%s' initialising RFC4913 module %d and %d\n"
msgstr "`%s' registriert Handler %d und %d\n"
-#: src/applications/vpn/vpn.c:1650
+#: src/applications/vpn/vpn.c:1654
#, c-format
msgid "RFC4193 my First 4 hex digits of host id are %x\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1723
+#: src/applications/vpn/vpn.c:1727
#, fuzzy
msgid "enables IPv6 over GNUnet (incomplete)"
msgstr "Ermöglicht P2P-Chat"
-#: src/applications/vpn/vpn.c:1757
+#: src/applications/vpn/vpn.c:1761
msgid "RFC4193 Waiting for tun thread to end\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1771
+#: src/applications/vpn/vpn.c:1775
msgid "RFC4193 The tun thread has ended\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1788
+#: src/applications/vpn/vpn.c:1792
#, c-format
msgid "RFC4193 Closing tunnel %d fd %d\n"
msgstr ""
-#: src/applications/dstore/dstore.c:466
+#: src/applications/dstore/dstore.c:525
#, fuzzy
msgid "# bytes in dstore"
msgstr "# bytes in der Datenbank"
@@ -2618,7 +2643,7 @@
msgid "Updates GNUnet datastructures after version change."
msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
msgid "run as user LOGIN"
msgstr "als Benutzer LOGIN ausführen"
@@ -2628,92 +2653,101 @@
"Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
"zu holen"
-#: src/server/connection.c:1188
+#: src/server/connection.c:1202
#, c-format
msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
msgstr "`%s' wählte %d von %d Nachrichten aus (MTU: %d).\n"
-#: src/server/connection.c:1197
+#: src/server/connection.c:1211
#, c-format
msgid "Message details: %u: length %d, priority: %d\n"
msgstr "Nachrichten Details: %u: Länge %d, Priorität: %d\n"
-#: src/server/connection.c:2744
+#: src/server/connection.c:2897
#, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
-#: src/server/connection.c:2829
+#: src/server/connection.c:2982
#, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr "Ungültige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
-#: src/server/connection.c:2851
+#: src/server/connection.c:3004
msgid "Message received more than one day old. Dropped.\n"
msgstr ""
"Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
-#: src/server/connection.c:3337
+#: src/server/connection.c:3500
msgid "# outgoing messages dropped"
msgstr "# ausgehender Nachrichten verworfen"
-#: src/server/connection.c:3340
+#: src/server/connection.c:3503
msgid "# bytes of outgoing messages dropped"
msgstr "# Bytes ausgehender Nachrichten verworfen"
-#: src/server/connection.c:3342
+#: src/server/connection.c:3505
msgid "# connections closed (HANGUP sent)"
msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
-#: src/server/connection.c:3345
+#: src/server/connection.c:3509
+#, fuzzy
+msgid "# connections closed (transport issue)"
+msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
+
+#: src/server/connection.c:3512
msgid "# bytes encrypted"
msgstr "# Bytes verschlüsselt"
-#: src/server/connection.c:3349
+#: src/server/connection.c:3516
#, fuzzy
msgid "# bytes transmitted"
msgstr "# Bytes des Typs %d übertragen"
-#: src/server/connection.c:3353
+#: src/server/connection.c:3520
#, fuzzy
msgid "# bytes received"
msgstr "# Bytes empfangen über TCP"
-#: src/server/connection.c:3355
+#: src/server/connection.c:3522
msgid "# bytes decrypted"
msgstr "# Bytes entschlüsselt"
-#: src/server/connection.c:3356
+#: src/server/connection.c:3523
msgid "# bytes noise sent"
msgstr "# Bytes Rauschen gesendet"
-#: src/server/connection.c:3359
+#: src/server/connection.c:3526
msgid "# total bytes per second send limit"
msgstr ""
-#: src/server/connection.c:3362
+#: src/server/connection.c:3529
#, fuzzy
msgid "# total bytes per second receive limit"
msgstr "# Bytes Rauschen empfangen"
-#: src/server/connection.c:3365
+#: src/server/connection.c:3532
#, fuzzy
msgid "# total number of messages in send buffers"
msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
-#: src/server/connection.c:3369
+#: src/server/connection.c:3536
msgid "# total number of bytes we were allowed to sent but did not"
msgstr ""
-#: src/server/connection.c:3373
+#: src/server/connection.c:3540
#, fuzzy
msgid "# total number of bytes we were allowed to sent"
msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
-#: src/server/connection.c:3377
+#: src/server/connection.c:3544
msgid "# total number of bytes we are currently allowed to send"
msgstr ""
+#: src/server/connection.c:3547
+msgid "# transports switched to stream transport"
+msgstr ""
+
#: src/server/startup.c:206
#, fuzzy, c-format
msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -2824,32 +2858,32 @@
msgid "Could not properly unload service `%s'!\n"
msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
-#: src/server/gnunet-transport-check.c:121
+#: src/server/gnunet-transport-check.c:122
#, c-format
msgid "`%s': Could not create hello.\n"
msgstr "`%s': Hello konnte nicht erzeugt werden.\n"
-#: src/server/gnunet-transport-check.c:128
+#: src/server/gnunet-transport-check.c:129
#, c-format
msgid "`%s': Could not connect.\n"
msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
-#: src/server/gnunet-transport-check.c:157
+#: src/server/gnunet-transport-check.c:161
#, c-format
msgid "`%s': Could not send.\n"
msgstr "`%s': Kann nicht senden.\n"
-#: src/server/gnunet-transport-check.c:172
+#: src/server/gnunet-transport-check.c:176
#, c-format
msgid "`%s': Did not receive message within %llu ms.\n"
msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
-#: src/server/gnunet-transport-check.c:185
+#: src/server/gnunet-transport-check.c:189
#, c-format
msgid "`%s': Could not disconnect.\n"
msgstr "`%s': Verbindung konnte nicht getrennt werden.\n"
-#: src/server/gnunet-transport-check.c:192
+#: src/server/gnunet-transport-check.c:196
#, fuzzy, c-format
msgid ""
"`%s' transport OK. It took %ums to transmit %llu messages of %llu bytes "
@@ -2858,12 +2892,12 @@
"`%s' Transport funktioniert. Es dauerte %ums, um %d Nachrichten zu je %d "
"Bytes zu übertragen.\n"
-#: src/server/gnunet-transport-check.c:222
+#: src/server/gnunet-transport-check.c:226
#, fuzzy, c-format
msgid " Transport %d is not being tested\n"
msgstr " Transport %d ist nicht verfügbar\n"
-#: src/server/gnunet-transport-check.c:251
+#: src/server/gnunet-transport-check.c:255
#, c-format
msgid ""
"\n"
@@ -2872,67 +2906,67 @@
"\n"
"Kontaktiere `%s'."
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:280
#, c-format
msgid " Connection failed\n"
msgstr " Verbindung fehlgeschlagen\n"
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:286
#, c-format
msgid " Connection failed (bug?)\n"
msgstr " Verbindung fehlgeschlagen (Bug?)\n"
-#: src/server/gnunet-transport-check.c:319
+#: src/server/gnunet-transport-check.c:323
#, c-format
msgid "Timeout after %llums.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:321
+#: src/server/gnunet-transport-check.c:325
#, fuzzy, c-format
msgid "OK!\n"
msgstr "OK"
-#: src/server/gnunet-transport-check.c:346
+#: src/server/gnunet-transport-check.c:350
msgid "Tool to test if GNUnet transport services are operational."
msgstr ""
"Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport Dienste "
"funktionsfähig sind."
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:354
msgid "ping peers from HOSTLISTURL that match transports"
msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
-#: src/server/gnunet-transport-check.c:353
+#: src/server/gnunet-transport-check.c:357
msgid "send COUNT messages"
msgstr "COUNT Nachrichten versenden"
-#: src/server/gnunet-transport-check.c:356
+#: src/server/gnunet-transport-check.c:360
msgid "send messages with SIZE bytes payload"
msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
-#: src/server/gnunet-transport-check.c:359
+#: src/server/gnunet-transport-check.c:363
msgid "specifies which TRANSPORT should be tested"
msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
-#: src/server/gnunet-transport-check.c:362
+#: src/server/gnunet-transport-check.c:366
msgid "specifies after how many MS to time-out"
msgstr "Gibt an, nach wievielen MS die Zeit abgelaufen sein soll"
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:374
msgid "repeat each test X times"
msgstr ""
-#: src/server/gnunet-transport-check.c:431
+#: src/server/gnunet-transport-check.c:435
#, c-format
msgid "Testing transport(s) %s\n"
msgstr "Teste Transport(e) %s\n"
-#: src/server/gnunet-transport-check.c:433
+#: src/server/gnunet-transport-check.c:437
#, c-format
msgid "Available transport(s): %s\n"
msgstr "Verfügbare(r) Transport(e): %s\n"
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:478
#, fuzzy, c-format
msgid ""
"\n"
@@ -3047,12 +3081,12 @@
msgstr ""
"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
-#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
+#: src/util/os/statuscalls.c:195 src/util/os/statuscalls.c:336
#, fuzzy, c-format
msgid "Failed to parse interface data from `%s'.\n"
msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
+#: src/util/os/statuscalls.c:379 src/util/os/statuscalls.c:389
#, c-format
msgid ""
"No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -4248,12 +4282,18 @@
msgstr "Gibt an, auf welchem Host gnunetd läuft"
#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
-#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
-#: src/include/gnunet_util_error.h:236
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:236
#, fuzzy, c-format
msgid "Internal error: assertion failed at %s:%d in %s.\n"
msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+#: src/include/gnunet_util_error.h:230
+#, c-format
+msgid ""
+"External protocol violation: assertion failed at %s:%d in %s (no need to "
+"panic, we can handle this).\n"
+msgstr ""
+
#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
#, fuzzy, c-format
msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
@@ -4399,23 +4439,23 @@
"configuration here. Default is no proxy."
msgstr ""
-#: contrib/config-daemon.scm:237 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
msgid "How long should logs be kept?"
msgstr ""
-#: contrib/config-daemon.scm:239 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
msgid ""
"How long should logs be kept? If you specify a value greater than zero, a "
"log is created each day with the date appended to its filename. These logs "
"are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
msgstr ""
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:237
msgid ""
"What maximum number of open file descriptors should be requested from the OS?"
msgstr ""
-#: contrib/config-daemon.scm:252
+#: contrib/config-daemon.scm:239
msgid ""
"The default of 1024 should be fine for most systems. If your system can "
"support more, increasing the number might help support additional clients on "
@@ -4427,65 +4467,62 @@
"run with what it is given."
msgstr ""
-#: contrib/config-daemon.scm:263
+#: contrib/config-daemon.scm:250
msgid "Where should gnunetd write the logs?"
msgstr ""
-#: contrib/config-daemon.scm:275 contrib/config-client.scm:169
-#, fuzzy
-msgid "Configuration of the logging system"
+#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+msgid "Logging"
msgstr ""
-"Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
-"ausführen!\n"
-#: contrib/config-daemon.scm:276 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
msgid "Specify which system messages should be logged how"
msgstr ""
-#: contrib/config-daemon.scm:280 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
msgid "Logging of events for users"
msgstr ""
-#: contrib/config-daemon.scm:281 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
msgid "Logging of events for the system administrator"
msgstr ""
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:280
msgid "Where should gnunetd write the PID?"
msgstr ""
-#: contrib/config-daemon.scm:294
+#: contrib/config-daemon.scm:281
msgid ""
"The default is no longer /var/run/gnunetd.pid since we could not delete the "
"file on shutdown at that location."
msgstr ""
-#: contrib/config-daemon.scm:306
+#: contrib/config-daemon.scm:293
msgid "As which user should gnunetd run?"
msgstr ""
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:295
msgid ""
"Empty means \"current user\". On computer startup, it is root/SYSTEM. Under "
"Windows, this setting affects the creation of a new system service only."
msgstr ""
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:308
msgid "Should gnunetd be automatically started when the system boots?"
msgstr ""
-#: contrib/config-daemon.scm:322
+#: contrib/config-daemon.scm:309
msgid ""
"Set to YES if gnunetd should be automatically started on boot. If this "
"option is set, gnunet-setup will install a script to start the daemon upon "
"completion. This option may not work on all systems."
msgstr ""
-#: contrib/config-daemon.scm:334
+#: contrib/config-daemon.scm:321
msgid "Which transport mechanisms should GNUnet use?"
msgstr ""
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:323
msgid ""
"Use space-separated list of the modules, e.g. \"udp smtp tcp\". The "
"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4499,11 +4536,11 @@
"itself."
msgstr ""
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:337
msgid "Which applications should gnunetd support?"
msgstr ""
-#: contrib/config-daemon.scm:352
+#: contrib/config-daemon.scm:339
msgid ""
"Whenever this option is changed, you MUST run gnunet-update. Currently, the "
"available applications are:\n"
@@ -4540,15 +4577,24 @@
"compromise your anonymity."
msgstr ""
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:368
msgid "Disable client-server connections"
msgstr ""
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:369
+msgid ""
+"This option can be used to tell gnunetd not to open the client port. When "
+"run like this, gnunetd will participate as a peer in the network but not "
+"support any user interfaces. This maybe useful for headless systems that "
+"are never expected to have end-user interactions. Note that this will also "
+"prevent you from running diagnostic tools like gnunet-stats!"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
msgid "Disable peer discovery"
msgstr ""
-#: contrib/config-daemon.scm:394
+#: contrib/config-daemon.scm:382
msgid ""
"The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
"peer to peers of which the hostkey has been copied by hand to data/hosts; "
@@ -4560,15 +4606,15 @@
"lines above would need some minor editing :-)."
msgstr ""
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:393
msgid "Disable advertising this peer to other peers"
msgstr ""
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:405
msgid "Disable automatic establishment of connections"
msgstr ""
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:406
msgid ""
"If this option is enabled, GNUnet will not automatically establish "
"connections to other peers, but instead wait for applications to "
@@ -4576,21 +4622,22 @@
"connect to us)."
msgstr ""
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:417
msgid "Disable advertising of other peers by this peer"
msgstr ""
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:418
msgid ""
"This option maybe useful during testing, but turning it off is dangerous! If "
"in any doubt, set it to YES (which is the default)."
msgstr ""
-#: contrib/config-daemon.scm:441
-msgid "Client/Server Port"
-msgstr ""
+#: contrib/config-daemon.scm:429
+#, fuzzy
+msgid "Port for communication with GNUnet user interfaces"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:430
msgid ""
"Which is the client-server port that is used between gnunetd and the clients "
"(TCP only). You may firewall this port for non-local machines (but you do "
@@ -4598,11 +4645,11 @@
"connections from machines that are listed under TRUSTED)."
msgstr ""
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:441
msgid "IPs allowed to use gnunetd server"
msgstr ""
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:442
msgid ""
"This option specifies which hosts are trusted enough to connect as clients "
"(to the TCP port). This is useful if you run gnunetd on one host of your "
@@ -4613,76 +4660,71 @@
"separated by a semicolon, spaces are not allowed."
msgstr ""
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:454
msgid "Limit connections to the specfied set of peers."
msgstr ""
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:455
msgid ""
"If this option is not set, any peer is allowed to connect. If it is set, "
-"only the specified peers are allowed."
+"only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:466
#, fuzzy
-msgid "Run gnunetd as this user."
-msgstr "gnunet-update ausführen"
-
-#: contrib/config-daemon.scm:479
-msgid ""
-"When started as root, gnunetd will change permissions to the given user."
-msgstr ""
-
-#: contrib/config-daemon.scm:490
-#, fuzzy
msgid "Run gnunetd as this group."
msgstr "gnunet-update ausführen"
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:467
msgid ""
"When started as root, gnunetd will change permissions to the given group."
msgstr ""
-#: contrib/config-daemon.scm:502
-#, fuzzy
-msgid "Run gnunetd during system startup?"
-msgstr "gnunet-update ausführen"
-
-#: contrib/config-daemon.scm:515
+#: contrib/config-daemon.scm:478
msgid "Prevent the specfied set of peers from connecting."
msgstr ""
-#: contrib/config-daemon.scm:516
-msgid "If this option is not set, any peer is allowed to connect."
+#: contrib/config-daemon.scm:479
+msgid ""
+"If this option is not set, any peer is allowed to connect. If the ID of a "
+"peer is listed here, connections from that peer will be refused. Specify "
+"the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:527
+#: contrib/config-daemon.scm:490
+msgid "Topology Maintenance"
+msgstr ""
+
+#: contrib/config-daemon.scm:491
msgid "Rarely used settings for peer advertisements and connections"
msgstr ""
-#: contrib/config-daemon.scm:547
+#: contrib/config-daemon.scm:511
#, fuzzy
msgid "General settings"
msgstr "Weitere Einstellungen"
-#: contrib/config-daemon.scm:548
+#: contrib/config-daemon.scm:512
msgid "Settings that change the behavior of GNUnet in general"
msgstr ""
-#: contrib/config-daemon.scm:576
-#, fuzzy
-msgid "Path settings"
-msgstr "Weitere Einstellungen"
+#: contrib/config-daemon.scm:536
+msgid "Modules"
+msgstr ""
-#: contrib/config-daemon.scm:577
-msgid "Prefixes for paths used by GNUnet"
+#: contrib/config-daemon.scm:537
+msgid "Settings that select specific implementations for GNUnet modules"
msgstr ""
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:554
+msgid "Fundamentals"
+msgstr ""
+
+#: contrib/config-daemon.scm:574
msgid "Which database should be used?"
msgstr ""
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:576
msgid ""
"Which database should be used? The options are \"sqstore_sqlite\" and "
"\"sqstore_mysql\". You must run gnunet-update after changing this value!\n"
@@ -4691,11 +4733,11 @@
"is relatively simple. Read the file doc/README.mysql for how to setup mysql."
msgstr ""
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:589
msgid "Which topology should be used?"
msgstr ""
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:591
msgid ""
"Which topology should be used? The only options at the moment are "
"\"topology_default\" and \"topology_f2f\". In default mode, GNUnet will try "
@@ -4708,49 +4750,41 @@
"afraid of establishing (direct) connections to unknown peers."
msgstr ""
-#: contrib/config-daemon.scm:625
-msgid "Modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:626
-msgid "Settings that select specific implementations for GNUnet modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:607
msgid "List of friends for friend-to-friend topology"
msgstr ""
-#: contrib/config-daemon.scm:644
+#: contrib/config-daemon.scm:608
msgid ""
"Specifies the name of a file which contains a list of GNUnet peer IDs that "
"are friends. If used with the friend-to-friend topology, this will ensure "
"that GNUnet only connects to these peers (via any available transport)."
msgstr ""
-#: contrib/config-daemon.scm:658
+#: contrib/config-daemon.scm:622
msgid "Name of the MySQL database GNUnet should use"
msgstr ""
-#: contrib/config-daemon.scm:670
+#: contrib/config-daemon.scm:634
#, fuzzy
msgid "Configuration file that specifies the MySQL username and password"
msgstr ""
"Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
"ausführen!\n"
-#: contrib/config-daemon.scm:682
+#: contrib/config-daemon.scm:646
#, fuzzy
msgid "Configuration of the MySQL database"
msgstr ""
"Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
"ausführen!\n"
-#: contrib/config-daemon.scm:701
+#: contrib/config-daemon.scm:665
#, fuzzy
msgid "MB of diskspace GNUnet can use for anonymous file sharing"
msgstr "Ermöglicht (anonymes) Filesharing"
-#: contrib/config-daemon.scm:703
+#: contrib/config-daemon.scm:667
msgid ""
"How much disk space (MB) is GNUnet allowed to use for anonymous file "
"sharing? This does not take indexed files into account, only the space "
@@ -4761,19 +4795,19 @@
"Note that if you change the quota, you need to run gnunet-update afterwards."
msgstr ""
-#: contrib/config-daemon.scm:717
+#: contrib/config-daemon.scm:681
msgid "Size of the routing table for anonymous routing."
msgstr ""
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:693
msgid "Size of the routing table for DHT routing."
msgstr ""
-#: contrib/config-daemon.scm:742
+#: contrib/config-daemon.scm:706
msgid "Allow migrating content to this peer."
msgstr ""
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:708
msgid ""
"If you say yes here, GNUnet will migrate content to your server, and you "
"will not be able to control what data is stored on your machine. \n"
@@ -4785,13 +4819,13 @@
"can be considered liable for it."
msgstr ""
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:722
msgid ""
"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
"stored in /tmp)"
msgstr ""
-#: contrib/config-daemon.scm:759
+#: contrib/config-daemon.scm:723
msgid ""
"DHT index data is inherently small and expires comparatively quickly. It is "
"deleted whenever gnunetd is shut down.\n"
@@ -4799,21 +4833,21 @@
"The size of the DSTORE QUOTA is specified in MB."
msgstr ""
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:737
#, fuzzy
msgid "Options for anonymous file sharing"
msgstr "Ermöglicht (anonymes) Filesharing"
-#: contrib/config-daemon.scm:792
+#: contrib/config-daemon.scm:756
#, fuzzy
msgid "Applications"
msgstr "_Optionen"
-#: contrib/config-daemon.scm:808
+#: contrib/config-daemon.scm:772
msgid "Is this machine unreachable behind a NAT?"
msgstr ""
-#: contrib/config-daemon.scm:809
+#: contrib/config-daemon.scm:773
msgid ""
"Set to YES if this machine is behind a NAT that limits connections from the "
"outside to the GNUnet port and that cannot be traversed using UPnP. Note "
@@ -4826,15 +4860,15 @@
"connections. Use YES only if you get no connections otherwise."
msgstr ""
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:784
msgid "Which port should be used by the TCP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
msgid "Should we try to determine our external IP using UPnP?"
msgstr ""
-#: contrib/config-daemon.scm:833
+#: contrib/config-daemon.scm:797
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4842,34 +4876,46 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
-#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
msgid "Which IPs are not allowed to connect?"
msgstr ""
-#: contrib/config-daemon.scm:856
+#: contrib/config-daemon.scm:820
msgid ""
"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
"network interface."
msgstr ""
-#: contrib/config-daemon.scm:868
+#: contrib/config-daemon.scm:832
msgid "TCP transport"
msgstr ""
-#: contrib/config-daemon.scm:886
+#: contrib/config-daemon.scm:850
msgid "Which port should be used by the HTTP transport?"
msgstr ""
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:862
+msgid "Which is the external port of the HTTP transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:863
+msgid ""
+"Use this option if your firewall maps say port 80 to your real HTTP port. "
+"This can be useful in making the HTTP messages appear even more legit "
+"(without the need for running gnunetd as root due to the use of a "
+"priviledged port)."
+msgstr ""
+
+#: contrib/config-daemon.scm:874
msgid "HTTP transport"
msgstr ""
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:889
msgid "Which port should be used by the UDP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:926
+#: contrib/config-daemon.scm:902
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4877,75 +4923,75 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:913
msgid "What is the maximum transfer unit for UDP?"
msgstr ""
-#: contrib/config-daemon.scm:961
+#: contrib/config-daemon.scm:937
msgid ""
"Which IPs are allowed to connect? Leave empty to allow connections from any "
"IP."
msgstr ""
-#: contrib/config-daemon.scm:973
+#: contrib/config-daemon.scm:949
msgid "UDP transport"
msgstr ""
-#: contrib/config-daemon.scm:992
+#: contrib/config-daemon.scm:968
msgid "Which port should be used by the TCP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
+#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
msgid ""
"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
msgstr ""
-#: contrib/config-daemon.scm:1028
+#: contrib/config-daemon.scm:1004
msgid "TCP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1021
msgid "Which port should be used by the UDP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1033
msgid "What is the maximum transfer unit for UDP 6?"
msgstr ""
-#: contrib/config-daemon.scm:1093
+#: contrib/config-daemon.scm:1069
msgid "UDP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1087
#, fuzzy
msgid "Network interface"
msgstr "Netzwerkgerät:"
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1099
msgid "External IP address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1135
+#: contrib/config-daemon.scm:1111
msgid "External IPv6 address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1147
+#: contrib/config-daemon.scm:1123
msgid "Transports"
msgstr ""
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1146
msgid "What is the maximum number of bytes per second that we may receive?"
msgstr ""
-#: contrib/config-daemon.scm:1182
+#: contrib/config-daemon.scm:1158
msgid "What is the maximum number of bytes per second that we may send?"
msgstr ""
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1170
msgid "What is the maximum CPU load (percentage)?"
msgstr ""
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1172
msgid ""
"Which CPU load can be tolerated. Load here always refers to the total "
"system load, that is it includes CPU utilization by other processes. A "
@@ -4955,11 +5001,11 @@
"Multiprocessors may use values above 100."
msgstr ""
-#: contrib/config-daemon.scm:1207
+#: contrib/config-daemon.scm:1183
msgid "What is the maximum IO load (permille)?"
msgstr ""
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1185
msgid ""
"Which IO load can be tolerated. Load here refers to the percentage of CPU "
"cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4969,36 +5015,36 @@
"values are typically between 10 and 75."
msgstr ""
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1196
msgid "What is the maximum CPU load (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1221
+#: contrib/config-daemon.scm:1197
msgid ""
"Which CPU load can be tolerated. This is the hard limit, so once it is "
"reached, gnunetd will start to massively drop data to reduce the load. Use "
"with caution."
msgstr ""
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1208
msgid "What is the maximum upstream bandwidth (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1233
+#: contrib/config-daemon.scm:1209
msgid ""
"The limit is given as a percentage of the MAXNETUPBPS limit. Use 100 to "
"have MAXNETUPBPS be the hard limit. Use zero for no limit."
msgstr ""
-#: contrib/config-daemon.scm:1244
+#: contrib/config-daemon.scm:1220
msgid "Should we disable random padding (experimental option)?"
msgstr ""
-#: contrib/config-daemon.scm:1256
+#: contrib/config-daemon.scm:1232
msgid "Use basic bandwidth limitation? (YES/NO). If in doubt, say YES."
msgstr ""
-#: contrib/config-daemon.scm:1258
+#: contrib/config-daemon.scm:1234
msgid ""
"Basic bandwidth limitation (YES) means simply that the bandwidth limits "
"specified apply to GNUnet and only to GNUnet. If set to YES, you simply "
@@ -5043,12 +5089,12 @@
"since it is irrelevant)."
msgstr ""
-#: contrib/config-daemon.scm:1275
+#: contrib/config-daemon.scm:1251
#, fuzzy
msgid "Network interface to monitor"
msgstr "Netzwerkgerät:"
-#: contrib/config-daemon.scm:1276
+#: contrib/config-daemon.scm:1252
msgid ""
"For which interfaces should we do accounting? GNUnet will evaluate the "
"total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -5059,12 +5105,12 @@
"number reported by 'gnunet-win-tool -n'."
msgstr ""
-#: contrib/config-daemon.scm:1287
+#: contrib/config-daemon.scm:1263
#, fuzzy
msgid "Load management"
msgstr "Ungültige Kommandozeilen Parameter.\n"
-#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
msgid "Root node"
msgstr ""
@@ -5201,6 +5247,24 @@
msgid "The directory for GNUnet files that belong to the user."
msgstr ""
+#, fuzzy
+#~ msgid "Configuration of the logging system"
+#~ msgstr ""
+#~ "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
+#~ "ausführen!\n"
+
+#, fuzzy
+#~ msgid "Run gnunetd as this user."
+#~ msgstr "gnunet-update ausführen"
+
+#, fuzzy
+#~ msgid "Run gnunetd during system startup?"
+#~ msgstr "gnunet-update ausführen"
+
+#, fuzzy
+#~ msgid "Path settings"
+#~ msgstr "Weitere Einstellungen"
+
#~ msgid "specify nickname"
#~ msgstr "Spitznamen angeben"
Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/po/es.po 2007-09-29 22:47:47 UTC (rev 5670)
@@ -5,11 +5,12 @@
# Miguel Angel Arruga Vivas <address@hidden> 2006
#
#
+#: contrib/config-daemon.scm:555
msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0e\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-30 00:16-0600\n"
+"POT-Creation-Date: 2007-09-29 16:44-0600\n"
"PO-Revision-Date: 2006-06-29 12:05+0200\n"
"Last-Translator: Miguel Angel Arruga <address@hidden>\n"
"Language-Team: Spanish\n"
@@ -53,45 +54,64 @@
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr "UDP6: Imposible determinar mi dirección IPv6 pública.\n"
-#: src/transports/udp6.c:471 src/transports/udp.c:514
+#: src/transports/udp6.c:471 src/transports/udp.c:520
#, c-format
msgid "MTU %llu for `%s' is probably too low!\n"
msgstr ""
-#: src/transports/http.c:522
+#: src/transports/udp6.c:476
+#, fuzzy
+msgid "# bytes received via UDP6"
+msgstr "# bytes recibidos vía UDP"
+
+#: src/transports/udp6.c:477
+#, fuzzy
+msgid "# bytes sent via UDP6"
+msgstr "# bytes enviados vía UDP"
+
+#: src/transports/udp6.c:479
+#, fuzzy
+msgid "# bytes dropped by UDP6 (outgoing)"
+msgstr "# bytes omitidos por UDP (salientes)"
+
+#: src/transports/udp6.c:481
+msgid "# UDP6 connections (right now)"
+msgstr ""
+
+#: src/transports/http.c:824
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
-#: src/transports/http.c:813 src/transports/http.c:892
-#: src/transports/http.c:1007 src/transports/http.c:1147
-#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
-#: src/applications/bootstrap_http/http.c:115
-#: src/applications/bootstrap_http/http.c:247
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:294
-#: src/applications/bootstrap_http/http.c:313
-#: src/applications/bootstrap_http/http.c:326
-#: src/applications/bootstrap_http/http.c:336
-#: src/applications/bootstrap_http/http.c:346
+#: src/transports/http.c:1235 src/transports/http.c:1309
+#: src/transports/http.c:1464 src/transports/http.c:1858
+#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
+#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
+#: src/applications/bootstrap_http/http.c:254
+#: src/applications/bootstrap_http/http.c:270
+#: src/applications/bootstrap_http/http.c:301
+#: src/applications/bootstrap_http/http.c:320
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:343
+#: src/applications/bootstrap_http/http.c:353
#, fuzzy, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr "'%s' falló en %s: %d con error: '%s'.\n"
-#: src/transports/http.c:1307
+#: src/transports/http.c:2080
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:1316
+#: src/transports/http.c:2089
msgid "# bytes received via HTTP"
msgstr "# bytes recibidos vía HTTP"
-#: src/transports/http.c:1317
+#: src/transports/http.c:2090
msgid "# bytes sent via HTTP"
msgstr "# bytes mandados vía HTTP"
-#: src/transports/http.c:1319
+#: src/transports/http.c:2092
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "#bytes omitidos vía HTTP (salientes)"
@@ -135,62 +155,66 @@
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
msgstr ""
-#: src/transports/tcp.c:289
+#: src/transports/tcp.c:290
#, fuzzy
msgid "TCP: Could not determine my public IP address.\n"
msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
-#: src/transports/tcp.c:384
+#: src/transports/tcp.c:389
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
-#: src/transports/tcp.c:437 src/transports/tcp6.c:404
+#: src/transports/tcp.c:442 src/transports/tcp6.c:404
#, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr ""
-#: src/transports/tcp.c:556
+#: src/transports/tcp.c:561
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"TCP\" to \"NO\"\n"
msgstr ""
-#: src/transports/tcp.c:565
+#: src/transports/tcp.c:570
msgid "# bytes received via TCP"
msgstr "# bytes recibidos por TCP"
-#: src/transports/tcp.c:566
+#: src/transports/tcp.c:571
msgid "# bytes sent via TCP"
msgstr "# bytes enviados por TCP"
-#: src/transports/tcp.c:568
+#: src/transports/tcp.c:573
msgid "# bytes dropped by TCP (outgoing)"
msgstr "# bytes omitidos por TCP (salientes)"
-#: src/transports/udp.c:287
+#: src/transports/udp.c:288
msgid "UDP: Could not determine my public IP address.\n"
msgstr "UDP: Imposible determinar mi dirección IP pública.\n"
-#: src/transports/udp.c:378
+#: src/transports/udp.c:384
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
"Falló al mandar el mensaje de tamaño %d a través de UDP a %u.%u.%u.%u:%u: %"
"s\n"
-#: src/transports/udp.c:529
+#: src/transports/udp.c:535
msgid "# bytes received via UDP"
msgstr "# bytes recibidos vía UDP"
-#: src/transports/udp.c:530
+#: src/transports/udp.c:536
msgid "# bytes sent via UDP"
msgstr "# bytes enviados vía UDP"
-#: src/transports/udp.c:532
+#: src/transports/udp.c:538
msgid "# bytes dropped by UDP (outgoing)"
msgstr "# bytes omitidos por UDP (salientes)"
+#: src/transports/udp.c:540
+msgid "# UDP connections (right now)"
+msgstr ""
+
#: src/transports/tcp6.c:245
msgid "Could not determine my public IPv6 address.\n"
msgstr "Imposible determinar mi dirección IPv6 pública.\n"
@@ -235,7 +259,7 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/udp_helper.c:94
+#: src/transports/udp_helper.c:96
#, fuzzy
msgid "Received malformed message from udp-peer connection. Closing.\n"
msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
@@ -251,42 +275,42 @@
"allow TIME ms to process a GET command or expire PUT content after ms TIME"
msgstr "Reserva TIME ms para procesar cada comando"
-#: src/applications/dht/tools/dht-query.c:98
+#: src/applications/dht/tools/dht-query.c:99
#, c-format
msgid "%s(%s) operation returned no results.\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:115
+#: src/applications/dht/tools/dht-query.c:116
#, fuzzy, c-format
msgid "Issuing '%s(%s,%s)' command.\n"
msgstr "'%s(%s, %s)' falló.\n"
-#: src/applications/dht/tools/dht-query.c:122
+#: src/applications/dht/tools/dht-query.c:123
#, c-format
msgid "'%s(%s,%s)' succeeded\n"
msgstr "'%s (%s, %s)' logrado satisfactoriamente\n"
-#: src/applications/dht/tools/dht-query.c:126
+#: src/applications/dht/tools/dht-query.c:127
#, c-format
msgid "'%s(%s,%s)' failed.\n"
msgstr "'%s(%s, %s)' falló.\n"
-#: src/applications/dht/tools/dht-query.c:150
+#: src/applications/dht/tools/dht-query.c:151
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr "Fallo al conectar a gnunetd.\n"
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:164
#, c-format
msgid "Command `%s' requires an argument (`%s').\n"
msgstr "El comando '%s' requiere un argumento ('%s').\n"
-#: src/applications/dht/tools/dht-query.c:180
+#: src/applications/dht/tools/dht-query.c:181
#, c-format
msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
msgstr "El comando '%s' requiere dos argumentos ('%s' y '%s').\n"
-#: src/applications/dht/tools/dht-query.c:191
+#: src/applications/dht/tools/dht-query.c:192
#, c-format
msgid "Unsupported command `%s'. Aborting.\n"
msgstr "Comando inesperado '%s'. Abortando.\n"
@@ -492,7 +516,7 @@
msgstr "# mensajes de texto mandados por PING"
#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:901
+#: src/applications/session/connect.c:913
#, c-format
msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
msgstr "'%s' registrando manejador %d (texto plano e hipertexto)\n"
@@ -551,12 +575,12 @@
msgstr ""
#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:896
+#: src/applications/session/connect.c:908
msgid "# encrypted PONG messages sent"
msgstr ""
#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:894
+#: src/applications/session/connect.c:906
msgid "# encrypted PING messages sent"
msgstr ""
@@ -579,33 +603,34 @@
#: src/applications/sqstore_sqlite/sqlite.c:54
#: src/applications/sqstore_mysql/mysql.c:145
#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:428
-#: src/applications/sqstore_mysql/mysql.c:438
-#: src/applications/sqstore_mysql/mysql.c:476
-#: src/applications/sqstore_mysql/mysql.c:486
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:529
-#: src/applications/sqstore_mysql/mysql.c:627
-#: src/applications/sqstore_mysql/mysql.c:639
-#: src/applications/sqstore_mysql/mysql.c:651
-#: src/applications/sqstore_mysql/mysql.c:665
-#: src/applications/sqstore_mysql/mysql.c:762
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:917
-#: src/applications/sqstore_mysql/mysql.c:929
-#: src/applications/sqstore_mysql/mysql.c:941
-#: src/applications/sqstore_mysql/mysql.c:1184
-#: src/applications/sqstore_mysql/mysql.c:1196
-#: src/applications/sqstore_mysql/mysql.c:1208
-#: src/applications/sqstore_mysql/mysql.c:1293
+#: src/applications/sqstore_mysql/mysql.c:468
+#: src/applications/sqstore_mysql/mysql.c:478
+#: src/applications/sqstore_mysql/mysql.c:516
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:558
+#: src/applications/sqstore_mysql/mysql.c:569
+#: src/applications/sqstore_mysql/mysql.c:667
+#: src/applications/sqstore_mysql/mysql.c:679
+#: src/applications/sqstore_mysql/mysql.c:691
+#: src/applications/sqstore_mysql/mysql.c:705
+#: src/applications/sqstore_mysql/mysql.c:802
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:965
+#: src/applications/sqstore_mysql/mysql.c:977
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1229
+#: src/applications/sqstore_mysql/mysql.c:1241
+#: src/applications/sqstore_mysql/mysql.c:1253
+#: src/applications/sqstore_mysql/mysql.c:1338
#: src/applications/kvstore_sqlite/kv_sqlite.c:44
#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
-#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
-#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
-#: src/util/crypto/hostkey_gcrypt.c:71
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
+#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
+#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
+#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
+#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
#, c-format
msgid "`%s' failed at %s:%d with error: %s\n"
msgstr "'%s' falló en %s: %d con el error: %s\n"
@@ -621,17 +646,17 @@
msgstr "Datos no válidos en %s. Intentando fijar (por borrado).\n"
#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:416
+#: src/applications/sqstore_sqlite/sqlite.c:431
msgid "sqlite datastore"
msgstr "base de datos sqlite"
-#: src/applications/sqstore_sqlite/sqlite.c:415
+#: src/applications/sqstore_sqlite/sqlite.c:430
#, c-format
msgid "Invalid data in %s. Trying to fix (by deletion).\n"
msgstr "Datos no válidos en %s. Intentando fijar (por borrado).\n"
-#: src/applications/sqstore_sqlite/sqlite.c:1206
-#: src/applications/sqstore_mysql/mysql.c:1401
+#: src/applications/sqstore_sqlite/sqlite.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1446
msgid "# bytes in datastore"
msgstr "# bytes en la base de datos"
@@ -656,24 +681,24 @@
msgid "Session key received from peer `%s' has invalid format (discarded).\n"
msgstr "El mensaje recibido del par es inválido.\n"
-#: src/applications/session/connect.c:614
+#: src/applications/session/connect.c:624
#, fuzzy, c-format
msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
msgstr "El mensaje recibido del par es inválido.\n"
-#: src/applications/session/connect.c:646
+#: src/applications/session/connect.c:656
#, c-format
msgid "Invalid `%s' message received from peer `%s'.\n"
msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
-#: src/applications/session/connect.c:656
+#: src/applications/session/connect.c:666
#, c-format
msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
msgstr ""
"el cambio de clave '%s' de '%s' falló al comprobar el CRC (dio: %u, esperado "
"%u).\n"
-#: src/applications/session/connect.c:719
+#: src/applications/session/connect.c:729
#, fuzzy, c-format
msgid ""
"Error parsing encrypted session key from `%s', given message part size is "
@@ -682,24 +707,24 @@
"Error pasando la clave de sesión encriptada, el mensaje dado del tamaño de "
"las partes es inválido.\n"
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:741
#, fuzzy, c-format
msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
-#: src/applications/session/connect.c:886
+#: src/applications/session/connect.c:898
msgid "# session keys sent"
msgstr "# claves de la sesión mandadas"
-#: src/applications/session/connect.c:888
+#: src/applications/session/connect.c:900
msgid "# session keys rejected"
msgstr "# claves de la sesión rechazadas"
-#: src/applications/session/connect.c:890
+#: src/applications/session/connect.c:902
msgid "# session keys accepted"
msgstr "# claves de la sesión aceptadas"
-#: src/applications/session/connect.c:892
+#: src/applications/session/connect.c:904
msgid "# sessions established"
msgstr "# sesiones establecidas"
@@ -770,24 +795,24 @@
msgid "async RPC reply not received.\n"
msgstr "respuesta RPC asíncrona no recibida.\n"
-#: src/applications/sqstore_mysql/mysql.c:379
+#: src/applications/sqstore_mysql/mysql.c:419
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error: %s"
msgstr "'%s' falló en %s: %d con el error: %s\n"
-#: src/applications/sqstore_mysql/mysql.c:1311
+#: src/applications/sqstore_mysql/mysql.c:1356
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
msgstr "'%s' falló en %s: %d con el error: %s\n"
-#: src/applications/sqstore_mysql/mysql.c:1423
-#: src/applications/sqstore_mysql/mysql.c:1570
+#: src/applications/sqstore_mysql/mysql.c:1468
+#: src/applications/sqstore_mysql/mysql.c:1615
#, c-format
msgid "Trying to use file `%s' for MySQL configuration.\n"
msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
-#: src/applications/sqstore_mysql/mysql.c:1448
-#: src/applications/sqstore_mysql/mysql.c:1593
+#: src/applications/sqstore_mysql/mysql.c:1493
+#: src/applications/sqstore_mysql/mysql.c:1638
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -975,7 +1000,7 @@
msgstr "Mensajes cliente-servidor soportados:\n"
#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:52
+#: src/applications/vpn/gnunet-vpn.c:53
msgid "Print statistics about GNUnet operations."
msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
@@ -987,7 +1012,7 @@
#: src/applications/tbench/gnunet-tbench.c:127
#: src/applications/tracekit/gnunet-tracekit.c:315
#: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:148
+#: src/applications/vpn/gnunet-vpn.c:149
#, c-format
msgid "Error establishing connection with gnunetd.\n"
msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
@@ -2030,16 +2055,16 @@
msgid "enables (anonymous) file-sharing"
msgstr "activa la compartición de ficheros anónima"
-#: src/applications/fs/module/migration.c:312
+#: src/applications/fs/module/migration.c:374
msgid "# blocks migrated"
msgstr "# blocks migrados"
-#: src/applications/fs/module/migration.c:314
+#: src/applications/fs/module/migration.c:376
#, fuzzy
msgid "# blocks fetched for migration"
msgstr "# blocks migrados"
-#: src/applications/fs/module/migration.c:317
+#: src/applications/fs/module/migration.c:379
msgid "# on-demand block migration attempts"
msgstr ""
@@ -2248,31 +2273,31 @@
msgid "Template description."
msgstr ""
-#: src/applications/bootstrap_http/http.c:102
+#: src/applications/bootstrap_http/http.c:109
#, fuzzy, c-format
msgid "Bootstrap data obtained from `%s' is invalid.\n"
msgstr "Formato del pseudónimo '%s' no es válido.\n"
-#: src/applications/bootstrap_http/http.c:170
+#: src/applications/bootstrap_http/http.c:177
msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:210
+#: src/applications/bootstrap_http/http.c:217
#, c-format
msgid "Bootstrapping using `%s'.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:224
+#: src/applications/bootstrap_http/http.c:231
#, c-format
msgid "Trying to download hostlist from `%s'\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:352
+#: src/applications/bootstrap_http/http.c:359
#, fuzzy, c-format
msgid "Downloaded %llu bytes from `%s'.\n"
msgstr "Descarga los ficheros de GNUnet"
-#: src/applications/bootstrap_http/http.c:385
+#: src/applications/bootstrap_http/http.c:392
#, fuzzy
msgid "# HELLOs downloaded via http"
msgstr "# saludos descargados vía HTTP"
@@ -2296,7 +2321,7 @@
msgid "tracks bandwidth utilization by gnunetd"
msgstr ""
-#: src/applications/vpn/gnunet-vpn.c:56
+#: src/applications/vpn/gnunet-vpn.c:57
msgid "Suppress display of asynchronous log messages"
msgstr ""
@@ -2516,35 +2541,35 @@
msgid "No"
msgstr "No"
-#: src/applications/vpn/vpn.c:1647
+#: src/applications/vpn/vpn.c:1651
#, fuzzy, c-format
msgid "`%s' initialising RFC4913 module %d and %d\n"
msgstr "'%s' registrando manejadores %d y %d\n"
-#: src/applications/vpn/vpn.c:1650
+#: src/applications/vpn/vpn.c:1654
#, c-format
msgid "RFC4193 my First 4 hex digits of host id are %x\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1723
+#: src/applications/vpn/vpn.c:1727
#, fuzzy
msgid "enables IPv6 over GNUnet (incomplete)"
msgstr "Activa el chat P2P (incompleto)"
-#: src/applications/vpn/vpn.c:1757
+#: src/applications/vpn/vpn.c:1761
msgid "RFC4193 Waiting for tun thread to end\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1771
+#: src/applications/vpn/vpn.c:1775
msgid "RFC4193 The tun thread has ended\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1788
+#: src/applications/vpn/vpn.c:1792
#, c-format
msgid "RFC4193 Closing tunnel %d fd %d\n"
msgstr ""
-#: src/applications/dstore/dstore.c:466
+#: src/applications/dstore/dstore.c:525
#, fuzzy
msgid "# bytes in dstore"
msgstr "# bytes en la base de datos"
@@ -2573,7 +2598,7 @@
msgid "Updates GNUnet datastructures after version change."
msgstr ""
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
msgid "run as user LOGIN"
msgstr "ejecuta como el usuario LOGIN"
@@ -2581,91 +2606,99 @@
msgid "run in client mode (for getting client configuration values)"
msgstr ""
-#: src/server/connection.c:1188
+#: src/server/connection.c:1202
#, c-format
msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
msgstr ""
-#: src/server/connection.c:1197
+#: src/server/connection.c:1211
#, c-format
msgid "Message details: %u: length %d, priority: %d\n"
msgstr "Detalles del mensaje: %u: longitud %d, prioridad: %d\n"
-#: src/server/connection.c:2744
+#: src/server/connection.c:2897
#, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr "Mensaje de '%s' descartado: formato inválido.\n"
-#: src/server/connection.c:2829
+#: src/server/connection.c:2982
#, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr "Secuencia de números no válida %u <= %u, omitiendo mensaje.\n"
-#: src/server/connection.c:2851
+#: src/server/connection.c:3004
msgid "Message received more than one day old. Dropped.\n"
msgstr "Mensajes recibidos de mas de un día de antigüedad. Omitidos.\n"
-#: src/server/connection.c:3337
+#: src/server/connection.c:3500
msgid "# outgoing messages dropped"
msgstr "# mensajes salientes omitidos"
-#: src/server/connection.c:3340
+#: src/server/connection.c:3503
msgid "# bytes of outgoing messages dropped"
msgstr "# bytes de mensajes salientes omitidos"
-#: src/server/connection.c:3342
+#: src/server/connection.c:3505
msgid "# connections closed (HANGUP sent)"
msgstr ""
-#: src/server/connection.c:3345
+#: src/server/connection.c:3509
+msgid "# connections closed (transport issue)"
+msgstr ""
+
+#: src/server/connection.c:3512
msgid "# bytes encrypted"
msgstr "# bytes encriptados"
-#: src/server/connection.c:3349
+#: src/server/connection.c:3516
#, fuzzy
msgid "# bytes transmitted"
msgstr "# bytes desencriptados"
-#: src/server/connection.c:3353
+#: src/server/connection.c:3520
#, fuzzy
msgid "# bytes received"
msgstr "# bytes recibidos por TCP"
-#: src/server/connection.c:3355
+#: src/server/connection.c:3522
msgid "# bytes decrypted"
msgstr "# bytes desencriptados"
-#: src/server/connection.c:3356
+#: src/server/connection.c:3523
msgid "# bytes noise sent"
msgstr "# \"bytes-ruido\" mandados"
-#: src/server/connection.c:3359
+#: src/server/connection.c:3526
msgid "# total bytes per second send limit"
msgstr ""
-#: src/server/connection.c:3362
+#: src/server/connection.c:3529
#, fuzzy
msgid "# total bytes per second receive limit"
msgstr "# bytes de ruido recibidos"
-#: src/server/connection.c:3365
+#: src/server/connection.c:3532
#, fuzzy
msgid "# total number of messages in send buffers"
msgstr "número de mensajes en un bloque de mensajes"
-#: src/server/connection.c:3369
+#: src/server/connection.c:3536
msgid "# total number of bytes we were allowed to sent but did not"
msgstr ""
-#: src/server/connection.c:3373
+#: src/server/connection.c:3540
#, fuzzy
msgid "# total number of bytes we were allowed to sent"
msgstr "número de mensajes en un bloque de mensajes"
-#: src/server/connection.c:3377
+#: src/server/connection.c:3544
msgid "# total number of bytes we are currently allowed to send"
msgstr ""
+#: src/server/connection.c:3547
+msgid "# transports switched to stream transport"
+msgstr ""
+
#: src/server/startup.c:206
#, fuzzy, c-format
msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -2772,32 +2805,32 @@
msgid "Could not properly unload service `%s'!\n"
msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
-#: src/server/gnunet-transport-check.c:121
+#: src/server/gnunet-transport-check.c:122
#, c-format
msgid "`%s': Could not create hello.\n"
msgstr "'%s': Imposible crear saludo.\n"
-#: src/server/gnunet-transport-check.c:128
+#: src/server/gnunet-transport-check.c:129
#, c-format
msgid "`%s': Could not connect.\n"
msgstr "'%s': Imposible conectar.\n"
-#: src/server/gnunet-transport-check.c:157
+#: src/server/gnunet-transport-check.c:161
#, c-format
msgid "`%s': Could not send.\n"
msgstr "'%s': Imposible mandar.\n"
-#: src/server/gnunet-transport-check.c:172
+#: src/server/gnunet-transport-check.c:176
#, c-format
msgid "`%s': Did not receive message within %llu ms.\n"
msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
-#: src/server/gnunet-transport-check.c:185
+#: src/server/gnunet-transport-check.c:189
#, c-format
msgid "`%s': Could not disconnect.\n"
msgstr "'%s': Imposible desconectar.\n"
-#: src/server/gnunet-transport-check.c:192
+#: src/server/gnunet-transport-check.c:196
#, fuzzy, c-format
msgid ""
"`%s' transport OK. It took %ums to transmit %llu messages of %llu bytes "
@@ -2805,12 +2838,12 @@
msgstr ""
"Transporte '%s' OK. Tomó %ums transmitir %d mensajes de %d bytes cada uno.\n"
-#: src/server/gnunet-transport-check.c:222
+#: src/server/gnunet-transport-check.c:226
#, c-format
msgid " Transport %d is not being tested\n"
msgstr " El transporte %d no esta siendo probado\n"
-#: src/server/gnunet-transport-check.c:251
+#: src/server/gnunet-transport-check.c:255
#, c-format
msgid ""
"\n"
@@ -2819,65 +2852,65 @@
"\n"
"Contactando '%s'."
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:280
#, c-format
msgid " Connection failed\n"
msgstr "Conexión fallida\n"
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:286
#, c-format
msgid " Connection failed (bug?)\n"
msgstr "Conexión fallida (¿bug?)\n"
-#: src/server/gnunet-transport-check.c:319
+#: src/server/gnunet-transport-check.c:323
#, c-format
msgid "Timeout after %llums.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:321
+#: src/server/gnunet-transport-check.c:325
#, fuzzy, c-format
msgid "OK!\n"
msgstr "OK"
-#: src/server/gnunet-transport-check.c:346
+#: src/server/gnunet-transport-check.c:350
msgid "Tool to test if GNUnet transport services are operational."
msgstr ""
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:354
msgid "ping peers from HOSTLISTURL that match transports"
msgstr ""
-#: src/server/gnunet-transport-check.c:353
+#: src/server/gnunet-transport-check.c:357
msgid "send COUNT messages"
msgstr "envia COUNT mensajes"
-#: src/server/gnunet-transport-check.c:356
+#: src/server/gnunet-transport-check.c:360
msgid "send messages with SIZE bytes payload"
msgstr "manda mensajes con SIZE bytes payload"
-#: src/server/gnunet-transport-check.c:359
+#: src/server/gnunet-transport-check.c:363
msgid "specifies which TRANSPORT should be tested"
msgstr ""
-#: src/server/gnunet-transport-check.c:362
+#: src/server/gnunet-transport-check.c:366
msgid "specifies after how many MS to time-out"
msgstr ""
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:374
msgid "repeat each test X times"
msgstr ""
-#: src/server/gnunet-transport-check.c:431
+#: src/server/gnunet-transport-check.c:435
#, c-format
msgid "Testing transport(s) %s\n"
msgstr "Probando transporte(s) %s\n"
-#: src/server/gnunet-transport-check.c:433
+#: src/server/gnunet-transport-check.c:437
#, c-format
msgid "Available transport(s): %s\n"
msgstr "Transporte(s) disponible(s): %s\n"
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:478
#, c-format
msgid ""
"\n"
@@ -2990,12 +3023,12 @@
msgstr ""
"libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
-#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
+#: src/util/os/statuscalls.c:195 src/util/os/statuscalls.c:336
#, fuzzy, c-format
msgid "Failed to parse interface data from `%s'.\n"
msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
-#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
+#: src/util/os/statuscalls.c:379 src/util/os/statuscalls.c:389
#, c-format
msgid ""
"No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -4179,12 +4212,18 @@
msgstr "especifica el host en el que gnunetd esta ejecutandose"
#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
-#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
-#: src/include/gnunet_util_error.h:236
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:236
#, fuzzy, c-format
msgid "Internal error: assertion failed at %s:%d in %s.\n"
msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
+#: src/include/gnunet_util_error.h:230
+#, c-format
+msgid ""
+"External protocol violation: assertion failed at %s:%d in %s (no need to "
+"panic, we can handle this).\n"
+msgstr ""
+
#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
#, fuzzy, c-format
msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
@@ -4330,23 +4369,23 @@
"configuration here. Default is no proxy."
msgstr ""
-#: contrib/config-daemon.scm:237 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
msgid "How long should logs be kept?"
msgstr ""
-#: contrib/config-daemon.scm:239 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
msgid ""
"How long should logs be kept? If you specify a value greater than zero, a "
"log is created each day with the date appended to its filename. These logs "
"are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
msgstr ""
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:237
msgid ""
"What maximum number of open file descriptors should be requested from the OS?"
msgstr ""
-#: contrib/config-daemon.scm:252
+#: contrib/config-daemon.scm:239
msgid ""
"The default of 1024 should be fine for most systems. If your system can "
"support more, increasing the number might help support additional clients on "
@@ -4358,64 +4397,62 @@
"run with what it is given."
msgstr ""
-#: contrib/config-daemon.scm:263
+#: contrib/config-daemon.scm:250
msgid "Where should gnunetd write the logs?"
msgstr ""
-#: contrib/config-daemon.scm:275 contrib/config-client.scm:169
-#, fuzzy
-msgid "Configuration of the logging system"
+#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+msgid "Logging"
msgstr ""
-"La configuración o la versión de GNUnet cambiaron. ¡Debes ejecutar '%s'!\n"
-#: contrib/config-daemon.scm:276 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
msgid "Specify which system messages should be logged how"
msgstr ""
-#: contrib/config-daemon.scm:280 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
msgid "Logging of events for users"
msgstr ""
-#: contrib/config-daemon.scm:281 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
msgid "Logging of events for the system administrator"
msgstr ""
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:280
msgid "Where should gnunetd write the PID?"
msgstr ""
-#: contrib/config-daemon.scm:294
+#: contrib/config-daemon.scm:281
msgid ""
"The default is no longer /var/run/gnunetd.pid since we could not delete the "
"file on shutdown at that location."
msgstr ""
-#: contrib/config-daemon.scm:306
+#: contrib/config-daemon.scm:293
msgid "As which user should gnunetd run?"
msgstr ""
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:295
msgid ""
"Empty means \"current user\". On computer startup, it is root/SYSTEM. Under "
"Windows, this setting affects the creation of a new system service only."
msgstr ""
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:308
msgid "Should gnunetd be automatically started when the system boots?"
msgstr ""
-#: contrib/config-daemon.scm:322
+#: contrib/config-daemon.scm:309
msgid ""
"Set to YES if gnunetd should be automatically started on boot. If this "
"option is set, gnunet-setup will install a script to start the daemon upon "
"completion. This option may not work on all systems."
msgstr ""
-#: contrib/config-daemon.scm:334
+#: contrib/config-daemon.scm:321
msgid "Which transport mechanisms should GNUnet use?"
msgstr ""
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:323
msgid ""
"Use space-separated list of the modules, e.g. \"udp smtp tcp\". The "
"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4429,11 +4466,11 @@
"itself."
msgstr ""
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:337
msgid "Which applications should gnunetd support?"
msgstr ""
-#: contrib/config-daemon.scm:352
+#: contrib/config-daemon.scm:339
msgid ""
"Whenever this option is changed, you MUST run gnunet-update. Currently, the "
"available applications are:\n"
@@ -4470,15 +4507,24 @@
"compromise your anonymity."
msgstr ""
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:368
msgid "Disable client-server connections"
msgstr ""
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:369
+msgid ""
+"This option can be used to tell gnunetd not to open the client port. When "
+"run like this, gnunetd will participate as a peer in the network but not "
+"support any user interfaces. This maybe useful for headless systems that "
+"are never expected to have end-user interactions. Note that this will also "
+"prevent you from running diagnostic tools like gnunet-stats!"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
msgid "Disable peer discovery"
msgstr ""
-#: contrib/config-daemon.scm:394
+#: contrib/config-daemon.scm:382
msgid ""
"The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
"peer to peers of which the hostkey has been copied by hand to data/hosts; "
@@ -4490,15 +4536,15 @@
"lines above would need some minor editing :-)."
msgstr ""
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:393
msgid "Disable advertising this peer to other peers"
msgstr ""
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:405
msgid "Disable automatic establishment of connections"
msgstr ""
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:406
msgid ""
"If this option is enabled, GNUnet will not automatically establish "
"connections to other peers, but instead wait for applications to "
@@ -4506,21 +4552,22 @@
"connect to us)."
msgstr ""
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:417
msgid "Disable advertising of other peers by this peer"
msgstr ""
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:418
msgid ""
"This option maybe useful during testing, but turning it off is dangerous! If "
"in any doubt, set it to YES (which is the default)."
msgstr ""
-#: contrib/config-daemon.scm:441
-msgid "Client/Server Port"
-msgstr ""
+#: contrib/config-daemon.scm:429
+#, fuzzy
+msgid "Port for communication with GNUnet user interfaces"
+msgstr "Imprime información de los pares de GNUnet."
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:430
msgid ""
"Which is the client-server port that is used between gnunetd and the clients "
"(TCP only). You may firewall this port for non-local machines (but you do "
@@ -4528,11 +4575,11 @@
"connections from machines that are listed under TRUSTED)."
msgstr ""
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:441
msgid "IPs allowed to use gnunetd server"
msgstr ""
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:442
msgid ""
"This option specifies which hosts are trusted enough to connect as clients "
"(to the TCP port). This is useful if you run gnunetd on one host of your "
@@ -4543,76 +4590,71 @@
"separated by a semicolon, spaces are not allowed."
msgstr ""
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:454
msgid "Limit connections to the specfied set of peers."
msgstr ""
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:455
msgid ""
"If this option is not set, any peer is allowed to connect. If it is set, "
-"only the specified peers are allowed."
+"only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:466
#, fuzzy
-msgid "Run gnunetd as this user."
-msgstr "Ejecutar gnunet-update"
-
-#: contrib/config-daemon.scm:479
-msgid ""
-"When started as root, gnunetd will change permissions to the given user."
-msgstr ""
-
-#: contrib/config-daemon.scm:490
-#, fuzzy
msgid "Run gnunetd as this group."
msgstr "Ejecutar gnunet-update"
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:467
msgid ""
"When started as root, gnunetd will change permissions to the given group."
msgstr ""
-#: contrib/config-daemon.scm:502
-#, fuzzy
-msgid "Run gnunetd during system startup?"
-msgstr "Ejecutar gnunet-update"
-
-#: contrib/config-daemon.scm:515
+#: contrib/config-daemon.scm:478
msgid "Prevent the specfied set of peers from connecting."
msgstr ""
-#: contrib/config-daemon.scm:516
-msgid "If this option is not set, any peer is allowed to connect."
+#: contrib/config-daemon.scm:479
+msgid ""
+"If this option is not set, any peer is allowed to connect. If the ID of a "
+"peer is listed here, connections from that peer will be refused. Specify "
+"the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:527
+#: contrib/config-daemon.scm:490
+msgid "Topology Maintenance"
+msgstr ""
+
+#: contrib/config-daemon.scm:491
msgid "Rarely used settings for peer advertisements and connections"
msgstr ""
-#: contrib/config-daemon.scm:547
+#: contrib/config-daemon.scm:511
#, fuzzy
msgid "General settings"
msgstr "Otras configuraciones"
-#: contrib/config-daemon.scm:548
+#: contrib/config-daemon.scm:512
msgid "Settings that change the behavior of GNUnet in general"
msgstr ""
-#: contrib/config-daemon.scm:576
-#, fuzzy
-msgid "Path settings"
-msgstr "Otras configuraciones"
+#: contrib/config-daemon.scm:536
+msgid "Modules"
+msgstr ""
-#: contrib/config-daemon.scm:577
-msgid "Prefixes for paths used by GNUnet"
+#: contrib/config-daemon.scm:537
+msgid "Settings that select specific implementations for GNUnet modules"
msgstr ""
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:554
+msgid "Fundamentals"
+msgstr ""
+
+#: contrib/config-daemon.scm:574
msgid "Which database should be used?"
msgstr ""
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:576
msgid ""
"Which database should be used? The options are \"sqstore_sqlite\" and "
"\"sqstore_mysql\". You must run gnunet-update after changing this value!\n"
@@ -4621,11 +4663,11 @@
"is relatively simple. Read the file doc/README.mysql for how to setup mysql."
msgstr ""
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:589
msgid "Which topology should be used?"
msgstr ""
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:591
msgid ""
"Which topology should be used? The only options at the moment are "
"\"topology_default\" and \"topology_f2f\". In default mode, GNUnet will try "
@@ -4638,47 +4680,39 @@
"afraid of establishing (direct) connections to unknown peers."
msgstr ""
-#: contrib/config-daemon.scm:625
-msgid "Modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:626
-msgid "Settings that select specific implementations for GNUnet modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:607
msgid "List of friends for friend-to-friend topology"
msgstr ""
-#: contrib/config-daemon.scm:644
+#: contrib/config-daemon.scm:608
msgid ""
"Specifies the name of a file which contains a list of GNUnet peer IDs that "
"are friends. If used with the friend-to-friend topology, this will ensure "
"that GNUnet only connects to these peers (via any available transport)."
msgstr ""
-#: contrib/config-daemon.scm:658
+#: contrib/config-daemon.scm:622
msgid "Name of the MySQL database GNUnet should use"
msgstr ""
-#: contrib/config-daemon.scm:670
+#: contrib/config-daemon.scm:634
#, fuzzy
msgid "Configuration file that specifies the MySQL username and password"
msgstr ""
"La configuración o la versión de GNUnet cambiaron. ¡Debes ejecutar '%s'!\n"
-#: contrib/config-daemon.scm:682
+#: contrib/config-daemon.scm:646
#, fuzzy
msgid "Configuration of the MySQL database"
msgstr ""
"La configuración o la versión de GNUnet cambiaron. ¡Debes ejecutar '%s'!\n"
-#: contrib/config-daemon.scm:701
+#: contrib/config-daemon.scm:665
#, fuzzy
msgid "MB of diskspace GNUnet can use for anonymous file sharing"
msgstr "activa la compartición de ficheros anónima"
-#: contrib/config-daemon.scm:703
+#: contrib/config-daemon.scm:667
msgid ""
"How much disk space (MB) is GNUnet allowed to use for anonymous file "
"sharing? This does not take indexed files into account, only the space "
@@ -4689,19 +4723,19 @@
"Note that if you change the quota, you need to run gnunet-update afterwards."
msgstr ""
-#: contrib/config-daemon.scm:717
+#: contrib/config-daemon.scm:681
msgid "Size of the routing table for anonymous routing."
msgstr ""
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:693
msgid "Size of the routing table for DHT routing."
msgstr ""
-#: contrib/config-daemon.scm:742
+#: contrib/config-daemon.scm:706
msgid "Allow migrating content to this peer."
msgstr ""
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:708
msgid ""
"If you say yes here, GNUnet will migrate content to your server, and you "
"will not be able to control what data is stored on your machine. \n"
@@ -4713,13 +4747,13 @@
"can be considered liable for it."
msgstr ""
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:722
msgid ""
"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
"stored in /tmp)"
msgstr ""
-#: contrib/config-daemon.scm:759
+#: contrib/config-daemon.scm:723
msgid ""
"DHT index data is inherently small and expires comparatively quickly. It is "
"deleted whenever gnunetd is shut down.\n"
@@ -4727,21 +4761,21 @@
"The size of the DSTORE QUOTA is specified in MB."
msgstr ""
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:737
#, fuzzy
msgid "Options for anonymous file sharing"
msgstr "activa la compartición de ficheros anónima"
-#: contrib/config-daemon.scm:792
+#: contrib/config-daemon.scm:756
#, fuzzy
msgid "Applications"
msgstr "_Opciones"
-#: contrib/config-daemon.scm:808
+#: contrib/config-daemon.scm:772
msgid "Is this machine unreachable behind a NAT?"
msgstr ""
-#: contrib/config-daemon.scm:809
+#: contrib/config-daemon.scm:773
msgid ""
"Set to YES if this machine is behind a NAT that limits connections from the "
"outside to the GNUnet port and that cannot be traversed using UPnP. Note "
@@ -4754,15 +4788,15 @@
"connections. Use YES only if you get no connections otherwise."
msgstr ""
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:784
msgid "Which port should be used by the TCP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
msgid "Should we try to determine our external IP using UPnP?"
msgstr ""
-#: contrib/config-daemon.scm:833
+#: contrib/config-daemon.scm:797
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4770,34 +4804,46 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
-#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
msgid "Which IPs are not allowed to connect?"
msgstr ""
-#: contrib/config-daemon.scm:856
+#: contrib/config-daemon.scm:820
msgid ""
"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
"network interface."
msgstr ""
-#: contrib/config-daemon.scm:868
+#: contrib/config-daemon.scm:832
msgid "TCP transport"
msgstr ""
-#: contrib/config-daemon.scm:886
+#: contrib/config-daemon.scm:850
msgid "Which port should be used by the HTTP transport?"
msgstr ""
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:862
+msgid "Which is the external port of the HTTP transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:863
+msgid ""
+"Use this option if your firewall maps say port 80 to your real HTTP port. "
+"This can be useful in making the HTTP messages appear even more legit "
+"(without the need for running gnunetd as root due to the use of a "
+"priviledged port)."
+msgstr ""
+
+#: contrib/config-daemon.scm:874
msgid "HTTP transport"
msgstr ""
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:889
msgid "Which port should be used by the UDP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:926
+#: contrib/config-daemon.scm:902
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4805,75 +4851,75 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:913
msgid "What is the maximum transfer unit for UDP?"
msgstr ""
-#: contrib/config-daemon.scm:961
+#: contrib/config-daemon.scm:937
msgid ""
"Which IPs are allowed to connect? Leave empty to allow connections from any "
"IP."
msgstr ""
-#: contrib/config-daemon.scm:973
+#: contrib/config-daemon.scm:949
msgid "UDP transport"
msgstr ""
-#: contrib/config-daemon.scm:992
+#: contrib/config-daemon.scm:968
msgid "Which port should be used by the TCP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
+#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
msgid ""
"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
msgstr ""
-#: contrib/config-daemon.scm:1028
+#: contrib/config-daemon.scm:1004
msgid "TCP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1021
msgid "Which port should be used by the UDP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1033
msgid "What is the maximum transfer unit for UDP 6?"
msgstr ""
-#: contrib/config-daemon.scm:1093
+#: contrib/config-daemon.scm:1069
msgid "UDP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1087
#, fuzzy
msgid "Network interface"
msgstr "Interfaz de red:"
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1099
msgid "External IP address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1135
+#: contrib/config-daemon.scm:1111
msgid "External IPv6 address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1147
+#: contrib/config-daemon.scm:1123
msgid "Transports"
msgstr ""
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1146
msgid "What is the maximum number of bytes per second that we may receive?"
msgstr ""
-#: contrib/config-daemon.scm:1182
+#: contrib/config-daemon.scm:1158
msgid "What is the maximum number of bytes per second that we may send?"
msgstr ""
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1170
msgid "What is the maximum CPU load (percentage)?"
msgstr ""
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1172
msgid ""
"Which CPU load can be tolerated. Load here always refers to the total "
"system load, that is it includes CPU utilization by other processes. A "
@@ -4883,11 +4929,11 @@
"Multiprocessors may use values above 100."
msgstr ""
-#: contrib/config-daemon.scm:1207
+#: contrib/config-daemon.scm:1183
msgid "What is the maximum IO load (permille)?"
msgstr ""
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1185
msgid ""
"Which IO load can be tolerated. Load here refers to the percentage of CPU "
"cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4897,36 +4943,36 @@
"values are typically between 10 and 75."
msgstr ""
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1196
msgid "What is the maximum CPU load (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1221
+#: contrib/config-daemon.scm:1197
msgid ""
"Which CPU load can be tolerated. This is the hard limit, so once it is "
"reached, gnunetd will start to massively drop data to reduce the load. Use "
"with caution."
msgstr ""
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1208
msgid "What is the maximum upstream bandwidth (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1233
+#: contrib/config-daemon.scm:1209
msgid ""
"The limit is given as a percentage of the MAXNETUPBPS limit. Use 100 to "
"have MAXNETUPBPS be the hard limit. Use zero for no limit."
msgstr ""
-#: contrib/config-daemon.scm:1244
+#: contrib/config-daemon.scm:1220
msgid "Should we disable random padding (experimental option)?"
msgstr ""
-#: contrib/config-daemon.scm:1256
+#: contrib/config-daemon.scm:1232
msgid "Use basic bandwidth limitation? (YES/NO). If in doubt, say YES."
msgstr ""
-#: contrib/config-daemon.scm:1258
+#: contrib/config-daemon.scm:1234
msgid ""
"Basic bandwidth limitation (YES) means simply that the bandwidth limits "
"specified apply to GNUnet and only to GNUnet. If set to YES, you simply "
@@ -4971,12 +5017,12 @@
"since it is irrelevant)."
msgstr ""
-#: contrib/config-daemon.scm:1275
+#: contrib/config-daemon.scm:1251
#, fuzzy
msgid "Network interface to monitor"
msgstr "Interfaz de red:"
-#: contrib/config-daemon.scm:1276
+#: contrib/config-daemon.scm:1252
msgid ""
"For which interfaces should we do accounting? GNUnet will evaluate the "
"total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -4987,12 +5033,12 @@
"number reported by 'gnunet-win-tool -n'."
msgstr ""
-#: contrib/config-daemon.scm:1287
+#: contrib/config-daemon.scm:1263
#, fuzzy
msgid "Load management"
msgstr "Argumentos en la linea de comandos inválidos.\n"
-#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
msgid "Root node"
msgstr ""
@@ -5126,6 +5172,24 @@
msgid "The directory for GNUnet files that belong to the user."
msgstr ""
+#, fuzzy
+#~ msgid "Configuration of the logging system"
+#~ msgstr ""
+#~ "La configuración o la versión de GNUnet cambiaron. ¡Debes ejecutar '%"
+#~ "s'!\n"
+
+#, fuzzy
+#~ msgid "Run gnunetd as this user."
+#~ msgstr "Ejecutar gnunet-update"
+
+#, fuzzy
+#~ msgid "Run gnunetd during system startup?"
+#~ msgstr "Ejecutar gnunet-update"
+
+#, fuzzy
+#~ msgid "Path settings"
+#~ msgstr "Otras configuraciones"
+
#~ msgid "specify nickname"
#~ msgstr "especifica el apodo"
Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/po/rw.po 2007-09-29 22:47:47 UTC (rev 5670)
@@ -12,11 +12,12 @@
# Donatien NSENGIYUMVA <address@hidden>, 2005.
# Antoine Bigirimana <address@hidden>, 2005.
#
+#: contrib/config-daemon.scm:555
msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-30 00:16-0600\n"
+"POT-Creation-Date: 2007-09-29 16:44-0600\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <address@hidden>\n"
"Language-Team: Kinyarwanda <address@hidden>\n"
@@ -60,48 +61,66 @@
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/udp6.c:471 src/transports/udp.c:514
+#: src/transports/udp6.c:471 src/transports/udp.c:520
#, fuzzy, c-format
msgid "MTU %llu for `%s' is probably too low!\n"
msgstr "kugirango ni Byo hasi OYA"
-#: src/transports/http.c:522
+#: src/transports/udp6.c:476
#, fuzzy
+msgid "# bytes received via UDP6"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#: src/transports/udp6.c:477
+#, fuzzy
+msgid "# bytes sent via UDP6"
+msgstr "#Bayite Yoherejwe:"
+
+#: src/transports/udp6.c:479
+msgid "# bytes dropped by UDP6 (outgoing)"
+msgstr ""
+
+#: src/transports/udp6.c:481
+msgid "# UDP6 connections (right now)"
+msgstr ""
+
+#: src/transports/http.c:824
+#, fuzzy
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/http.c:813 src/transports/http.c:892
-#: src/transports/http.c:1007 src/transports/http.c:1147
-#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
-#: src/applications/bootstrap_http/http.c:115
-#: src/applications/bootstrap_http/http.c:247
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:294
-#: src/applications/bootstrap_http/http.c:313
-#: src/applications/bootstrap_http/http.c:326
-#: src/applications/bootstrap_http/http.c:336
-#: src/applications/bootstrap_http/http.c:346
+#: src/transports/http.c:1235 src/transports/http.c:1309
+#: src/transports/http.c:1464 src/transports/http.c:1858
+#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
+#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
+#: src/applications/bootstrap_http/http.c:254
+#: src/applications/bootstrap_http/http.c:270
+#: src/applications/bootstrap_http/http.c:301
+#: src/applications/bootstrap_http/http.c:320
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:343
+#: src/applications/bootstrap_http/http.c:353
#, fuzzy, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr "'%s'Byanze ku Na: Ikosa"
-#: src/transports/http.c:1307
+#: src/transports/http.c:2080
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:1316
+#: src/transports/http.c:2089
#, fuzzy
msgid "# bytes received via HTTP"
msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-#: src/transports/http.c:1317
+#: src/transports/http.c:2090
#, fuzzy
msgid "# bytes sent via HTTP"
msgstr "#Bayite Yoherejwe:"
-#: src/transports/http.c:1319
+#: src/transports/http.c:2092
msgid "# bytes dropped by HTTP (outgoing)"
msgstr ""
@@ -155,12 +174,12 @@
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
msgstr "kugirango ni Byo hasi OYA"
-#: src/transports/tcp.c:289
+#: src/transports/tcp.c:290
#, fuzzy
msgid "TCP: Could not determine my public IP address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/tcp.c:384
+#: src/transports/tcp.c:389
#, fuzzy, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr ""
@@ -180,37 +199,37 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/tcp.c:437 src/transports/tcp6.c:404
+#: src/transports/tcp.c:442 src/transports/tcp6.c:404
#, fuzzy, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
-#: src/transports/tcp.c:556
+#: src/transports/tcp.c:561
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"TCP\" to \"NO\"\n"
msgstr ""
-#: src/transports/tcp.c:565
+#: src/transports/tcp.c:570
#, fuzzy
msgid "# bytes received via TCP"
msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-#: src/transports/tcp.c:566
+#: src/transports/tcp.c:571
#, fuzzy
msgid "# bytes sent via TCP"
msgstr "#Bayite Yoherejwe:"
-#: src/transports/tcp.c:568
+#: src/transports/tcp.c:573
msgid "# bytes dropped by TCP (outgoing)"
msgstr ""
-#: src/transports/udp.c:287
+#: src/transports/udp.c:288
#, fuzzy
msgid "UDP: Could not determine my public IP address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/udp.c:378
+#: src/transports/udp.c:384
#, fuzzy, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
@@ -230,20 +249,24 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/udp.c:529
+#: src/transports/udp.c:535
#, fuzzy
msgid "# bytes received via UDP"
msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-#: src/transports/udp.c:530
+#: src/transports/udp.c:536
#, fuzzy
msgid "# bytes sent via UDP"
msgstr "#Bayite Yoherejwe:"
-#: src/transports/udp.c:532
+#: src/transports/udp.c:538
msgid "# bytes dropped by UDP (outgoing)"
msgstr ""
+#: src/transports/udp.c:540
+msgid "# UDP connections (right now)"
+msgstr ""
+
#: src/transports/tcp6.c:245
#, fuzzy
msgid "Could not determine my public IPv6 address.\n"
@@ -288,7 +311,7 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/udp_helper.c:94
+#: src/transports/udp_helper.c:96
#, fuzzy
msgid "Received malformed message from udp-peer connection. Closing.\n"
msgstr "Ubutumwa Bivuye Ukwihuza"
@@ -304,42 +327,42 @@
"allow TIME ms to process a GET command or expire PUT content after ms TIME"
msgstr "Kwemerera Kuri Komandi:"
-#: src/applications/dht/tools/dht-query.c:98
+#: src/applications/dht/tools/dht-query.c:99
#, c-format
msgid "%s(%s) operation returned no results.\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:115
+#: src/applications/dht/tools/dht-query.c:116
#, fuzzy, c-format
msgid "Issuing '%s(%s,%s)' command.\n"
msgstr "'%s(%s,%s)'Byanze"
-#: src/applications/dht/tools/dht-query.c:122
+#: src/applications/dht/tools/dht-query.c:123
#, c-format
msgid "'%s(%s,%s)' succeeded\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:126
+#: src/applications/dht/tools/dht-query.c:127
#, fuzzy, c-format
msgid "'%s(%s,%s)' failed.\n"
msgstr "'%s(%s,%s)'Byanze"
-#: src/applications/dht/tools/dht-query.c:150
+#: src/applications/dht/tools/dht-query.c:151
#, fuzzy, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr "Kuri Kwihuza Kuri"
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:164
#, fuzzy, c-format
msgid "Command `%s' requires an argument (`%s').\n"
msgstr "Komandi:"
-#: src/applications/dht/tools/dht-query.c:180
+#: src/applications/dht/tools/dht-query.c:181
#, fuzzy, c-format
msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
msgstr "Komandi: ingingo Na"
-#: src/applications/dht/tools/dht-query.c:191
+#: src/applications/dht/tools/dht-query.c:192
#, fuzzy, c-format
msgid "Unsupported command `%s'. Aborting.\n"
msgstr "Komandi:"
@@ -549,7 +572,7 @@
msgstr ""
#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:901
+#: src/applications/session/connect.c:913
#, c-format
msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
msgstr ""
@@ -613,13 +636,13 @@
msgstr "#Ubutumwa"
#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:896
+#: src/applications/session/connect.c:908
#, fuzzy
msgid "# encrypted PONG messages sent"
msgstr "#Bishunzwe: Bayite Yoherejwe:"
#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:894
+#: src/applications/session/connect.c:906
#, fuzzy
msgid "# encrypted PING messages sent"
msgstr "#Bishunzwe: Bayite Yoherejwe:"
@@ -643,33 +666,34 @@
#: src/applications/sqstore_sqlite/sqlite.c:54
#: src/applications/sqstore_mysql/mysql.c:145
#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:428
-#: src/applications/sqstore_mysql/mysql.c:438
-#: src/applications/sqstore_mysql/mysql.c:476
-#: src/applications/sqstore_mysql/mysql.c:486
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:529
-#: src/applications/sqstore_mysql/mysql.c:627
-#: src/applications/sqstore_mysql/mysql.c:639
-#: src/applications/sqstore_mysql/mysql.c:651
-#: src/applications/sqstore_mysql/mysql.c:665
-#: src/applications/sqstore_mysql/mysql.c:762
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:917
-#: src/applications/sqstore_mysql/mysql.c:929
-#: src/applications/sqstore_mysql/mysql.c:941
-#: src/applications/sqstore_mysql/mysql.c:1184
-#: src/applications/sqstore_mysql/mysql.c:1196
-#: src/applications/sqstore_mysql/mysql.c:1208
-#: src/applications/sqstore_mysql/mysql.c:1293
+#: src/applications/sqstore_mysql/mysql.c:468
+#: src/applications/sqstore_mysql/mysql.c:478
+#: src/applications/sqstore_mysql/mysql.c:516
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:558
+#: src/applications/sqstore_mysql/mysql.c:569
+#: src/applications/sqstore_mysql/mysql.c:667
+#: src/applications/sqstore_mysql/mysql.c:679
+#: src/applications/sqstore_mysql/mysql.c:691
+#: src/applications/sqstore_mysql/mysql.c:705
+#: src/applications/sqstore_mysql/mysql.c:802
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:965
+#: src/applications/sqstore_mysql/mysql.c:977
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1229
+#: src/applications/sqstore_mysql/mysql.c:1241
+#: src/applications/sqstore_mysql/mysql.c:1253
+#: src/applications/sqstore_mysql/mysql.c:1338
#: src/applications/kvstore_sqlite/kv_sqlite.c:44
#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
-#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
-#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
-#: src/util/crypto/hostkey_gcrypt.c:71
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
+#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
+#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
+#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
+#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error: %s\n"
msgstr "'%s'Byanze ku Na: Ikosa"
@@ -685,17 +709,17 @@
msgstr ""
#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:416
+#: src/applications/sqstore_sqlite/sqlite.c:431
msgid "sqlite datastore"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:415
+#: src/applications/sqstore_sqlite/sqlite.c:430
#, c-format
msgid "Invalid data in %s. Trying to fix (by deletion).\n"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:1206
-#: src/applications/sqstore_mysql/mysql.c:1401
+#: src/applications/sqstore_sqlite/sqlite.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1446
#, fuzzy
msgid "# bytes in datastore"
msgstr "#Bayite Yoherejwe:"
@@ -720,46 +744,46 @@
msgid "Session key received from peer `%s' has invalid format (discarded).\n"
msgstr "'%s'Ubutumwa BYAKIRIWE Bivuye"
-#: src/applications/session/connect.c:614
+#: src/applications/session/connect.c:624
#, fuzzy, c-format
msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
msgstr "'%s'Ubutumwa BYAKIRIWE Bivuye"
-#: src/applications/session/connect.c:646
+#: src/applications/session/connect.c:656
#, fuzzy, c-format
msgid "Invalid `%s' message received from peer `%s'.\n"
msgstr "Ubutumwa BYAKIRIWE Bivuye"
-#: src/applications/session/connect.c:656
+#: src/applications/session/connect.c:666
#, c-format
msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
msgstr ""
-#: src/applications/session/connect.c:719
+#: src/applications/session/connect.c:729
#, fuzzy, c-format
msgid ""
"Error parsing encrypted session key from `%s', given message part size is "
"invalid.\n"
msgstr "Bishunzwe: Umukoro Urufunguzo Ubutumwa Ingano ni Sibyo"
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:741
#, c-format
msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
msgstr ""
-#: src/applications/session/connect.c:886
+#: src/applications/session/connect.c:898
msgid "# session keys sent"
msgstr ""
-#: src/applications/session/connect.c:888
+#: src/applications/session/connect.c:900
msgid "# session keys rejected"
msgstr ""
-#: src/applications/session/connect.c:890
+#: src/applications/session/connect.c:902
msgid "# session keys accepted"
msgstr ""
-#: src/applications/session/connect.c:892
+#: src/applications/session/connect.c:904
msgid "# sessions established"
msgstr ""
@@ -828,24 +852,24 @@
msgid "async RPC reply not received.\n"
msgstr "Subiza OYA BYAKIRIWE"
-#: src/applications/sqstore_mysql/mysql.c:379
+#: src/applications/sqstore_mysql/mysql.c:419
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error: %s"
msgstr "'%s'Byanze ku Na: Ikosa"
-#: src/applications/sqstore_mysql/mysql.c:1311
+#: src/applications/sqstore_mysql/mysql.c:1356
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
msgstr "'%s'Byanze ku Na: Ikosa"
-#: src/applications/sqstore_mysql/mysql.c:1423
-#: src/applications/sqstore_mysql/mysql.c:1570
+#: src/applications/sqstore_mysql/mysql.c:1468
+#: src/applications/sqstore_mysql/mysql.c:1615
#, fuzzy, c-format
msgid "Trying to use file `%s' for MySQL configuration.\n"
msgstr "Kuri Gukoresha IDOSIYE kugirango Iboneza"
-#: src/applications/sqstore_mysql/mysql.c:1448
-#: src/applications/sqstore_mysql/mysql.c:1593
+#: src/applications/sqstore_mysql/mysql.c:1493
+#: src/applications/sqstore_mysql/mysql.c:1638
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -1027,7 +1051,7 @@
msgstr "Umukiriya Seriveri Ubutumwa"
#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:52
+#: src/applications/vpn/gnunet-vpn.c:53
#, fuzzy
msgid "Print statistics about GNUnet operations."
msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
@@ -1041,7 +1065,7 @@
#: src/applications/tbench/gnunet-tbench.c:127
#: src/applications/tracekit/gnunet-tracekit.c:315
#: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:148
+#: src/applications/vpn/gnunet-vpn.c:149
#, fuzzy, c-format
msgid "Error establishing connection with gnunetd.\n"
msgstr "Zimya Iyemeza Bivuye"
@@ -2130,15 +2154,15 @@
msgid "enables (anonymous) file-sharing"
msgstr ""
-#: src/applications/fs/module/migration.c:312
+#: src/applications/fs/module/migration.c:374
msgid "# blocks migrated"
msgstr ""
-#: src/applications/fs/module/migration.c:314
+#: src/applications/fs/module/migration.c:376
msgid "# blocks fetched for migration"
msgstr ""
-#: src/applications/fs/module/migration.c:317
+#: src/applications/fs/module/migration.c:379
msgid "# on-demand block migration attempts"
msgstr ""
@@ -2339,31 +2363,31 @@
msgid "Template description."
msgstr "/ku Isobanuramiterere"
-#: src/applications/bootstrap_http/http.c:102
+#: src/applications/bootstrap_http/http.c:109
#, c-format
msgid "Bootstrap data obtained from `%s' is invalid.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:170
+#: src/applications/bootstrap_http/http.c:177
msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:210
+#: src/applications/bootstrap_http/http.c:217
#, c-format
msgid "Bootstrapping using `%s'.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:224
+#: src/applications/bootstrap_http/http.c:231
#, c-format
msgid "Trying to download hostlist from `%s'\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:352
+#: src/applications/bootstrap_http/http.c:359
#, fuzzy, c-format
msgid "Downloaded %llu bytes from `%s'.\n"
msgstr "Idosiye Bivuye"
-#: src/applications/bootstrap_http/http.c:385
+#: src/applications/bootstrap_http/http.c:392
msgid "# HELLOs downloaded via http"
msgstr ""
@@ -2386,7 +2410,7 @@
msgid "tracks bandwidth utilization by gnunetd"
msgstr ""
-#: src/applications/vpn/gnunet-vpn.c:56
+#: src/applications/vpn/gnunet-vpn.c:57
msgid "Suppress display of asynchronous log messages"
msgstr ""
@@ -2610,34 +2634,34 @@
msgid "No"
msgstr "Oya."
-#: src/applications/vpn/vpn.c:1647
+#: src/applications/vpn/vpn.c:1651
#, c-format
msgid "`%s' initialising RFC4913 module %d and %d\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1650
+#: src/applications/vpn/vpn.c:1654
#, c-format
msgid "RFC4193 my First 4 hex digits of host id are %x\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1723
+#: src/applications/vpn/vpn.c:1727
msgid "enables IPv6 over GNUnet (incomplete)"
msgstr ""
-#: src/applications/vpn/vpn.c:1757
+#: src/applications/vpn/vpn.c:1761
msgid "RFC4193 Waiting for tun thread to end\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1771
+#: src/applications/vpn/vpn.c:1775
msgid "RFC4193 The tun thread has ended\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1788
+#: src/applications/vpn/vpn.c:1792
#, c-format
msgid "RFC4193 Closing tunnel %d fd %d\n"
msgstr ""
-#: src/applications/dstore/dstore.c:466
+#: src/applications/dstore/dstore.c:525
#, fuzzy
msgid "# bytes in dstore"
msgstr "#Bayite Yoherejwe:"
@@ -2667,7 +2691,7 @@
msgid "Updates GNUnet datastructures after version change."
msgstr "Nyuma Verisiyo Guhindura>>"
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
#, fuzzy
msgid "run as user LOGIN"
msgstr "Gukoresha Nka Ukoresha:"
@@ -2677,96 +2701,104 @@
msgid "run in client mode (for getting client configuration values)"
msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
-#: src/server/connection.c:1188
+#: src/server/connection.c:1202
#, fuzzy, c-format
msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
msgstr "'%s'Byahiswemo Inyuma Bya Ubutumwa"
-#: src/server/connection.c:1197
+#: src/server/connection.c:1211
#, fuzzy, c-format
msgid "Message details: %u: length %d, priority: %d\n"
msgstr "Birambuye Uburebure By'ibanze"
-#: src/server/connection.c:2744
+#: src/server/connection.c:2897
#, fuzzy, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr "Bivuye Sibyo Imiterere"
-#: src/server/connection.c:2829
+#: src/server/connection.c:2982
#, fuzzy, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr "Umubare Bya"
-#: src/server/connection.c:2851
+#: src/server/connection.c:3004
#, fuzzy
msgid "Message received more than one day old. Dropped.\n"
msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
-#: src/server/connection.c:3337
+#: src/server/connection.c:3500
#, fuzzy
msgid "# outgoing messages dropped"
msgstr "#Ubutumwa"
-#: src/server/connection.c:3340
+#: src/server/connection.c:3503
#, fuzzy
msgid "# bytes of outgoing messages dropped"
msgstr "#Bayite Bya BYAKIRIWE"
-#: src/server/connection.c:3342
+#: src/server/connection.c:3505
msgid "# connections closed (HANGUP sent)"
msgstr ""
-#: src/server/connection.c:3345
+#: src/server/connection.c:3509
+msgid "# connections closed (transport issue)"
+msgstr ""
+
+#: src/server/connection.c:3512
#, fuzzy
msgid "# bytes encrypted"
msgstr "#Bayite"
-#: src/server/connection.c:3349
+#: src/server/connection.c:3516
#, fuzzy
msgid "# bytes transmitted"
msgstr "#Bayite Bya Ubwoko"
-#: src/server/connection.c:3353
+#: src/server/connection.c:3520
#, fuzzy
msgid "# bytes received"
msgstr "#Bayite Bya BYAKIRIWE"
-#: src/server/connection.c:3355
+#: src/server/connection.c:3522
#, fuzzy
msgid "# bytes decrypted"
msgstr "#Bayite"
-#: src/server/connection.c:3356
+#: src/server/connection.c:3523
#, fuzzy
msgid "# bytes noise sent"
msgstr "#Bayite Yoherejwe:"
-#: src/server/connection.c:3359
+#: src/server/connection.c:3526
msgid "# total bytes per second send limit"
msgstr ""
-#: src/server/connection.c:3362
+#: src/server/connection.c:3529
#, fuzzy
msgid "# total bytes per second receive limit"
msgstr "#Bayite Bya BYAKIRIWE"
-#: src/server/connection.c:3365
+#: src/server/connection.c:3532
#, fuzzy
msgid "# total number of messages in send buffers"
msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
-#: src/server/connection.c:3369
+#: src/server/connection.c:3536
msgid "# total number of bytes we were allowed to sent but did not"
msgstr ""
-#: src/server/connection.c:3373
+#: src/server/connection.c:3540
msgid "# total number of bytes we were allowed to sent"
msgstr ""
-#: src/server/connection.c:3377
+#: src/server/connection.c:3544
msgid "# total number of bytes we are currently allowed to send"
msgstr ""
+#: src/server/connection.c:3547
+msgid "# transports switched to stream transport"
+msgstr ""
+
#: src/server/startup.c:206
#, c-format
msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -2872,114 +2904,114 @@
msgid "Could not properly unload service `%s'!\n"
msgstr "OYA Kureka gufungura Serivisi"
-#: src/server/gnunet-transport-check.c:121
+#: src/server/gnunet-transport-check.c:122
#, fuzzy, c-format
msgid "`%s': Could not create hello.\n"
msgstr "'%s':OYA Kurema"
-#: src/server/gnunet-transport-check.c:128
+#: src/server/gnunet-transport-check.c:129
#, fuzzy, c-format
msgid "`%s': Could not connect.\n"
msgstr "'%s':OYA Kwihuza"
-#: src/server/gnunet-transport-check.c:157
+#: src/server/gnunet-transport-check.c:161
#, fuzzy, c-format
msgid "`%s': Could not send.\n"
msgstr "'%s':OYA Kohereza"
-#: src/server/gnunet-transport-check.c:172
+#: src/server/gnunet-transport-check.c:176
#, fuzzy, c-format
msgid "`%s': Did not receive message within %llu ms.\n"
msgstr "'%s':OYA Akira Ubutumwa muri"
-#: src/server/gnunet-transport-check.c:185
+#: src/server/gnunet-transport-check.c:189
#, fuzzy, c-format
msgid "`%s': Could not disconnect.\n"
msgstr "'%s':OYA Gucomora"
-#: src/server/gnunet-transport-check.c:192
+#: src/server/gnunet-transport-check.c:196
#, fuzzy, c-format
msgid ""
"`%s' transport OK. It took %ums to transmit %llu messages of %llu bytes "
"each.\n"
msgstr "'%s'Kuri Ubutumwa Bya Bayite"
-#: src/server/gnunet-transport-check.c:222
+#: src/server/gnunet-transport-check.c:226
#, c-format
msgid " Transport %d is not being tested\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:251
+#: src/server/gnunet-transport-check.c:255
#, c-format
msgid ""
"\n"
"Contacting `%s'."
msgstr ""
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:280
#, fuzzy, c-format
msgid " Connection failed\n"
msgstr "OYA Iyinjizamo Byanze"
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:286
#, c-format
msgid " Connection failed (bug?)\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:319
+#: src/server/gnunet-transport-check.c:323
#, c-format
msgid "Timeout after %llums.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:321
+#: src/server/gnunet-transport-check.c:325
#, c-format
msgid "OK!\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:346
+#: src/server/gnunet-transport-check.c:350
#, fuzzy
msgid "Tool to test if GNUnet transport services are operational."
msgstr "Kuri Igerageza NIBA"
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:354
#, fuzzy
msgid "ping peers from HOSTLISTURL that match transports"
msgstr "Bivuye BIHUYE"
-#: src/server/gnunet-transport-check.c:353
+#: src/server/gnunet-transport-check.c:357
#, fuzzy
msgid "send COUNT messages"
msgstr "Kohereza Ubutumwa"
-#: src/server/gnunet-transport-check.c:356
+#: src/server/gnunet-transport-check.c:360
#, fuzzy
msgid "send messages with SIZE bytes payload"
msgstr "Kohereza Ubutumwa Na: Bayite"
-#: src/server/gnunet-transport-check.c:359
+#: src/server/gnunet-transport-check.c:363
msgid "specifies which TRANSPORT should be tested"
msgstr ""
-#: src/server/gnunet-transport-check.c:362
+#: src/server/gnunet-transport-check.c:366
#, fuzzy
msgid "specifies after how many MS to time-out"
msgstr "Nyuma Kuri Igihe Inyuma"
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:374
msgid "repeat each test X times"
msgstr ""
-#: src/server/gnunet-transport-check.c:431
+#: src/server/gnunet-transport-check.c:435
#, fuzzy, c-format
msgid "Testing transport(s) %s\n"
msgstr "S"
-#: src/server/gnunet-transport-check.c:433
+#: src/server/gnunet-transport-check.c:437
#, fuzzy, c-format
msgid "Available transport(s): %s\n"
msgstr "S"
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:478
#, fuzzy, c-format
msgid ""
"\n"
@@ -3106,12 +3138,12 @@
msgid "libgcrypt has not the expected version (version %s is required).\n"
msgstr "OYA i Ikitezwe: Verisiyo Verisiyo ni Bya ngombwa"
-#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
+#: src/util/os/statuscalls.c:195 src/util/os/statuscalls.c:336
#, fuzzy, c-format
msgid "Failed to parse interface data from `%s'.\n"
msgstr "Kuri Ibyatanzwe Bivuye ku"
-#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
+#: src/util/os/statuscalls.c:379 src/util/os/statuscalls.c:389
#, fuzzy, c-format
msgid ""
"No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -4215,12 +4247,18 @@
msgstr "Ubuturo ku ni"
#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
-#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
-#: src/include/gnunet_util_error.h:236
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:236
#, fuzzy, c-format
msgid "Internal error: assertion failed at %s:%d in %s.\n"
msgstr "Byanze ku"
+#: src/include/gnunet_util_error.h:230
+#, c-format
+msgid ""
+"External protocol violation: assertion failed at %s:%d in %s (no need to "
+"panic, we can handle this).\n"
+msgstr ""
+
#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
#, fuzzy, c-format
msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
@@ -4361,23 +4399,23 @@
"configuration here. Default is no proxy."
msgstr ""
-#: contrib/config-daemon.scm:237 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
msgid "How long should logs be kept?"
msgstr ""
-#: contrib/config-daemon.scm:239 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
msgid ""
"How long should logs be kept? If you specify a value greater than zero, a "
"log is created each day with the date appended to its filename. These logs "
"are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
msgstr ""
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:237
msgid ""
"What maximum number of open file descriptors should be requested from the OS?"
msgstr ""
-#: contrib/config-daemon.scm:252
+#: contrib/config-daemon.scm:239
msgid ""
"The default of 1024 should be fine for most systems. If your system can "
"support more, increasing the number might help support additional clients on "
@@ -4389,62 +4427,62 @@
"run with what it is given."
msgstr ""
-#: contrib/config-daemon.scm:263
+#: contrib/config-daemon.scm:250
msgid "Where should gnunetd write the logs?"
msgstr ""
-#: contrib/config-daemon.scm:275 contrib/config-client.scm:169
-msgid "Configuration of the logging system"
+#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+msgid "Logging"
msgstr ""
-#: contrib/config-daemon.scm:276 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
msgid "Specify which system messages should be logged how"
msgstr ""
-#: contrib/config-daemon.scm:280 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
msgid "Logging of events for users"
msgstr ""
-#: contrib/config-daemon.scm:281 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
msgid "Logging of events for the system administrator"
msgstr ""
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:280
msgid "Where should gnunetd write the PID?"
msgstr ""
-#: contrib/config-daemon.scm:294
+#: contrib/config-daemon.scm:281
msgid ""
"The default is no longer /var/run/gnunetd.pid since we could not delete the "
"file on shutdown at that location."
msgstr ""
-#: contrib/config-daemon.scm:306
+#: contrib/config-daemon.scm:293
msgid "As which user should gnunetd run?"
msgstr ""
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:295
msgid ""
"Empty means \"current user\". On computer startup, it is root/SYSTEM. Under "
"Windows, this setting affects the creation of a new system service only."
msgstr ""
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:308
msgid "Should gnunetd be automatically started when the system boots?"
msgstr ""
-#: contrib/config-daemon.scm:322
+#: contrib/config-daemon.scm:309
msgid ""
"Set to YES if gnunetd should be automatically started on boot. If this "
"option is set, gnunet-setup will install a script to start the daemon upon "
"completion. This option may not work on all systems."
msgstr ""
-#: contrib/config-daemon.scm:334
+#: contrib/config-daemon.scm:321
msgid "Which transport mechanisms should GNUnet use?"
msgstr ""
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:323
msgid ""
"Use space-separated list of the modules, e.g. \"udp smtp tcp\". The "
"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4458,11 +4496,11 @@
"itself."
msgstr ""
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:337
msgid "Which applications should gnunetd support?"
msgstr ""
-#: contrib/config-daemon.scm:352
+#: contrib/config-daemon.scm:339
msgid ""
"Whenever this option is changed, you MUST run gnunet-update. Currently, the "
"available applications are:\n"
@@ -4499,15 +4537,24 @@
"compromise your anonymity."
msgstr ""
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:368
msgid "Disable client-server connections"
msgstr ""
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:369
+msgid ""
+"This option can be used to tell gnunetd not to open the client port. When "
+"run like this, gnunetd will participate as a peer in the network but not "
+"support any user interfaces. This maybe useful for headless systems that "
+"are never expected to have end-user interactions. Note that this will also "
+"prevent you from running diagnostic tools like gnunet-stats!"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
msgid "Disable peer discovery"
msgstr ""
-#: contrib/config-daemon.scm:394
+#: contrib/config-daemon.scm:382
msgid ""
"The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
"peer to peers of which the hostkey has been copied by hand to data/hosts; "
@@ -4519,16 +4566,16 @@
"lines above would need some minor editing :-)."
msgstr ""
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:393
msgid "Disable advertising this peer to other peers"
msgstr ""
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:405
#, fuzzy
msgid "Disable automatic establishment of connections"
msgstr "Byikoresha"
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:406
msgid ""
"If this option is enabled, GNUnet will not automatically establish "
"connections to other peers, but instead wait for applications to "
@@ -4536,21 +4583,22 @@
"connect to us)."
msgstr ""
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:417
msgid "Disable advertising of other peers by this peer"
msgstr ""
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:418
msgid ""
"This option maybe useful during testing, but turning it off is dangerous! If "
"in any doubt, set it to YES (which is the default)."
msgstr ""
-#: contrib/config-daemon.scm:441
-msgid "Client/Server Port"
-msgstr ""
+#: contrib/config-daemon.scm:429
+#, fuzzy
+msgid "Port for communication with GNUnet user interfaces"
+msgstr "i Ukoresha:"
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:430
msgid ""
"Which is the client-server port that is used between gnunetd and the clients "
"(TCP only). You may firewall this port for non-local machines (but you do "
@@ -4558,11 +4606,11 @@
"connections from machines that are listed under TRUSTED)."
msgstr ""
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:441
msgid "IPs allowed to use gnunetd server"
msgstr ""
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:442
msgid ""
"This option specifies which hosts are trusted enough to connect as clients "
"(to the TCP port). This is useful if you run gnunetd on one host of your "
@@ -4573,73 +4621,70 @@
"separated by a semicolon, spaces are not allowed."
msgstr ""
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:454
msgid "Limit connections to the specfied set of peers."
msgstr ""
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:455
msgid ""
"If this option is not set, any peer is allowed to connect. If it is set, "
-"only the specified peers are allowed."
+"only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:466
#, fuzzy
-msgid "Run gnunetd as this user."
-msgstr "Sitatisitiki"
-
-#: contrib/config-daemon.scm:479
-msgid ""
-"When started as root, gnunetd will change permissions to the given user."
-msgstr ""
-
-#: contrib/config-daemon.scm:490
-#, fuzzy
msgid "Run gnunetd as this group."
msgstr "ni OYA"
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:467
msgid ""
"When started as root, gnunetd will change permissions to the given group."
msgstr ""
-#: contrib/config-daemon.scm:502
-msgid "Run gnunetd during system startup?"
+#: contrib/config-daemon.scm:478
+msgid "Prevent the specfied set of peers from connecting."
msgstr ""
-#: contrib/config-daemon.scm:515
-msgid "Prevent the specfied set of peers from connecting."
+#: contrib/config-daemon.scm:479
+msgid ""
+"If this option is not set, any peer is allowed to connect. If the ID of a "
+"peer is listed here, connections from that peer will be refused. Specify "
+"the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:516
-msgid "If this option is not set, any peer is allowed to connect."
+#: contrib/config-daemon.scm:490
+msgid "Topology Maintenance"
msgstr ""
-#: contrib/config-daemon.scm:527
+#: contrib/config-daemon.scm:491
msgid "Rarely used settings for peer advertisements and connections"
msgstr ""
-#: contrib/config-daemon.scm:547
+#: contrib/config-daemon.scm:511
msgid "General settings"
msgstr ""
-#: contrib/config-daemon.scm:548
+#: contrib/config-daemon.scm:512
msgid "Settings that change the behavior of GNUnet in general"
msgstr ""
-#: contrib/config-daemon.scm:576
-msgid "Path settings"
+#: contrib/config-daemon.scm:536
+msgid "Modules"
msgstr ""
-#: contrib/config-daemon.scm:577
-msgid "Prefixes for paths used by GNUnet"
+#: contrib/config-daemon.scm:537
+msgid "Settings that select specific implementations for GNUnet modules"
msgstr ""
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:554
+msgid "Fundamentals"
+msgstr ""
+
+#: contrib/config-daemon.scm:574
msgid "Which database should be used?"
msgstr ""
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:576
msgid ""
"Which database should be used? The options are \"sqstore_sqlite\" and "
"\"sqstore_mysql\". You must run gnunet-update after changing this value!\n"
@@ -4648,11 +4693,11 @@
"is relatively simple. Read the file doc/README.mysql for how to setup mysql."
msgstr ""
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:589
msgid "Which topology should be used?"
msgstr ""
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:591
msgid ""
"Which topology should be used? The only options at the moment are "
"\"topology_default\" and \"topology_f2f\". In default mode, GNUnet will try "
@@ -4665,42 +4710,34 @@
"afraid of establishing (direct) connections to unknown peers."
msgstr ""
-#: contrib/config-daemon.scm:625
-msgid "Modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:626
-msgid "Settings that select specific implementations for GNUnet modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:607
msgid "List of friends for friend-to-friend topology"
msgstr ""
-#: contrib/config-daemon.scm:644
+#: contrib/config-daemon.scm:608
msgid ""
"Specifies the name of a file which contains a list of GNUnet peer IDs that "
"are friends. If used with the friend-to-friend topology, this will ensure "
"that GNUnet only connects to these peers (via any available transport)."
msgstr ""
-#: contrib/config-daemon.scm:658
+#: contrib/config-daemon.scm:622
msgid "Name of the MySQL database GNUnet should use"
msgstr ""
-#: contrib/config-daemon.scm:670
+#: contrib/config-daemon.scm:634
msgid "Configuration file that specifies the MySQL username and password"
msgstr ""
-#: contrib/config-daemon.scm:682
+#: contrib/config-daemon.scm:646
msgid "Configuration of the MySQL database"
msgstr ""
-#: contrib/config-daemon.scm:701
+#: contrib/config-daemon.scm:665
msgid "MB of diskspace GNUnet can use for anonymous file sharing"
msgstr ""
-#: contrib/config-daemon.scm:703
+#: contrib/config-daemon.scm:667
msgid ""
"How much disk space (MB) is GNUnet allowed to use for anonymous file "
"sharing? This does not take indexed files into account, only the space "
@@ -4711,19 +4748,19 @@
"Note that if you change the quota, you need to run gnunet-update afterwards."
msgstr ""
-#: contrib/config-daemon.scm:717
+#: contrib/config-daemon.scm:681
msgid "Size of the routing table for anonymous routing."
msgstr ""
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:693
msgid "Size of the routing table for DHT routing."
msgstr ""
-#: contrib/config-daemon.scm:742
+#: contrib/config-daemon.scm:706
msgid "Allow migrating content to this peer."
msgstr ""
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:708
msgid ""
"If you say yes here, GNUnet will migrate content to your server, and you "
"will not be able to control what data is stored on your machine. \n"
@@ -4735,13 +4772,13 @@
"can be considered liable for it."
msgstr ""
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:722
msgid ""
"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
"stored in /tmp)"
msgstr ""
-#: contrib/config-daemon.scm:759
+#: contrib/config-daemon.scm:723
msgid ""
"DHT index data is inherently small and expires comparatively quickly. It is "
"deleted whenever gnunetd is shut down.\n"
@@ -4749,20 +4786,20 @@
"The size of the DSTORE QUOTA is specified in MB."
msgstr ""
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:737
msgid "Options for anonymous file sharing"
msgstr ""
-#: contrib/config-daemon.scm:792
+#: contrib/config-daemon.scm:756
#, fuzzy
msgid "Applications"
msgstr "ibirindiro"
-#: contrib/config-daemon.scm:808
+#: contrib/config-daemon.scm:772
msgid "Is this machine unreachable behind a NAT?"
msgstr ""
-#: contrib/config-daemon.scm:809
+#: contrib/config-daemon.scm:773
msgid ""
"Set to YES if this machine is behind a NAT that limits connections from the "
"outside to the GNUnet port and that cannot be traversed using UPnP. Note "
@@ -4775,15 +4812,15 @@
"connections. Use YES only if you get no connections otherwise."
msgstr ""
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:784
msgid "Which port should be used by the TCP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
msgid "Should we try to determine our external IP using UPnP?"
msgstr ""
-#: contrib/config-daemon.scm:833
+#: contrib/config-daemon.scm:797
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4791,34 +4828,46 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
-#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
msgid "Which IPs are not allowed to connect?"
msgstr ""
-#: contrib/config-daemon.scm:856
+#: contrib/config-daemon.scm:820
msgid ""
"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
"network interface."
msgstr ""
-#: contrib/config-daemon.scm:868
+#: contrib/config-daemon.scm:832
msgid "TCP transport"
msgstr ""
-#: contrib/config-daemon.scm:886
+#: contrib/config-daemon.scm:850
msgid "Which port should be used by the HTTP transport?"
msgstr ""
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:862
+msgid "Which is the external port of the HTTP transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:863
+msgid ""
+"Use this option if your firewall maps say port 80 to your real HTTP port. "
+"This can be useful in making the HTTP messages appear even more legit "
+"(without the need for running gnunetd as root due to the use of a "
+"priviledged port)."
+msgstr ""
+
+#: contrib/config-daemon.scm:874
msgid "HTTP transport"
msgstr ""
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:889
msgid "Which port should be used by the UDP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:926
+#: contrib/config-daemon.scm:902
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4826,74 +4875,74 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:913
msgid "What is the maximum transfer unit for UDP?"
msgstr ""
-#: contrib/config-daemon.scm:961
+#: contrib/config-daemon.scm:937
msgid ""
"Which IPs are allowed to connect? Leave empty to allow connections from any "
"IP."
msgstr ""
-#: contrib/config-daemon.scm:973
+#: contrib/config-daemon.scm:949
msgid "UDP transport"
msgstr ""
-#: contrib/config-daemon.scm:992
+#: contrib/config-daemon.scm:968
msgid "Which port should be used by the TCP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
+#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
msgid ""
"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
msgstr ""
-#: contrib/config-daemon.scm:1028
+#: contrib/config-daemon.scm:1004
msgid "TCP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1021
msgid "Which port should be used by the UDP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1033
msgid "What is the maximum transfer unit for UDP 6?"
msgstr ""
-#: contrib/config-daemon.scm:1093
+#: contrib/config-daemon.scm:1069
msgid "UDP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1087
msgid "Network interface"
msgstr ""
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1099
msgid "External IP address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1135
+#: contrib/config-daemon.scm:1111
msgid "External IPv6 address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1147
+#: contrib/config-daemon.scm:1123
msgid "Transports"
msgstr ""
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1146
msgid "What is the maximum number of bytes per second that we may receive?"
msgstr ""
-#: contrib/config-daemon.scm:1182
+#: contrib/config-daemon.scm:1158
msgid "What is the maximum number of bytes per second that we may send?"
msgstr ""
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1170
msgid "What is the maximum CPU load (percentage)?"
msgstr ""
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1172
msgid ""
"Which CPU load can be tolerated. Load here always refers to the total "
"system load, that is it includes CPU utilization by other processes. A "
@@ -4903,11 +4952,11 @@
"Multiprocessors may use values above 100."
msgstr ""
-#: contrib/config-daemon.scm:1207
+#: contrib/config-daemon.scm:1183
msgid "What is the maximum IO load (permille)?"
msgstr ""
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1185
msgid ""
"Which IO load can be tolerated. Load here refers to the percentage of CPU "
"cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4917,36 +4966,36 @@
"values are typically between 10 and 75."
msgstr ""
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1196
msgid "What is the maximum CPU load (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1221
+#: contrib/config-daemon.scm:1197
msgid ""
"Which CPU load can be tolerated. This is the hard limit, so once it is "
"reached, gnunetd will start to massively drop data to reduce the load. Use "
"with caution."
msgstr ""
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1208
msgid "What is the maximum upstream bandwidth (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1233
+#: contrib/config-daemon.scm:1209
msgid ""
"The limit is given as a percentage of the MAXNETUPBPS limit. Use 100 to "
"have MAXNETUPBPS be the hard limit. Use zero for no limit."
msgstr ""
-#: contrib/config-daemon.scm:1244
+#: contrib/config-daemon.scm:1220
msgid "Should we disable random padding (experimental option)?"
msgstr ""
-#: contrib/config-daemon.scm:1256
+#: contrib/config-daemon.scm:1232
msgid "Use basic bandwidth limitation? (YES/NO). If in doubt, say YES."
msgstr ""
-#: contrib/config-daemon.scm:1258
+#: contrib/config-daemon.scm:1234
msgid ""
"Basic bandwidth limitation (YES) means simply that the bandwidth limits "
"specified apply to GNUnet and only to GNUnet. If set to YES, you simply "
@@ -4991,11 +5040,11 @@
"since it is irrelevant)."
msgstr ""
-#: contrib/config-daemon.scm:1275
+#: contrib/config-daemon.scm:1251
msgid "Network interface to monitor"
msgstr ""
-#: contrib/config-daemon.scm:1276
+#: contrib/config-daemon.scm:1252
msgid ""
"For which interfaces should we do accounting? GNUnet will evaluate the "
"total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -5006,11 +5055,11 @@
"number reported by 'gnunet-win-tool -n'."
msgstr ""
-#: contrib/config-daemon.scm:1287
+#: contrib/config-daemon.scm:1263
msgid "Load management"
msgstr ""
-#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
msgid "Root node"
msgstr ""
@@ -5143,6 +5192,10 @@
msgstr ""
#, fuzzy
+#~ msgid "Run gnunetd as this user."
+#~ msgstr "Sitatisitiki"
+
+#, fuzzy
#~ msgid "specify nickname"
#~ msgstr "Irihimbano"
@@ -6046,10 +6099,6 @@
#~ msgid "Keyword(s):"
#~ msgstr "S"
-#, fuzzy
-#~ msgid "Run the GNUnet GTK user interface."
-#~ msgstr "i Ukoresha:"
-
#~ msgid "minutes"
#~ msgstr "iminota"
Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/po/sv.po 2007-09-29 22:47:47 UTC (rev 5670)
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the GNUnet package.
# Daniel Nylander <address@hidden>, 2006.
#
+#: contrib/config-daemon.scm:555
msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-30 00:16-0600\n"
+"POT-Creation-Date: 2007-09-29 16:44-0600\n"
"PO-Revision-Date: 2006-01-21 17:16+0100\n"
"Last-Translator: Daniel Nylander <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -52,45 +53,64 @@
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr ""
-#: src/transports/udp6.c:471 src/transports/udp.c:514
+#: src/transports/udp6.c:471 src/transports/udp.c:520
#, c-format
msgid "MTU %llu for `%s' is probably too low!\n"
msgstr ""
-#: src/transports/http.c:522
+#: src/transports/udp6.c:476
+#, fuzzy
+msgid "# bytes received via UDP6"
+msgstr "# byte mottagna via UDP"
+
+#: src/transports/udp6.c:477
+#, fuzzy
+msgid "# bytes sent via UDP6"
+msgstr "# byte skickade via UDP"
+
+#: src/transports/udp6.c:479
+#, fuzzy
+msgid "# bytes dropped by UDP6 (outgoing)"
+msgstr "# byte kastade via UDP (utgående)"
+
+#: src/transports/udp6.c:481
+msgid "# UDP6 connections (right now)"
+msgstr ""
+
+#: src/transports/http.c:824
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
-#: src/transports/http.c:813 src/transports/http.c:892
-#: src/transports/http.c:1007 src/transports/http.c:1147
-#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
-#: src/applications/bootstrap_http/http.c:115
-#: src/applications/bootstrap_http/http.c:247
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:294
-#: src/applications/bootstrap_http/http.c:313
-#: src/applications/bootstrap_http/http.c:326
-#: src/applications/bootstrap_http/http.c:336
-#: src/applications/bootstrap_http/http.c:346
+#: src/transports/http.c:1235 src/transports/http.c:1309
+#: src/transports/http.c:1464 src/transports/http.c:1858
+#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
+#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
+#: src/applications/bootstrap_http/http.c:254
+#: src/applications/bootstrap_http/http.c:270
+#: src/applications/bootstrap_http/http.c:301
+#: src/applications/bootstrap_http/http.c:320
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:343
+#: src/applications/bootstrap_http/http.c:353
#, fuzzy, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-#: src/transports/http.c:1307
+#: src/transports/http.c:2080
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:1316
+#: src/transports/http.c:2089
msgid "# bytes received via HTTP"
msgstr "# byte mottagna via HTTP"
-#: src/transports/http.c:1317
+#: src/transports/http.c:2090
msgid "# bytes sent via HTTP"
msgstr "# byte skickade via HTTP"
-#: src/transports/http.c:1319
+#: src/transports/http.c:2092
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# byte kastade via HTTP (utgående)"
@@ -137,60 +157,65 @@
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
msgstr ""
-#: src/transports/tcp.c:289
+#: src/transports/tcp.c:290
#, fuzzy
msgid "TCP: Could not determine my public IP address.\n"
msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
-#: src/transports/tcp.c:384
+#: src/transports/tcp.c:389
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-#: src/transports/tcp.c:437 src/transports/tcp6.c:404
+#: src/transports/tcp.c:442 src/transports/tcp6.c:404
#, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr ""
-#: src/transports/tcp.c:556
+#: src/transports/tcp.c:561
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"TCP\" to \"NO\"\n"
msgstr ""
-#: src/transports/tcp.c:565
+#: src/transports/tcp.c:570
msgid "# bytes received via TCP"
msgstr "# byte mottogs via TCP"
-#: src/transports/tcp.c:566
+#: src/transports/tcp.c:571
msgid "# bytes sent via TCP"
msgstr "# byte skickades via TCP"
-#: src/transports/tcp.c:568
+#: src/transports/tcp.c:573
msgid "# bytes dropped by TCP (outgoing)"
msgstr "# byte kastade via TCP (utgående)"
-#: src/transports/udp.c:287
+#: src/transports/udp.c:288
msgid "UDP: Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/udp.c:378
+#: src/transports/udp.c:384
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
-#: src/transports/udp.c:529
+#: src/transports/udp.c:535
msgid "# bytes received via UDP"
msgstr "# byte mottagna via UDP"
-#: src/transports/udp.c:530
+#: src/transports/udp.c:536
msgid "# bytes sent via UDP"
msgstr "# byte skickade via UDP"
-#: src/transports/udp.c:532
+#: src/transports/udp.c:538
msgid "# bytes dropped by UDP (outgoing)"
msgstr "# byte kastade via UDP (utgående)"
+#: src/transports/udp.c:540
+#, fuzzy
+msgid "# UDP connections (right now)"
+msgstr "Nätverksanslutning"
+
#: src/transports/tcp6.c:245
msgid "Could not determine my public IPv6 address.\n"
msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
@@ -234,7 +259,7 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/udp_helper.c:94
+#: src/transports/udp_helper.c:96
#, fuzzy
msgid "Received malformed message from udp-peer connection. Closing.\n"
msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
@@ -249,42 +274,42 @@
"allow TIME ms to process a GET command or expire PUT content after ms TIME"
msgstr "tillåt TID ms för behandling av varje kommando"
-#: src/applications/dht/tools/dht-query.c:98
+#: src/applications/dht/tools/dht-query.c:99
#, c-format
msgid "%s(%s) operation returned no results.\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:115
+#: src/applications/dht/tools/dht-query.c:116
#, fuzzy, c-format
msgid "Issuing '%s(%s,%s)' command.\n"
msgstr "\"%s(%s,%s)\" misslyckades.\n"
-#: src/applications/dht/tools/dht-query.c:122
+#: src/applications/dht/tools/dht-query.c:123
#, c-format
msgid "'%s(%s,%s)' succeeded\n"
msgstr "\"%s(%s,%s)\" lyckades\n"
-#: src/applications/dht/tools/dht-query.c:126
+#: src/applications/dht/tools/dht-query.c:127
#, c-format
msgid "'%s(%s,%s)' failed.\n"
msgstr "\"%s(%s,%s)\" misslyckades.\n"
-#: src/applications/dht/tools/dht-query.c:150
+#: src/applications/dht/tools/dht-query.c:151
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:164
#, c-format
msgid "Command `%s' requires an argument (`%s').\n"
msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
-#: src/applications/dht/tools/dht-query.c:180
+#: src/applications/dht/tools/dht-query.c:181
#, c-format
msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
msgstr "Kommando \"%s\" kräver två argument (\"%s\" och \"%s\").\n"
-#: src/applications/dht/tools/dht-query.c:191
+#: src/applications/dht/tools/dht-query.c:192
#, c-format
msgid "Unsupported command `%s'. Aborting.\n"
msgstr "Kommando \"%s\" stöds ej. Avbryter.\n"
@@ -479,7 +504,7 @@
msgstr "# PING-meddelanden i klartext skickade"
#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:901
+#: src/applications/session/connect.c:913
#, c-format
msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
msgstr "\"%s\" registrerar handtag %d (klartext och kryptotext)\n"
@@ -537,12 +562,12 @@
msgstr "# PING-meddelanden skapade"
#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:896
+#: src/applications/session/connect.c:908
msgid "# encrypted PONG messages sent"
msgstr "# krypterade PONG-meddelanden skickade"
#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:894
+#: src/applications/session/connect.c:906
msgid "# encrypted PING messages sent"
msgstr "# krypterade PING-meddelanden skickade"
@@ -565,33 +590,34 @@
#: src/applications/sqstore_sqlite/sqlite.c:54
#: src/applications/sqstore_mysql/mysql.c:145
#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:428
-#: src/applications/sqstore_mysql/mysql.c:438
-#: src/applications/sqstore_mysql/mysql.c:476
-#: src/applications/sqstore_mysql/mysql.c:486
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:529
-#: src/applications/sqstore_mysql/mysql.c:627
-#: src/applications/sqstore_mysql/mysql.c:639
-#: src/applications/sqstore_mysql/mysql.c:651
-#: src/applications/sqstore_mysql/mysql.c:665
-#: src/applications/sqstore_mysql/mysql.c:762
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:917
-#: src/applications/sqstore_mysql/mysql.c:929
-#: src/applications/sqstore_mysql/mysql.c:941
-#: src/applications/sqstore_mysql/mysql.c:1184
-#: src/applications/sqstore_mysql/mysql.c:1196
-#: src/applications/sqstore_mysql/mysql.c:1208
-#: src/applications/sqstore_mysql/mysql.c:1293
+#: src/applications/sqstore_mysql/mysql.c:468
+#: src/applications/sqstore_mysql/mysql.c:478
+#: src/applications/sqstore_mysql/mysql.c:516
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:558
+#: src/applications/sqstore_mysql/mysql.c:569
+#: src/applications/sqstore_mysql/mysql.c:667
+#: src/applications/sqstore_mysql/mysql.c:679
+#: src/applications/sqstore_mysql/mysql.c:691
+#: src/applications/sqstore_mysql/mysql.c:705
+#: src/applications/sqstore_mysql/mysql.c:802
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:965
+#: src/applications/sqstore_mysql/mysql.c:977
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1229
+#: src/applications/sqstore_mysql/mysql.c:1241
+#: src/applications/sqstore_mysql/mysql.c:1253
+#: src/applications/sqstore_mysql/mysql.c:1338
#: src/applications/kvstore_sqlite/kv_sqlite.c:44
#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
-#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
-#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
-#: src/util/crypto/hostkey_gcrypt.c:71
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
+#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
+#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
+#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
+#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
#, c-format
msgid "`%s' failed at %s:%d with error: %s\n"
msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -607,17 +633,17 @@
msgstr ""
#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:416
+#: src/applications/sqstore_sqlite/sqlite.c:431
msgid "sqlite datastore"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:415
+#: src/applications/sqstore_sqlite/sqlite.c:430
#, c-format
msgid "Invalid data in %s. Trying to fix (by deletion).\n"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:1206
-#: src/applications/sqstore_mysql/mysql.c:1401
+#: src/applications/sqstore_sqlite/sqlite.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1446
msgid "# bytes in datastore"
msgstr ""
@@ -642,46 +668,46 @@
msgid "Session key received from peer `%s' has invalid format (discarded).\n"
msgstr "Meddelande mottaget från motpart är ogiltig.\n"
-#: src/applications/session/connect.c:614
+#: src/applications/session/connect.c:624
#, c-format
msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
msgstr ""
-#: src/applications/session/connect.c:646
+#: src/applications/session/connect.c:656
#, c-format
msgid "Invalid `%s' message received from peer `%s'.\n"
msgstr ""
-#: src/applications/session/connect.c:656
+#: src/applications/session/connect.c:666
#, c-format
msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
msgstr ""
-#: src/applications/session/connect.c:719
+#: src/applications/session/connect.c:729
#, c-format
msgid ""
"Error parsing encrypted session key from `%s', given message part size is "
"invalid.\n"
msgstr ""
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:741
#, c-format
msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
msgstr ""
-#: src/applications/session/connect.c:886
+#: src/applications/session/connect.c:898
msgid "# session keys sent"
msgstr "# sessionsnycklar skickade"
-#: src/applications/session/connect.c:888
+#: src/applications/session/connect.c:900
msgid "# session keys rejected"
msgstr "# sessionnycklar vägrade"
-#: src/applications/session/connect.c:890
+#: src/applications/session/connect.c:902
msgid "# session keys accepted"
msgstr "# sessionsnycklar accepterade"
-#: src/applications/session/connect.c:892
+#: src/applications/session/connect.c:904
msgid "# sessions established"
msgstr "# sessioner etablerade"
@@ -748,24 +774,24 @@
msgid "async RPC reply not received.\n"
msgstr ""
-#: src/applications/sqstore_mysql/mysql.c:379
+#: src/applications/sqstore_mysql/mysql.c:419
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error: %s"
msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-#: src/applications/sqstore_mysql/mysql.c:1311
+#: src/applications/sqstore_mysql/mysql.c:1356
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-#: src/applications/sqstore_mysql/mysql.c:1423
-#: src/applications/sqstore_mysql/mysql.c:1570
+#: src/applications/sqstore_mysql/mysql.c:1468
+#: src/applications/sqstore_mysql/mysql.c:1615
#, c-format
msgid "Trying to use file `%s' for MySQL configuration.\n"
msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
-#: src/applications/sqstore_mysql/mysql.c:1448
-#: src/applications/sqstore_mysql/mysql.c:1593
+#: src/applications/sqstore_mysql/mysql.c:1493
+#: src/applications/sqstore_mysql/mysql.c:1638
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -945,7 +971,7 @@
msgstr ""
#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:52
+#: src/applications/vpn/gnunet-vpn.c:53
msgid "Print statistics about GNUnet operations."
msgstr "Skriv ut statistik om GNUnet-operationer."
@@ -957,7 +983,7 @@
#: src/applications/tbench/gnunet-tbench.c:127
#: src/applications/tracekit/gnunet-tracekit.c:315
#: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:148
+#: src/applications/vpn/gnunet-vpn.c:149
#, c-format
msgid "Error establishing connection with gnunetd.\n"
msgstr ""
@@ -1951,15 +1977,15 @@
msgid "enables (anonymous) file-sharing"
msgstr "aktiverar (anonym) fildelning"
-#: src/applications/fs/module/migration.c:312
+#: src/applications/fs/module/migration.c:374
msgid "# blocks migrated"
msgstr ""
-#: src/applications/fs/module/migration.c:314
+#: src/applications/fs/module/migration.c:376
msgid "# blocks fetched for migration"
msgstr ""
-#: src/applications/fs/module/migration.c:317
+#: src/applications/fs/module/migration.c:379
msgid "# on-demand block migration attempts"
msgstr ""
@@ -2157,31 +2183,31 @@
msgid "Template description."
msgstr ""
-#: src/applications/bootstrap_http/http.c:102
+#: src/applications/bootstrap_http/http.c:109
#, fuzzy, c-format
msgid "Bootstrap data obtained from `%s' is invalid.\n"
msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
-#: src/applications/bootstrap_http/http.c:170
+#: src/applications/bootstrap_http/http.c:177
msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:210
+#: src/applications/bootstrap_http/http.c:217
#, c-format
msgid "Bootstrapping using `%s'.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:224
+#: src/applications/bootstrap_http/http.c:231
#, fuzzy, c-format
msgid "Trying to download hostlist from `%s'\n"
msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/applications/bootstrap_http/http.c:352
+#: src/applications/bootstrap_http/http.c:359
#, fuzzy, c-format
msgid "Downloaded %llu bytes from `%s'.\n"
msgstr "Ladda ner filer från GNUnet."
-#: src/applications/bootstrap_http/http.c:385
+#: src/applications/bootstrap_http/http.c:392
msgid "# HELLOs downloaded via http"
msgstr ""
@@ -2204,7 +2230,7 @@
msgid "tracks bandwidth utilization by gnunetd"
msgstr ""
-#: src/applications/vpn/gnunet-vpn.c:56
+#: src/applications/vpn/gnunet-vpn.c:57
msgid "Suppress display of asynchronous log messages"
msgstr ""
@@ -2424,35 +2450,35 @@
msgid "No"
msgstr "Nej"
-#: src/applications/vpn/vpn.c:1647
+#: src/applications/vpn/vpn.c:1651
#, fuzzy, c-format
msgid "`%s' initialising RFC4913 module %d and %d\n"
msgstr "\"%s\" registrerar handtagen %d och %d\n"
-#: src/applications/vpn/vpn.c:1650
+#: src/applications/vpn/vpn.c:1654
#, c-format
msgid "RFC4193 my First 4 hex digits of host id are %x\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1723
+#: src/applications/vpn/vpn.c:1727
#, fuzzy
msgid "enables IPv6 over GNUnet (incomplete)"
msgstr "aktiverar P2P-chatt (ej komplett)"
-#: src/applications/vpn/vpn.c:1757
+#: src/applications/vpn/vpn.c:1761
msgid "RFC4193 Waiting for tun thread to end\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1771
+#: src/applications/vpn/vpn.c:1775
msgid "RFC4193 The tun thread has ended\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1788
+#: src/applications/vpn/vpn.c:1792
#, c-format
msgid "RFC4193 Closing tunnel %d fd %d\n"
msgstr ""
-#: src/applications/dstore/dstore.c:466
+#: src/applications/dstore/dstore.c:525
#, fuzzy
msgid "# bytes in dstore"
msgstr "# byte krypterade"
@@ -2480,7 +2506,7 @@
msgid "Updates GNUnet datastructures after version change."
msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
msgid "run as user LOGIN"
msgstr "kör som användare LOGIN"
@@ -2488,89 +2514,97 @@
msgid "run in client mode (for getting client configuration values)"
msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
-#: src/server/connection.c:1188
+#: src/server/connection.c:1202
#, c-format
msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
msgstr "\"%s\" valda %d av %d meddelanden (MTU: %d).\n"
-#: src/server/connection.c:1197
+#: src/server/connection.c:1211
#, c-format
msgid "Message details: %u: length %d, priority: %d\n"
msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
-#: src/server/connection.c:2744
+#: src/server/connection.c:2897
#, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
-#: src/server/connection.c:2829
+#: src/server/connection.c:2982
#, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr ""
-#: src/server/connection.c:2851
+#: src/server/connection.c:3004
msgid "Message received more than one day old. Dropped.\n"
msgstr ""
-#: src/server/connection.c:3337
+#: src/server/connection.c:3500
msgid "# outgoing messages dropped"
msgstr ""
-#: src/server/connection.c:3340
+#: src/server/connection.c:3503
msgid "# bytes of outgoing messages dropped"
msgstr ""
-#: src/server/connection.c:3342
+#: src/server/connection.c:3505
msgid "# connections closed (HANGUP sent)"
msgstr ""
-#: src/server/connection.c:3345
+#: src/server/connection.c:3509
+msgid "# connections closed (transport issue)"
+msgstr ""
+
+#: src/server/connection.c:3512
msgid "# bytes encrypted"
msgstr "# byte krypterade"
-#: src/server/connection.c:3349
+#: src/server/connection.c:3516
#, fuzzy
msgid "# bytes transmitted"
msgstr "# byte skickade av typen %d"
-#: src/server/connection.c:3353
+#: src/server/connection.c:3520
#, fuzzy
msgid "# bytes received"
msgstr "# byte mottogs via TCP"
-#: src/server/connection.c:3355
+#: src/server/connection.c:3522
msgid "# bytes decrypted"
msgstr "# byte dekrypterade"
-#: src/server/connection.c:3356
+#: src/server/connection.c:3523
msgid "# bytes noise sent"
msgstr ""
-#: src/server/connection.c:3359
+#: src/server/connection.c:3526
msgid "# total bytes per second send limit"
msgstr ""
-#: src/server/connection.c:3362
+#: src/server/connection.c:3529
msgid "# total bytes per second receive limit"
msgstr ""
-#: src/server/connection.c:3365
+#: src/server/connection.c:3532
#, fuzzy
msgid "# total number of messages in send buffers"
msgstr "antal meddelanden i ett meddelandeblock"
-#: src/server/connection.c:3369
+#: src/server/connection.c:3536
msgid "# total number of bytes we were allowed to sent but did not"
msgstr ""
-#: src/server/connection.c:3373
+#: src/server/connection.c:3540
msgid "# total number of bytes we were allowed to sent"
msgstr ""
-#: src/server/connection.c:3377
+#: src/server/connection.c:3544
msgid "# total number of bytes we are currently allowed to send"
msgstr ""
+#: src/server/connection.c:3547
+msgid "# transports switched to stream transport"
+msgstr ""
+
#: src/server/startup.c:206
#, fuzzy, c-format
msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -2675,32 +2709,32 @@
msgid "Could not properly unload service `%s'!\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:121
+#: src/server/gnunet-transport-check.c:122
#, c-format
msgid "`%s': Could not create hello.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:128
+#: src/server/gnunet-transport-check.c:129
#, c-format
msgid "`%s': Could not connect.\n"
msgstr "\"%s\": Kunde inte ansluta.\n"
-#: src/server/gnunet-transport-check.c:157
+#: src/server/gnunet-transport-check.c:161
#, c-format
msgid "`%s': Could not send.\n"
msgstr "\"%s\": Kunde inte skicka.\n"
-#: src/server/gnunet-transport-check.c:172
+#: src/server/gnunet-transport-check.c:176
#, c-format
msgid "`%s': Did not receive message within %llu ms.\n"
msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
-#: src/server/gnunet-transport-check.c:185
+#: src/server/gnunet-transport-check.c:189
#, c-format
msgid "`%s': Could not disconnect.\n"
msgstr "\"%s\": Kunde inte koppla ned.\n"
-#: src/server/gnunet-transport-check.c:192
+#: src/server/gnunet-transport-check.c:196
#, fuzzy, c-format
msgid ""
"`%s' transport OK. It took %ums to transmit %llu messages of %llu bytes "
@@ -2709,12 +2743,12 @@
"\"%s\" transport OK. Det tog %ums att överföra %d meddelanden på %d byte "
"styck.\n"
-#: src/server/gnunet-transport-check.c:222
+#: src/server/gnunet-transport-check.c:226
#, fuzzy, c-format
msgid " Transport %d is not being tested\n"
msgstr " Transport %d ej tillgänglig\n"
-#: src/server/gnunet-transport-check.c:251
+#: src/server/gnunet-transport-check.c:255
#, c-format
msgid ""
"\n"
@@ -2723,65 +2757,65 @@
"\n"
"Kontaktar \"%s\"."
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:280
#, c-format
msgid " Connection failed\n"
msgstr " Anslutning misslyckades\n"
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:286
#, c-format
msgid " Connection failed (bug?)\n"
msgstr " Anslutning misslyckades (fel?)\n"
-#: src/server/gnunet-transport-check.c:319
+#: src/server/gnunet-transport-check.c:323
#, c-format
msgid "Timeout after %llums.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:321
+#: src/server/gnunet-transport-check.c:325
#, fuzzy, c-format
msgid "OK!\n"
msgstr "OK"
-#: src/server/gnunet-transport-check.c:346
+#: src/server/gnunet-transport-check.c:350
msgid "Tool to test if GNUnet transport services are operational."
msgstr ""
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:354
msgid "ping peers from HOSTLISTURL that match transports"
msgstr ""
-#: src/server/gnunet-transport-check.c:353
+#: src/server/gnunet-transport-check.c:357
msgid "send COUNT messages"
msgstr "skicka ANTAL meddelanden"
-#: src/server/gnunet-transport-check.c:356
+#: src/server/gnunet-transport-check.c:360
msgid "send messages with SIZE bytes payload"
msgstr "skicka meddelanden med STORLEK bytes nyttolast"
-#: src/server/gnunet-transport-check.c:359
+#: src/server/gnunet-transport-check.c:363
msgid "specifies which TRANSPORT should be tested"
msgstr "anger vilken TRANSPORT som ska testas"
-#: src/server/gnunet-transport-check.c:362
+#: src/server/gnunet-transport-check.c:366
msgid "specifies after how many MS to time-out"
msgstr "anger timeout efter antal MS"
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:374
msgid "repeat each test X times"
msgstr ""
-#: src/server/gnunet-transport-check.c:431
+#: src/server/gnunet-transport-check.c:435
#, c-format
msgid "Testing transport(s) %s\n"
msgstr "Testar transport(er) %s\n"
-#: src/server/gnunet-transport-check.c:433
+#: src/server/gnunet-transport-check.c:437
#, c-format
msgid "Available transport(s): %s\n"
msgstr "Tillgängliga transport(er): %s\n"
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:478
#, c-format
msgid ""
"\n"
@@ -2893,12 +2927,12 @@
msgid "libgcrypt has not the expected version (version %s is required).\n"
msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
-#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
+#: src/util/os/statuscalls.c:195 src/util/os/statuscalls.c:336
#, fuzzy, c-format
msgid "Failed to parse interface data from `%s'.\n"
msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
+#: src/util/os/statuscalls.c:379 src/util/os/statuscalls.c:389
#, c-format
msgid ""
"No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -4000,12 +4034,18 @@
msgstr "ange värd på vilken gnunetd körs"
#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
-#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
-#: src/include/gnunet_util_error.h:236
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:236
#, c-format
msgid "Internal error: assertion failed at %s:%d in %s.\n"
msgstr ""
+#: src/include/gnunet_util_error.h:230
+#, c-format
+msgid ""
+"External protocol violation: assertion failed at %s:%d in %s (no need to "
+"panic, we can handle this).\n"
+msgstr ""
+
#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
#, fuzzy, c-format
msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
@@ -4148,23 +4188,23 @@
"configuration here. Default is no proxy."
msgstr ""
-#: contrib/config-daemon.scm:237 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
msgid "How long should logs be kept?"
msgstr ""
-#: contrib/config-daemon.scm:239 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
msgid ""
"How long should logs be kept? If you specify a value greater than zero, a "
"log is created each day with the date appended to its filename. These logs "
"are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
msgstr ""
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:237
msgid ""
"What maximum number of open file descriptors should be requested from the OS?"
msgstr ""
-#: contrib/config-daemon.scm:252
+#: contrib/config-daemon.scm:239
msgid ""
"The default of 1024 should be fine for most systems. If your system can "
"support more, increasing the number might help support additional clients on "
@@ -4176,62 +4216,62 @@
"run with what it is given."
msgstr ""
-#: contrib/config-daemon.scm:263
+#: contrib/config-daemon.scm:250
msgid "Where should gnunetd write the logs?"
msgstr ""
-#: contrib/config-daemon.scm:275 contrib/config-client.scm:169
-msgid "Configuration of the logging system"
+#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+msgid "Logging"
msgstr ""
-#: contrib/config-daemon.scm:276 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
msgid "Specify which system messages should be logged how"
msgstr ""
-#: contrib/config-daemon.scm:280 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
msgid "Logging of events for users"
msgstr ""
-#: contrib/config-daemon.scm:281 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
msgid "Logging of events for the system administrator"
msgstr ""
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:280
msgid "Where should gnunetd write the PID?"
msgstr ""
-#: contrib/config-daemon.scm:294
+#: contrib/config-daemon.scm:281
msgid ""
"The default is no longer /var/run/gnunetd.pid since we could not delete the "
"file on shutdown at that location."
msgstr ""
-#: contrib/config-daemon.scm:306
+#: contrib/config-daemon.scm:293
msgid "As which user should gnunetd run?"
msgstr ""
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:295
msgid ""
"Empty means \"current user\". On computer startup, it is root/SYSTEM. Under "
"Windows, this setting affects the creation of a new system service only."
msgstr ""
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:308
msgid "Should gnunetd be automatically started when the system boots?"
msgstr ""
-#: contrib/config-daemon.scm:322
+#: contrib/config-daemon.scm:309
msgid ""
"Set to YES if gnunetd should be automatically started on boot. If this "
"option is set, gnunet-setup will install a script to start the daemon upon "
"completion. This option may not work on all systems."
msgstr ""
-#: contrib/config-daemon.scm:334
+#: contrib/config-daemon.scm:321
msgid "Which transport mechanisms should GNUnet use?"
msgstr ""
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:323
msgid ""
"Use space-separated list of the modules, e.g. \"udp smtp tcp\". The "
"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4245,11 +4285,11 @@
"itself."
msgstr ""
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:337
msgid "Which applications should gnunetd support?"
msgstr ""
-#: contrib/config-daemon.scm:352
+#: contrib/config-daemon.scm:339
msgid ""
"Whenever this option is changed, you MUST run gnunet-update. Currently, the "
"available applications are:\n"
@@ -4286,15 +4326,24 @@
"compromise your anonymity."
msgstr ""
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:368
msgid "Disable client-server connections"
msgstr ""
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:369
+msgid ""
+"This option can be used to tell gnunetd not to open the client port. When "
+"run like this, gnunetd will participate as a peer in the network but not "
+"support any user interfaces. This maybe useful for headless systems that "
+"are never expected to have end-user interactions. Note that this will also "
+"prevent you from running diagnostic tools like gnunet-stats!"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
msgid "Disable peer discovery"
msgstr ""
-#: contrib/config-daemon.scm:394
+#: contrib/config-daemon.scm:382
msgid ""
"The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
"peer to peers of which the hostkey has been copied by hand to data/hosts; "
@@ -4306,15 +4355,15 @@
"lines above would need some minor editing :-)."
msgstr ""
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:393
msgid "Disable advertising this peer to other peers"
msgstr ""
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:405
msgid "Disable automatic establishment of connections"
msgstr ""
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:406
msgid ""
"If this option is enabled, GNUnet will not automatically establish "
"connections to other peers, but instead wait for applications to "
@@ -4322,21 +4371,22 @@
"connect to us)."
msgstr ""
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:417
msgid "Disable advertising of other peers by this peer"
msgstr ""
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:418
msgid ""
"This option maybe useful during testing, but turning it off is dangerous! If "
"in any doubt, set it to YES (which is the default)."
msgstr ""
-#: contrib/config-daemon.scm:441
-msgid "Client/Server Port"
-msgstr ""
+#: contrib/config-daemon.scm:429
+#, fuzzy
+msgid "Port for communication with GNUnet user interfaces"
+msgstr "Skriv ut information om GNUnets motparter."
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:430
msgid ""
"Which is the client-server port that is used between gnunetd and the clients "
"(TCP only). You may firewall this port for non-local machines (but you do "
@@ -4344,11 +4394,11 @@
"connections from machines that are listed under TRUSTED)."
msgstr ""
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:441
msgid "IPs allowed to use gnunetd server"
msgstr ""
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:442
msgid ""
"This option specifies which hosts are trusted enough to connect as clients "
"(to the TCP port). This is useful if you run gnunetd on one host of your "
@@ -4359,75 +4409,71 @@
"separated by a semicolon, spaces are not allowed."
msgstr ""
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:454
msgid "Limit connections to the specfied set of peers."
msgstr ""
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:455
msgid ""
"If this option is not set, any peer is allowed to connect. If it is set, "
-"only the specified peers are allowed."
+"only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:466
#, fuzzy
-msgid "Run gnunetd as this user."
-msgstr "Kör gnunet-update"
-
-#: contrib/config-daemon.scm:479
-msgid ""
-"When started as root, gnunetd will change permissions to the given user."
-msgstr ""
-
-#: contrib/config-daemon.scm:490
-#, fuzzy
msgid "Run gnunetd as this group."
msgstr "Kör gnunet-update"
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:467
msgid ""
"When started as root, gnunetd will change permissions to the given group."
msgstr ""
-#: contrib/config-daemon.scm:502
-msgid "Run gnunetd during system startup?"
+#: contrib/config-daemon.scm:478
+msgid "Prevent the specfied set of peers from connecting."
msgstr ""
-#: contrib/config-daemon.scm:515
-msgid "Prevent the specfied set of peers from connecting."
+#: contrib/config-daemon.scm:479
+msgid ""
+"If this option is not set, any peer is allowed to connect. If the ID of a "
+"peer is listed here, connections from that peer will be refused. Specify "
+"the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:516
-msgid "If this option is not set, any peer is allowed to connect."
+#: contrib/config-daemon.scm:490
+msgid "Topology Maintenance"
msgstr ""
-#: contrib/config-daemon.scm:527
+#: contrib/config-daemon.scm:491
msgid "Rarely used settings for peer advertisements and connections"
msgstr ""
-#: contrib/config-daemon.scm:547
+#: contrib/config-daemon.scm:511
#, fuzzy
msgid "General settings"
msgstr "Andra inställningar"
-#: contrib/config-daemon.scm:548
+#: contrib/config-daemon.scm:512
msgid "Settings that change the behavior of GNUnet in general"
msgstr ""
-#: contrib/config-daemon.scm:576
-#, fuzzy
-msgid "Path settings"
-msgstr "Andra inställningar"
+#: contrib/config-daemon.scm:536
+msgid "Modules"
+msgstr ""
-#: contrib/config-daemon.scm:577
-msgid "Prefixes for paths used by GNUnet"
+#: contrib/config-daemon.scm:537
+msgid "Settings that select specific implementations for GNUnet modules"
msgstr ""
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:554
+msgid "Fundamentals"
+msgstr ""
+
+#: contrib/config-daemon.scm:574
msgid "Which database should be used?"
msgstr ""
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:576
msgid ""
"Which database should be used? The options are \"sqstore_sqlite\" and "
"\"sqstore_mysql\". You must run gnunet-update after changing this value!\n"
@@ -4436,11 +4482,11 @@
"is relatively simple. Read the file doc/README.mysql for how to setup mysql."
msgstr ""
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:589
msgid "Which topology should be used?"
msgstr ""
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:591
msgid ""
"Which topology should be used? The only options at the moment are "
"\"topology_default\" and \"topology_f2f\". In default mode, GNUnet will try "
@@ -4453,43 +4499,35 @@
"afraid of establishing (direct) connections to unknown peers."
msgstr ""
-#: contrib/config-daemon.scm:625
-msgid "Modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:626
-msgid "Settings that select specific implementations for GNUnet modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:607
msgid "List of friends for friend-to-friend topology"
msgstr ""
-#: contrib/config-daemon.scm:644
+#: contrib/config-daemon.scm:608
msgid ""
"Specifies the name of a file which contains a list of GNUnet peer IDs that "
"are friends. If used with the friend-to-friend topology, this will ensure "
"that GNUnet only connects to these peers (via any available transport)."
msgstr ""
-#: contrib/config-daemon.scm:658
+#: contrib/config-daemon.scm:622
msgid "Name of the MySQL database GNUnet should use"
msgstr ""
-#: contrib/config-daemon.scm:670
+#: contrib/config-daemon.scm:634
msgid "Configuration file that specifies the MySQL username and password"
msgstr ""
-#: contrib/config-daemon.scm:682
+#: contrib/config-daemon.scm:646
#, fuzzy
msgid "Configuration of the MySQL database"
msgstr "Konfigurationsfil \"%s\" skapad.\n"
-#: contrib/config-daemon.scm:701
+#: contrib/config-daemon.scm:665
msgid "MB of diskspace GNUnet can use for anonymous file sharing"
msgstr ""
-#: contrib/config-daemon.scm:703
+#: contrib/config-daemon.scm:667
msgid ""
"How much disk space (MB) is GNUnet allowed to use for anonymous file "
"sharing? This does not take indexed files into account, only the space "
@@ -4500,19 +4538,19 @@
"Note that if you change the quota, you need to run gnunet-update afterwards."
msgstr ""
-#: contrib/config-daemon.scm:717
+#: contrib/config-daemon.scm:681
msgid "Size of the routing table for anonymous routing."
msgstr ""
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:693
msgid "Size of the routing table for DHT routing."
msgstr ""
-#: contrib/config-daemon.scm:742
+#: contrib/config-daemon.scm:706
msgid "Allow migrating content to this peer."
msgstr ""
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:708
msgid ""
"If you say yes here, GNUnet will migrate content to your server, and you "
"will not be able to control what data is stored on your machine. \n"
@@ -4524,13 +4562,13 @@
"can be considered liable for it."
msgstr ""
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:722
msgid ""
"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
"stored in /tmp)"
msgstr ""
-#: contrib/config-daemon.scm:759
+#: contrib/config-daemon.scm:723
msgid ""
"DHT index data is inherently small and expires comparatively quickly. It is "
"deleted whenever gnunetd is shut down.\n"
@@ -4538,21 +4576,21 @@
"The size of the DSTORE QUOTA is specified in MB."
msgstr ""
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:737
#, fuzzy
msgid "Options for anonymous file sharing"
msgstr "aktiverar (anonym) fildelning"
-#: contrib/config-daemon.scm:792
+#: contrib/config-daemon.scm:756
#, fuzzy
msgid "Applications"
msgstr "_Alternativ"
-#: contrib/config-daemon.scm:808
+#: contrib/config-daemon.scm:772
msgid "Is this machine unreachable behind a NAT?"
msgstr ""
-#: contrib/config-daemon.scm:809
+#: contrib/config-daemon.scm:773
msgid ""
"Set to YES if this machine is behind a NAT that limits connections from the "
"outside to the GNUnet port and that cannot be traversed using UPnP. Note "
@@ -4565,15 +4603,15 @@
"connections. Use YES only if you get no connections otherwise."
msgstr ""
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:784
msgid "Which port should be used by the TCP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
msgid "Should we try to determine our external IP using UPnP?"
msgstr ""
-#: contrib/config-daemon.scm:833
+#: contrib/config-daemon.scm:797
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4581,34 +4619,46 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
-#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
msgid "Which IPs are not allowed to connect?"
msgstr ""
-#: contrib/config-daemon.scm:856
+#: contrib/config-daemon.scm:820
msgid ""
"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
"network interface."
msgstr ""
-#: contrib/config-daemon.scm:868
+#: contrib/config-daemon.scm:832
msgid "TCP transport"
msgstr ""
-#: contrib/config-daemon.scm:886
+#: contrib/config-daemon.scm:850
msgid "Which port should be used by the HTTP transport?"
msgstr ""
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:862
+msgid "Which is the external port of the HTTP transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:863
+msgid ""
+"Use this option if your firewall maps say port 80 to your real HTTP port. "
+"This can be useful in making the HTTP messages appear even more legit "
+"(without the need for running gnunetd as root due to the use of a "
+"priviledged port)."
+msgstr ""
+
+#: contrib/config-daemon.scm:874
msgid "HTTP transport"
msgstr ""
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:889
msgid "Which port should be used by the UDP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:926
+#: contrib/config-daemon.scm:902
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4616,75 +4666,75 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:913
msgid "What is the maximum transfer unit for UDP?"
msgstr ""
-#: contrib/config-daemon.scm:961
+#: contrib/config-daemon.scm:937
msgid ""
"Which IPs are allowed to connect? Leave empty to allow connections from any "
"IP."
msgstr ""
-#: contrib/config-daemon.scm:973
+#: contrib/config-daemon.scm:949
msgid "UDP transport"
msgstr ""
-#: contrib/config-daemon.scm:992
+#: contrib/config-daemon.scm:968
msgid "Which port should be used by the TCP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
+#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
msgid ""
"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
msgstr ""
-#: contrib/config-daemon.scm:1028
+#: contrib/config-daemon.scm:1004
msgid "TCP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1021
msgid "Which port should be used by the UDP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1033
msgid "What is the maximum transfer unit for UDP 6?"
msgstr ""
-#: contrib/config-daemon.scm:1093
+#: contrib/config-daemon.scm:1069
msgid "UDP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1087
#, fuzzy
msgid "Network interface"
msgstr "Nätverksgränssnitt:"
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1099
msgid "External IP address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1135
+#: contrib/config-daemon.scm:1111
msgid "External IPv6 address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1147
+#: contrib/config-daemon.scm:1123
msgid "Transports"
msgstr ""
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1146
msgid "What is the maximum number of bytes per second that we may receive?"
msgstr ""
-#: contrib/config-daemon.scm:1182
+#: contrib/config-daemon.scm:1158
msgid "What is the maximum number of bytes per second that we may send?"
msgstr ""
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1170
msgid "What is the maximum CPU load (percentage)?"
msgstr ""
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1172
msgid ""
"Which CPU load can be tolerated. Load here always refers to the total "
"system load, that is it includes CPU utilization by other processes. A "
@@ -4694,11 +4744,11 @@
"Multiprocessors may use values above 100."
msgstr ""
-#: contrib/config-daemon.scm:1207
+#: contrib/config-daemon.scm:1183
msgid "What is the maximum IO load (permille)?"
msgstr ""
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1185
msgid ""
"Which IO load can be tolerated. Load here refers to the percentage of CPU "
"cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4708,36 +4758,36 @@
"values are typically between 10 and 75."
msgstr ""
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1196
msgid "What is the maximum CPU load (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1221
+#: contrib/config-daemon.scm:1197
msgid ""
"Which CPU load can be tolerated. This is the hard limit, so once it is "
"reached, gnunetd will start to massively drop data to reduce the load. Use "
"with caution."
msgstr ""
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1208
msgid "What is the maximum upstream bandwidth (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1233
+#: contrib/config-daemon.scm:1209
msgid ""
"The limit is given as a percentage of the MAXNETUPBPS limit. Use 100 to "
"have MAXNETUPBPS be the hard limit. Use zero for no limit."
msgstr ""
-#: contrib/config-daemon.scm:1244
+#: contrib/config-daemon.scm:1220
msgid "Should we disable random padding (experimental option)?"
msgstr ""
-#: contrib/config-daemon.scm:1256
+#: contrib/config-daemon.scm:1232
msgid "Use basic bandwidth limitation? (YES/NO). If in doubt, say YES."
msgstr ""
-#: contrib/config-daemon.scm:1258
+#: contrib/config-daemon.scm:1234
msgid ""
"Basic bandwidth limitation (YES) means simply that the bandwidth limits "
"specified apply to GNUnet and only to GNUnet. If set to YES, you simply "
@@ -4782,12 +4832,12 @@
"since it is irrelevant)."
msgstr ""
-#: contrib/config-daemon.scm:1275
+#: contrib/config-daemon.scm:1251
#, fuzzy
msgid "Network interface to monitor"
msgstr "Nätverksgränssnitt:"
-#: contrib/config-daemon.scm:1276
+#: contrib/config-daemon.scm:1252
msgid ""
"For which interfaces should we do accounting? GNUnet will evaluate the "
"total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -4798,11 +4848,11 @@
"number reported by 'gnunet-win-tool -n'."
msgstr ""
-#: contrib/config-daemon.scm:1287
+#: contrib/config-daemon.scm:1263
msgid "Load management"
msgstr ""
-#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
msgid "Root node"
msgstr ""
@@ -4936,6 +4986,14 @@
msgid "The directory for GNUnet files that belong to the user."
msgstr ""
+#, fuzzy
+#~ msgid "Run gnunetd as this user."
+#~ msgstr "Kör gnunet-update"
+
+#, fuzzy
+#~ msgid "Path settings"
+#~ msgstr "Andra inställningar"
+
#~ msgid "specify nickname"
#~ msgstr "ange smeknamn"
Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/po/vi.po 2007-09-29 22:47:47 UTC (rev 5670)
@@ -2,11 +2,12 @@
# Copyright (C) 2005 Free Software Foundation, Inc.
# Copyright (C) YEAR Christian Grothoff.
# Phan Vinh Thinh <address@hidden>, 2005.
+#: contrib/config-daemon.scm:555
msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-30 00:16-0600\n"
+"POT-Creation-Date: 2007-09-29 16:44-0600\n"
"PO-Revision-Date: 2005-07-05 21:18+0400\n"
"Last-Translator: Phan Vinh Thinh <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -51,45 +52,64 @@
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr "UDP6: Không nhận ra địa chỉ IP công cộng của tôi.\n"
-#: src/transports/udp6.c:471 src/transports/udp.c:514
+#: src/transports/udp6.c:471 src/transports/udp.c:520
#, fuzzy, c-format
msgid "MTU %llu for `%s' is probably too low!\n"
msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
-#: src/transports/http.c:522
+#: src/transports/udp6.c:476
+#, fuzzy
+msgid "# bytes received via UDP6"
+msgstr "# byte nhận được qua UDP"
+
+#: src/transports/udp6.c:477
+#, fuzzy
+msgid "# bytes sent via UDP6"
+msgstr "# byte gửi qua UDP"
+
+#: src/transports/udp6.c:479
+#, fuzzy
+msgid "# bytes dropped by UDP6 (outgoing)"
+msgstr "# byte loại bỏ bởi UDP (đi ra)"
+
+#: src/transports/udp6.c:481
+msgid "# UDP6 connections (right now)"
+msgstr ""
+
+#: src/transports/http.c:824
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
-#: src/transports/http.c:813 src/transports/http.c:892
-#: src/transports/http.c:1007 src/transports/http.c:1147
-#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
-#: src/applications/bootstrap_http/http.c:115
-#: src/applications/bootstrap_http/http.c:247
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:294
-#: src/applications/bootstrap_http/http.c:313
-#: src/applications/bootstrap_http/http.c:326
-#: src/applications/bootstrap_http/http.c:336
-#: src/applications/bootstrap_http/http.c:346
+#: src/transports/http.c:1235 src/transports/http.c:1309
+#: src/transports/http.c:1464 src/transports/http.c:1858
+#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
+#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
+#: src/applications/bootstrap_http/http.c:254
+#: src/applications/bootstrap_http/http.c:270
+#: src/applications/bootstrap_http/http.c:301
+#: src/applications/bootstrap_http/http.c:320
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:343
+#: src/applications/bootstrap_http/http.c:353
#, fuzzy, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
-#: src/transports/http.c:1307
+#: src/transports/http.c:2080
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:1316
+#: src/transports/http.c:2089
msgid "# bytes received via HTTP"
msgstr "# byte nhận được qua HTTP"
-#: src/transports/http.c:1317
+#: src/transports/http.c:2090
msgid "# bytes sent via HTTP"
msgstr "# byte gửi qua HTTP"
-#: src/transports/http.c:1319
+#: src/transports/http.c:2092
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# byte loại bỏ bởi HTTP (đi ra)"
@@ -135,62 +155,67 @@
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
-#: src/transports/tcp.c:289
+#: src/transports/tcp.c:290
#, fuzzy
msgid "TCP: Could not determine my public IP address.\n"
msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
-#: src/transports/tcp.c:384
+#: src/transports/tcp.c:389
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
-#: src/transports/tcp.c:437 src/transports/tcp6.c:404
+#: src/transports/tcp.c:442 src/transports/tcp6.c:404
#, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr "Chạy dịch vụ truyền tải trên cổng %d thất bại.\n"
-#: src/transports/tcp.c:556
+#: src/transports/tcp.c:561
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"TCP\" to \"NO\"\n"
msgstr ""
-#: src/transports/tcp.c:565
+#: src/transports/tcp.c:570
msgid "# bytes received via TCP"
msgstr "# byte nhận được qua TCP"
-#: src/transports/tcp.c:566
+#: src/transports/tcp.c:571
msgid "# bytes sent via TCP"
msgstr "# Byte gửi qua TCP"
-#: src/transports/tcp.c:568
+#: src/transports/tcp.c:573
msgid "# bytes dropped by TCP (outgoing)"
msgstr "# byte loại đi bởi TCP (đi ra)"
-#: src/transports/udp.c:287
+#: src/transports/udp.c:288
msgid "UDP: Could not determine my public IP address.\n"
msgstr "UDP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
-#: src/transports/udp.c:378
+#: src/transports/udp.c:384
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
"Gửi thông báo với kích thước %d qua UDP tới %u.%u.%u.%u:%u không thành công: "
"%s\n"
-#: src/transports/udp.c:529
+#: src/transports/udp.c:535
msgid "# bytes received via UDP"
msgstr "# byte nhận được qua UDP"
-#: src/transports/udp.c:530
+#: src/transports/udp.c:536
msgid "# bytes sent via UDP"
msgstr "# byte gửi qua UDP"
-#: src/transports/udp.c:532
+#: src/transports/udp.c:538
msgid "# bytes dropped by UDP (outgoing)"
msgstr "# byte loại bỏ bởi UDP (đi ra)"
+#: src/transports/udp.c:540
+#, fuzzy
+msgid "# UDP connections (right now)"
+msgstr "Kết nối mạng"
+
#: src/transports/tcp6.c:245
msgid "Could not determine my public IPv6 address.\n"
msgstr "Không nhận ra địa chỉ IPv6 của tôi.\n"
@@ -239,7 +264,7 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/udp_helper.c:94
+#: src/transports/udp_helper.c:96
#, fuzzy
msgid "Received malformed message from udp-peer connection. Closing.\n"
msgstr ""
@@ -257,42 +282,42 @@
"allow TIME ms to process a GET command or expire PUT content after ms TIME"
msgstr "cho phép TIME mili giây để tiến hành mỗi câu lệnh"
-#: src/applications/dht/tools/dht-query.c:98
+#: src/applications/dht/tools/dht-query.c:99
#, c-format
msgid "%s(%s) operation returned no results.\n"
msgstr ""
-#: src/applications/dht/tools/dht-query.c:115
+#: src/applications/dht/tools/dht-query.c:116
#, fuzzy, c-format
msgid "Issuing '%s(%s,%s)' command.\n"
msgstr "'%s(%s,%s)' thất bại.\n"
-#: src/applications/dht/tools/dht-query.c:122
+#: src/applications/dht/tools/dht-query.c:123
#, c-format
msgid "'%s(%s,%s)' succeeded\n"
msgstr "'%s(%s,%s)' đã thành công\n"
-#: src/applications/dht/tools/dht-query.c:126
+#: src/applications/dht/tools/dht-query.c:127
#, c-format
msgid "'%s(%s,%s)' failed.\n"
msgstr "'%s(%s,%s)' thất bại.\n"
-#: src/applications/dht/tools/dht-query.c:150
+#: src/applications/dht/tools/dht-query.c:151
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr "Kết nối tới gnunetd không thành công.\n"
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:164
#, fuzzy, c-format
msgid "Command `%s' requires an argument (`%s').\n"
msgstr "Câu lệnh '%s' yêu cầu một tham số ('%s')\n"
-#: src/applications/dht/tools/dht-query.c:180
+#: src/applications/dht/tools/dht-query.c:181
#, fuzzy, c-format
msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
msgstr "Câu lệnh '%s' yêu cầu hai tham số ('%s' và '%s')\n"
-#: src/applications/dht/tools/dht-query.c:191
+#: src/applications/dht/tools/dht-query.c:192
#, fuzzy, c-format
msgid "Unsupported command `%s'. Aborting.\n"
msgstr "Câu lệnh không hỗ trợ '%s'. Đang thoát.\n"
@@ -501,7 +526,7 @@
msgstr "# đã gửi các thông báo PING dạng văn bản thông thường"
#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:901
+#: src/applications/session/connect.c:913
#, fuzzy, c-format
msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
msgstr ""
@@ -562,12 +587,12 @@
msgstr "# đã tạo tin nhắn PING"
#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:896
+#: src/applications/session/connect.c:908
msgid "# encrypted PONG messages sent"
msgstr "# đã gửi thông báo PONG đã mã hóa"
#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:894
+#: src/applications/session/connect.c:906
msgid "# encrypted PING messages sent"
msgstr "# đã gửi các thông báo PING mã hóa"
@@ -592,33 +617,34 @@
#: src/applications/sqstore_sqlite/sqlite.c:54
#: src/applications/sqstore_mysql/mysql.c:145
#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:428
-#: src/applications/sqstore_mysql/mysql.c:438
-#: src/applications/sqstore_mysql/mysql.c:476
-#: src/applications/sqstore_mysql/mysql.c:486
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:529
-#: src/applications/sqstore_mysql/mysql.c:627
-#: src/applications/sqstore_mysql/mysql.c:639
-#: src/applications/sqstore_mysql/mysql.c:651
-#: src/applications/sqstore_mysql/mysql.c:665
-#: src/applications/sqstore_mysql/mysql.c:762
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:917
-#: src/applications/sqstore_mysql/mysql.c:929
-#: src/applications/sqstore_mysql/mysql.c:941
-#: src/applications/sqstore_mysql/mysql.c:1184
-#: src/applications/sqstore_mysql/mysql.c:1196
-#: src/applications/sqstore_mysql/mysql.c:1208
-#: src/applications/sqstore_mysql/mysql.c:1293
+#: src/applications/sqstore_mysql/mysql.c:468
+#: src/applications/sqstore_mysql/mysql.c:478
+#: src/applications/sqstore_mysql/mysql.c:516
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:558
+#: src/applications/sqstore_mysql/mysql.c:569
+#: src/applications/sqstore_mysql/mysql.c:667
+#: src/applications/sqstore_mysql/mysql.c:679
+#: src/applications/sqstore_mysql/mysql.c:691
+#: src/applications/sqstore_mysql/mysql.c:705
+#: src/applications/sqstore_mysql/mysql.c:802
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:965
+#: src/applications/sqstore_mysql/mysql.c:977
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1229
+#: src/applications/sqstore_mysql/mysql.c:1241
+#: src/applications/sqstore_mysql/mysql.c:1253
+#: src/applications/sqstore_mysql/mysql.c:1338
#: src/applications/kvstore_sqlite/kv_sqlite.c:44
#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
-#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
-#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
-#: src/util/crypto/hostkey_gcrypt.c:71
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
+#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
+#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
+#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
+#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error: %s\n"
msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
@@ -634,17 +660,17 @@
msgstr ""
#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:416
+#: src/applications/sqstore_sqlite/sqlite.c:431
msgid "sqlite datastore"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:415
+#: src/applications/sqstore_sqlite/sqlite.c:430
#, c-format
msgid "Invalid data in %s. Trying to fix (by deletion).\n"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:1206
-#: src/applications/sqstore_mysql/mysql.c:1401
+#: src/applications/sqstore_sqlite/sqlite.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1446
msgid "# bytes in datastore"
msgstr ""
@@ -670,22 +696,22 @@
msgid "Session key received from peer `%s' has invalid format (discarded).\n"
msgstr "Thông báo nhận được từ một đầu là sai.\n"
-#: src/applications/session/connect.c:614
+#: src/applications/session/connect.c:624
#, fuzzy, c-format
msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
msgstr "Không kiểm tra được chìa khóa buổi làm việc từ đầu peer '%s'.\n"
-#: src/applications/session/connect.c:646
+#: src/applications/session/connect.c:656
#, fuzzy, c-format
msgid "Invalid `%s' message received from peer `%s'.\n"
msgstr "Nhận được thông báo '%s' sai từ đầu peer '%s'.\n"
-#: src/applications/session/connect.c:656
+#: src/applications/session/connect.c:666
#, fuzzy, c-format
msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
msgstr "Kiểm tra CRC của SKEY từ '%s' không thành công (có: %u, muốn %u).\n"
-#: src/applications/session/connect.c:719
+#: src/applications/session/connect.c:729
#, fuzzy, c-format
msgid ""
"Error parsing encrypted session key from `%s', given message part size is "
@@ -694,24 +720,24 @@
"Lỗi phân tích chìa khóa buổi làm việc đã mã hóa, kích thước của phần thông "
"báo đưa ra là sai.\n"
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:741
#, c-format
msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
msgstr ""
-#: src/applications/session/connect.c:886
+#: src/applications/session/connect.c:898
msgid "# session keys sent"
msgstr "# đã gửi các phím buổi làm việc"
-#: src/applications/session/connect.c:888
+#: src/applications/session/connect.c:900
msgid "# session keys rejected"
msgstr "# đã nhả ra các phím buổi làm việc"
-#: src/applications/session/connect.c:890
+#: src/applications/session/connect.c:902
msgid "# session keys accepted"
msgstr "# đã chấp nhận các phím buổi làm việc"
-#: src/applications/session/connect.c:892
+#: src/applications/session/connect.c:904
msgid "# sessions established"
msgstr "# đã thiết lập buổi làm việc"
@@ -782,24 +808,24 @@
msgid "async RPC reply not received.\n"
msgstr "Không nhận được câu trả lời async của RPC.\n"
-#: src/applications/sqstore_mysql/mysql.c:379
+#: src/applications/sqstore_mysql/mysql.c:419
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error: %s"
msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
-#: src/applications/sqstore_mysql/mysql.c:1311
+#: src/applications/sqstore_mysql/mysql.c:1356
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
-#: src/applications/sqstore_mysql/mysql.c:1423
-#: src/applications/sqstore_mysql/mysql.c:1570
+#: src/applications/sqstore_mysql/mysql.c:1468
+#: src/applications/sqstore_mysql/mysql.c:1615
#, fuzzy, c-format
msgid "Trying to use file `%s' for MySQL configuration.\n"
msgstr "Đang thử dùng tập tin '%s' cho cấu hình MySQL.\n"
-#: src/applications/sqstore_mysql/mysql.c:1448
-#: src/applications/sqstore_mysql/mysql.c:1593
+#: src/applications/sqstore_mysql/mysql.c:1493
+#: src/applications/sqstore_mysql/mysql.c:1638
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -982,7 +1008,7 @@
msgstr "Thông báo máy khách-máy chủ hỗ trợ:\n"
#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:52
+#: src/applications/vpn/gnunet-vpn.c:53
msgid "Print statistics about GNUnet operations."
msgstr "In thống kê về các thao tác của GNUnet."
@@ -994,7 +1020,7 @@
#: src/applications/tbench/gnunet-tbench.c:127
#: src/applications/tracekit/gnunet-tracekit.c:315
#: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:148
+#: src/applications/vpn/gnunet-vpn.c:149
#, c-format
msgid "Error establishing connection with gnunetd.\n"
msgstr "Lỗi thiết lập kết nối với gnunetd.\n"
@@ -2023,15 +2049,15 @@
msgid "enables (anonymous) file-sharing"
msgstr ""
-#: src/applications/fs/module/migration.c:312
+#: src/applications/fs/module/migration.c:374
msgid "# blocks migrated"
msgstr ""
-#: src/applications/fs/module/migration.c:314
+#: src/applications/fs/module/migration.c:376
msgid "# blocks fetched for migration"
msgstr ""
-#: src/applications/fs/module/migration.c:317
+#: src/applications/fs/module/migration.c:379
msgid "# on-demand block migration attempts"
msgstr ""
@@ -2233,31 +2259,31 @@
msgid "Template description."
msgstr ""
-#: src/applications/bootstrap_http/http.c:102
+#: src/applications/bootstrap_http/http.c:109
#, fuzzy, c-format
msgid "Bootstrap data obtained from `%s' is invalid.\n"
msgstr "Định dạng của tên hiệu '%s' sai.\n"
-#: src/applications/bootstrap_http/http.c:170
+#: src/applications/bootstrap_http/http.c:177
msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:210
+#: src/applications/bootstrap_http/http.c:217
#, c-format
msgid "Bootstrapping using `%s'.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:224
+#: src/applications/bootstrap_http/http.c:231
#, fuzzy, c-format
msgid "Trying to download hostlist from `%s'\n"
msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
-#: src/applications/bootstrap_http/http.c:352
+#: src/applications/bootstrap_http/http.c:359
#, fuzzy, c-format
msgid "Downloaded %llu bytes from `%s'.\n"
msgstr "Tải tập tin từ GNUnet."
-#: src/applications/bootstrap_http/http.c:385
+#: src/applications/bootstrap_http/http.c:392
#, fuzzy
msgid "# HELLOs downloaded via http"
msgstr "# đã tải xuống HELO qua http"
@@ -2281,7 +2307,7 @@
msgid "tracks bandwidth utilization by gnunetd"
msgstr ""
-#: src/applications/vpn/gnunet-vpn.c:56
+#: src/applications/vpn/gnunet-vpn.c:57
msgid "Suppress display of asynchronous log messages"
msgstr ""
@@ -2501,34 +2527,34 @@
msgid "No"
msgstr "Không"
-#: src/applications/vpn/vpn.c:1647
+#: src/applications/vpn/vpn.c:1651
#, fuzzy, c-format
msgid "`%s' initialising RFC4913 module %d and %d\n"
msgstr "'%s' đăng ký trình điều khiển %d và %d\n"
-#: src/applications/vpn/vpn.c:1650
+#: src/applications/vpn/vpn.c:1654
#, c-format
msgid "RFC4193 my First 4 hex digits of host id are %x\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1723
+#: src/applications/vpn/vpn.c:1727
msgid "enables IPv6 over GNUnet (incomplete)"
msgstr ""
-#: src/applications/vpn/vpn.c:1757
+#: src/applications/vpn/vpn.c:1761
msgid "RFC4193 Waiting for tun thread to end\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1771
+#: src/applications/vpn/vpn.c:1775
msgid "RFC4193 The tun thread has ended\n"
msgstr ""
-#: src/applications/vpn/vpn.c:1788
+#: src/applications/vpn/vpn.c:1792
#, c-format
msgid "RFC4193 Closing tunnel %d fd %d\n"
msgstr ""
-#: src/applications/dstore/dstore.c:466
+#: src/applications/dstore/dstore.c:525
msgid "# bytes in dstore"
msgstr ""
@@ -2555,7 +2581,7 @@
msgid "Updates GNUnet datastructures after version change."
msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
msgid "run as user LOGIN"
msgstr "chạy dưới người dùng LOGIN"
@@ -2564,93 +2590,102 @@
msgid "run in client mode (for getting client configuration values)"
msgstr "chạy trong chế độ người dùng (để lấy giá trị cấu hình của người dùng)"
-#: src/server/connection.c:1188
+#: src/server/connection.c:1202
#, fuzzy, c-format
msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
msgstr "'%s' đã chọn %d vượt quá %d thông báo (MTU: %d).\n"
-#: src/server/connection.c:1197
+#: src/server/connection.c:1211
#, c-format
msgid "Message details: %u: length %d, priority: %d\n"
msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
-#: src/server/connection.c:2744
+#: src/server/connection.c:2897
#, fuzzy, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr "Bỏ đi thông báo từ '%s': định dạng sai.\n"
-#: src/server/connection.c:2829
+#: src/server/connection.c:2982
#, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr "Số của chuỗi sai %u <= %u, đang bỏ đi thông báo.\n"
-#: src/server/connection.c:2851
+#: src/server/connection.c:3004
msgid "Message received more than one day old. Dropped.\n"
msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
-#: src/server/connection.c:3337
+#: src/server/connection.c:3500
msgid "# outgoing messages dropped"
msgstr "# thông báo đi ra đã loại bỏ"
-#: src/server/connection.c:3340
+#: src/server/connection.c:3503
msgid "# bytes of outgoing messages dropped"
msgstr "# byte của các thông báo đi ra đã loại bỏ"
-#: src/server/connection.c:3342
+#: src/server/connection.c:3505
msgid "# connections closed (HANGUP sent)"
msgstr "# các kết nối đã đóng (gửi HANGUP)"
-#: src/server/connection.c:3345
+#: src/server/connection.c:3509
#, fuzzy
+msgid "# connections closed (transport issue)"
+msgstr "# các kết nối đã đóng (gửi HANGUP)"
+
+#: src/server/connection.c:3512
+#, fuzzy
msgid "# bytes encrypted"
msgstr "# byte nhận được của dạng %d"
-#: src/server/connection.c:3349
+#: src/server/connection.c:3516
#, fuzzy
msgid "# bytes transmitted"
msgstr "# byte đã truyền của dạng %d"
-#: src/server/connection.c:3353
+#: src/server/connection.c:3520
#, fuzzy
msgid "# bytes received"
msgstr "# byte nhận được qua TCP"
-#: src/server/connection.c:3355
+#: src/server/connection.c:3522
#, fuzzy
msgid "# bytes decrypted"
msgstr "# byte nhận được của dạng %d"
-#: src/server/connection.c:3356
+#: src/server/connection.c:3523
#, fuzzy
msgid "# bytes noise sent"
msgstr "# byte nhận được do nhiễu đường truyền"
-#: src/server/connection.c:3359
+#: src/server/connection.c:3526
msgid "# total bytes per second send limit"
msgstr ""
-#: src/server/connection.c:3362
+#: src/server/connection.c:3529
#, fuzzy
msgid "# total bytes per second receive limit"
msgstr "# byte nhận được do nhiễu đường truyền"
-#: src/server/connection.c:3365
+#: src/server/connection.c:3532
#, fuzzy
msgid "# total number of messages in send buffers"
msgstr "số thông báo trong một khối tin nhắn"
-#: src/server/connection.c:3369
+#: src/server/connection.c:3536
msgid "# total number of bytes we were allowed to sent but did not"
msgstr ""
-#: src/server/connection.c:3373
+#: src/server/connection.c:3540
msgid "# total number of bytes we were allowed to sent"
msgstr ""
-#: src/server/connection.c:3377
+#: src/server/connection.c:3544
msgid "# total number of bytes we are currently allowed to send"
msgstr ""
+#: src/server/connection.c:3547
+msgid "# transports switched to stream transport"
+msgstr ""
+
#: src/server/startup.c:206
#, fuzzy, c-format
msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -2757,32 +2792,32 @@
msgid "Could not properly unload service `%s'!\n"
msgstr "Không hủy nạp đúng được dịch vụ '%s'!\n"
-#: src/server/gnunet-transport-check.c:121
+#: src/server/gnunet-transport-check.c:122
#, fuzzy, c-format
msgid "`%s': Could not create hello.\n"
msgstr "'%s': Không tạo được HELO.\n"
-#: src/server/gnunet-transport-check.c:128
+#: src/server/gnunet-transport-check.c:129
#, fuzzy, c-format
msgid "`%s': Could not connect.\n"
msgstr "'%s': Không kết nối được.\n"
-#: src/server/gnunet-transport-check.c:157
+#: src/server/gnunet-transport-check.c:161
#, fuzzy, c-format
msgid "`%s': Could not send.\n"
msgstr "'%s': Không gửi được.\n"
-#: src/server/gnunet-transport-check.c:172
+#: src/server/gnunet-transport-check.c:176
#, fuzzy, c-format
msgid "`%s': Did not receive message within %llu ms.\n"
msgstr "'%s': Không nhận được thông báo trong %llu mili giây.\n"
-#: src/server/gnunet-transport-check.c:185
+#: src/server/gnunet-transport-check.c:189
#, fuzzy, c-format
msgid "`%s': Could not disconnect.\n"
msgstr "'%s': Không ngắt kết nối được.\n"
-#: src/server/gnunet-transport-check.c:192
+#: src/server/gnunet-transport-check.c:196
#, fuzzy, c-format
msgid ""
"`%s' transport OK. It took %ums to transmit %llu messages of %llu bytes "
@@ -2791,12 +2826,12 @@
"'%s' truyền tải OK. Cần %umiligiây để truyền đi %d thông báo với %d byte "
"mỗi cái.\n"
-#: src/server/gnunet-transport-check.c:222
+#: src/server/gnunet-transport-check.c:226
#, fuzzy, c-format
msgid " Transport %d is not being tested\n"
msgstr " Giao thông %d là không thể\n"
-#: src/server/gnunet-transport-check.c:251
+#: src/server/gnunet-transport-check.c:255
#, fuzzy, c-format
msgid ""
"\n"
@@ -2805,66 +2840,66 @@
"\n"
"Đang liên hệ '%s'."
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:280
#, c-format
msgid " Connection failed\n"
msgstr " Kết nối không thành công\n"
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:286
#, c-format
msgid " Connection failed (bug?)\n"
msgstr " Kết nối thất bại (lỗi bug?)\n"
-#: src/server/gnunet-transport-check.c:319
+#: src/server/gnunet-transport-check.c:323
#, c-format
msgid "Timeout after %llums.\n"
msgstr ""
-#: src/server/gnunet-transport-check.c:321
+#: src/server/gnunet-transport-check.c:325
#, fuzzy, c-format
msgid "OK!\n"
msgstr "Ừ"
-#: src/server/gnunet-transport-check.c:346
+#: src/server/gnunet-transport-check.c:350
msgid "Tool to test if GNUnet transport services are operational."
msgstr ""
"Công cụ để thử nghiệm xem dịch vụ truyền tải GNUnet có hoạt động không."
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:354
msgid "ping peers from HOSTLISTURL that match transports"
msgstr "ping các đầu peer từ HOSTLISTURL tương ứng với truyền tải"
-#: src/server/gnunet-transport-check.c:353
+#: src/server/gnunet-transport-check.c:357
msgid "send COUNT messages"
msgstr "gửi COUNT thông báo"
-#: src/server/gnunet-transport-check.c:356
+#: src/server/gnunet-transport-check.c:360
msgid "send messages with SIZE bytes payload"
msgstr "gửi các thông báo với SIZE byte nạp trả"
-#: src/server/gnunet-transport-check.c:359
+#: src/server/gnunet-transport-check.c:363
msgid "specifies which TRANSPORT should be tested"
msgstr "chỉ ra TRANSPORT cần được thử nghiệm"
-#: src/server/gnunet-transport-check.c:362
+#: src/server/gnunet-transport-check.c:366
msgid "specifies after how many MS to time-out"
msgstr "chỉ ra hết thời gian chờ sau bao nhiên MS"
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:374
msgid "repeat each test X times"
msgstr ""
-#: src/server/gnunet-transport-check.c:431
+#: src/server/gnunet-transport-check.c:435
#, c-format
msgid "Testing transport(s) %s\n"
msgstr "Đang thử nghiệm (các) truyền tải %s\n"
-#: src/server/gnunet-transport-check.c:433
+#: src/server/gnunet-transport-check.c:437
#, c-format
msgid "Available transport(s): %s\n"
msgstr "(Các) truyền tải có: %s\n"
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:478
#, fuzzy, c-format
msgid ""
"\n"
@@ -2978,12 +3013,12 @@
msgid "libgcrypt has not the expected version (version %s is required).\n"
msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
-#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
+#: src/util/os/statuscalls.c:195 src/util/os/statuscalls.c:336
#, fuzzy, c-format
msgid "Failed to parse interface data from `%s'.\n"
msgstr "Thất bại khi phân tích dữ liệu giao diện từ '%s' tại %s:%d.\n"
-#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
+#: src/util/os/statuscalls.c:379 src/util/os/statuscalls.c:389
#, fuzzy, c-format
msgid ""
"No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -4158,12 +4193,18 @@
msgstr "chỉ ra máy đang chạy gnunetd"
#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
-#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
-#: src/include/gnunet_util_error.h:236
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:236
#, fuzzy, c-format
msgid "Internal error: assertion failed at %s:%d in %s.\n"
msgstr "Xác nhận thất bại tại %s:%d.\n"
+#: src/include/gnunet_util_error.h:230
+#, c-format
+msgid ""
+"External protocol violation: assertion failed at %s:%d in %s (no need to "
+"panic, we can handle this).\n"
+msgstr ""
+
#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
#, fuzzy, c-format
msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
@@ -4305,23 +4346,23 @@
"configuration here. Default is no proxy."
msgstr ""
-#: contrib/config-daemon.scm:237 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
msgid "How long should logs be kept?"
msgstr ""
-#: contrib/config-daemon.scm:239 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
msgid ""
"How long should logs be kept? If you specify a value greater than zero, a "
"log is created each day with the date appended to its filename. These logs "
"are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
msgstr ""
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:237
msgid ""
"What maximum number of open file descriptors should be requested from the OS?"
msgstr ""
-#: contrib/config-daemon.scm:252
+#: contrib/config-daemon.scm:239
msgid ""
"The default of 1024 should be fine for most systems. If your system can "
"support more, increasing the number might help support additional clients on "
@@ -4333,62 +4374,62 @@
"run with what it is given."
msgstr ""
-#: contrib/config-daemon.scm:263
+#: contrib/config-daemon.scm:250
msgid "Where should gnunetd write the logs?"
msgstr ""
-#: contrib/config-daemon.scm:275 contrib/config-client.scm:169
-msgid "Configuration of the logging system"
+#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+msgid "Logging"
msgstr ""
-#: contrib/config-daemon.scm:276 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
msgid "Specify which system messages should be logged how"
msgstr ""
-#: contrib/config-daemon.scm:280 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
msgid "Logging of events for users"
msgstr ""
-#: contrib/config-daemon.scm:281 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
msgid "Logging of events for the system administrator"
msgstr ""
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:280
msgid "Where should gnunetd write the PID?"
msgstr ""
-#: contrib/config-daemon.scm:294
+#: contrib/config-daemon.scm:281
msgid ""
"The default is no longer /var/run/gnunetd.pid since we could not delete the "
"file on shutdown at that location."
msgstr ""
-#: contrib/config-daemon.scm:306
+#: contrib/config-daemon.scm:293
msgid "As which user should gnunetd run?"
msgstr ""
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:295
msgid ""
"Empty means \"current user\". On computer startup, it is root/SYSTEM. Under "
"Windows, this setting affects the creation of a new system service only."
msgstr ""
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:308
msgid "Should gnunetd be automatically started when the system boots?"
msgstr ""
-#: contrib/config-daemon.scm:322
+#: contrib/config-daemon.scm:309
msgid ""
"Set to YES if gnunetd should be automatically started on boot. If this "
"option is set, gnunet-setup will install a script to start the daemon upon "
"completion. This option may not work on all systems."
msgstr ""
-#: contrib/config-daemon.scm:334
+#: contrib/config-daemon.scm:321
msgid "Which transport mechanisms should GNUnet use?"
msgstr ""
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:323
msgid ""
"Use space-separated list of the modules, e.g. \"udp smtp tcp\". The "
"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4402,11 +4443,11 @@
"itself."
msgstr ""
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:337
msgid "Which applications should gnunetd support?"
msgstr ""
-#: contrib/config-daemon.scm:352
+#: contrib/config-daemon.scm:339
msgid ""
"Whenever this option is changed, you MUST run gnunet-update. Currently, the "
"available applications are:\n"
@@ -4443,15 +4484,24 @@
"compromise your anonymity."
msgstr ""
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:368
msgid "Disable client-server connections"
msgstr ""
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:369
+msgid ""
+"This option can be used to tell gnunetd not to open the client port. When "
+"run like this, gnunetd will participate as a peer in the network but not "
+"support any user interfaces. This maybe useful for headless systems that "
+"are never expected to have end-user interactions. Note that this will also "
+"prevent you from running diagnostic tools like gnunet-stats!"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
msgid "Disable peer discovery"
msgstr ""
-#: contrib/config-daemon.scm:394
+#: contrib/config-daemon.scm:382
msgid ""
"The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
"peer to peers of which the hostkey has been copied by hand to data/hosts; "
@@ -4463,15 +4513,15 @@
"lines above would need some minor editing :-)."
msgstr ""
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:393
msgid "Disable advertising this peer to other peers"
msgstr ""
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:405
msgid "Disable automatic establishment of connections"
msgstr ""
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:406
msgid ""
"If this option is enabled, GNUnet will not automatically establish "
"connections to other peers, but instead wait for applications to "
@@ -4479,21 +4529,22 @@
"connect to us)."
msgstr ""
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:417
msgid "Disable advertising of other peers by this peer"
msgstr ""
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:418
msgid ""
"This option maybe useful during testing, but turning it off is dangerous! If "
"in any doubt, set it to YES (which is the default)."
msgstr ""
-#: contrib/config-daemon.scm:441
-msgid "Client/Server Port"
-msgstr ""
+#: contrib/config-daemon.scm:429
+#, fuzzy
+msgid "Port for communication with GNUnet user interfaces"
+msgstr "In thông tin về các đầu peer của GNUnet."
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:430
msgid ""
"Which is the client-server port that is used between gnunetd and the clients "
"(TCP only). You may firewall this port for non-local machines (but you do "
@@ -4501,11 +4552,11 @@
"connections from machines that are listed under TRUSTED)."
msgstr ""
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:441
msgid "IPs allowed to use gnunetd server"
msgstr ""
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:442
msgid ""
"This option specifies which hosts are trusted enough to connect as clients "
"(to the TCP port). This is useful if you run gnunetd on one host of your "
@@ -4516,73 +4567,70 @@
"separated by a semicolon, spaces are not allowed."
msgstr ""
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:454
msgid "Limit connections to the specfied set of peers."
msgstr ""
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:455
msgid ""
"If this option is not set, any peer is allowed to connect. If it is set, "
-"only the specified peers are allowed."
+"only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:478
-msgid "Run gnunetd as this user."
-msgstr ""
-
-#: contrib/config-daemon.scm:479
-msgid ""
-"When started as root, gnunetd will change permissions to the given user."
-msgstr ""
-
-#: contrib/config-daemon.scm:490
+#: contrib/config-daemon.scm:466
msgid "Run gnunetd as this group."
msgstr ""
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:467
msgid ""
"When started as root, gnunetd will change permissions to the given group."
msgstr ""
-#: contrib/config-daemon.scm:502
-msgid "Run gnunetd during system startup?"
+#: contrib/config-daemon.scm:478
+msgid "Prevent the specfied set of peers from connecting."
msgstr ""
-#: contrib/config-daemon.scm:515
-msgid "Prevent the specfied set of peers from connecting."
+#: contrib/config-daemon.scm:479
+msgid ""
+"If this option is not set, any peer is allowed to connect. If the ID of a "
+"peer is listed here, connections from that peer will be refused. Specify "
+"the list of peer IDs (not IPs!)"
msgstr ""
-#: contrib/config-daemon.scm:516
-msgid "If this option is not set, any peer is allowed to connect."
+#: contrib/config-daemon.scm:490
+msgid "Topology Maintenance"
msgstr ""
-#: contrib/config-daemon.scm:527
+#: contrib/config-daemon.scm:491
msgid "Rarely used settings for peer advertisements and connections"
msgstr ""
-#: contrib/config-daemon.scm:547
+#: contrib/config-daemon.scm:511
#, fuzzy
msgid "General settings"
msgstr "Thiết lập khác"
-#: contrib/config-daemon.scm:548
+#: contrib/config-daemon.scm:512
msgid "Settings that change the behavior of GNUnet in general"
msgstr ""
-#: contrib/config-daemon.scm:576
-#, fuzzy
-msgid "Path settings"
-msgstr "Thiết lập khác"
+#: contrib/config-daemon.scm:536
+msgid "Modules"
+msgstr ""
-#: contrib/config-daemon.scm:577
-msgid "Prefixes for paths used by GNUnet"
+#: contrib/config-daemon.scm:537
+msgid "Settings that select specific implementations for GNUnet modules"
msgstr ""
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:554
+msgid "Fundamentals"
+msgstr ""
+
+#: contrib/config-daemon.scm:574
msgid "Which database should be used?"
msgstr ""
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:576
msgid ""
"Which database should be used? The options are \"sqstore_sqlite\" and "
"\"sqstore_mysql\". You must run gnunet-update after changing this value!\n"
@@ -4591,11 +4639,11 @@
"is relatively simple. Read the file doc/README.mysql for how to setup mysql."
msgstr ""
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:589
msgid "Which topology should be used?"
msgstr ""
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:591
msgid ""
"Which topology should be used? The only options at the moment are "
"\"topology_default\" and \"topology_f2f\". In default mode, GNUnet will try "
@@ -4608,42 +4656,34 @@
"afraid of establishing (direct) connections to unknown peers."
msgstr ""
-#: contrib/config-daemon.scm:625
-msgid "Modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:626
-msgid "Settings that select specific implementations for GNUnet modules"
-msgstr ""
-
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:607
msgid "List of friends for friend-to-friend topology"
msgstr ""
-#: contrib/config-daemon.scm:644
+#: contrib/config-daemon.scm:608
msgid ""
"Specifies the name of a file which contains a list of GNUnet peer IDs that "
"are friends. If used with the friend-to-friend topology, this will ensure "
"that GNUnet only connects to these peers (via any available transport)."
msgstr ""
-#: contrib/config-daemon.scm:658
+#: contrib/config-daemon.scm:622
msgid "Name of the MySQL database GNUnet should use"
msgstr ""
-#: contrib/config-daemon.scm:670
+#: contrib/config-daemon.scm:634
msgid "Configuration file that specifies the MySQL username and password"
msgstr ""
-#: contrib/config-daemon.scm:682
+#: contrib/config-daemon.scm:646
msgid "Configuration of the MySQL database"
msgstr ""
-#: contrib/config-daemon.scm:701
+#: contrib/config-daemon.scm:665
msgid "MB of diskspace GNUnet can use for anonymous file sharing"
msgstr ""
-#: contrib/config-daemon.scm:703
+#: contrib/config-daemon.scm:667
msgid ""
"How much disk space (MB) is GNUnet allowed to use for anonymous file "
"sharing? This does not take indexed files into account, only the space "
@@ -4654,19 +4694,19 @@
"Note that if you change the quota, you need to run gnunet-update afterwards."
msgstr ""
-#: contrib/config-daemon.scm:717
+#: contrib/config-daemon.scm:681
msgid "Size of the routing table for anonymous routing."
msgstr ""
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:693
msgid "Size of the routing table for DHT routing."
msgstr ""
-#: contrib/config-daemon.scm:742
+#: contrib/config-daemon.scm:706
msgid "Allow migrating content to this peer."
msgstr ""
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:708
msgid ""
"If you say yes here, GNUnet will migrate content to your server, and you "
"will not be able to control what data is stored on your machine. \n"
@@ -4678,13 +4718,13 @@
"can be considered liable for it."
msgstr ""
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:722
msgid ""
"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
"stored in /tmp)"
msgstr ""
-#: contrib/config-daemon.scm:759
+#: contrib/config-daemon.scm:723
msgid ""
"DHT index data is inherently small and expires comparatively quickly. It is "
"deleted whenever gnunetd is shut down.\n"
@@ -4692,20 +4732,20 @@
"The size of the DSTORE QUOTA is specified in MB."
msgstr ""
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:737
msgid "Options for anonymous file sharing"
msgstr ""
-#: contrib/config-daemon.scm:792
+#: contrib/config-daemon.scm:756
#, fuzzy
msgid "Applications"
msgstr "Tùy _chọn"
-#: contrib/config-daemon.scm:808
+#: contrib/config-daemon.scm:772
msgid "Is this machine unreachable behind a NAT?"
msgstr ""
-#: contrib/config-daemon.scm:809
+#: contrib/config-daemon.scm:773
msgid ""
"Set to YES if this machine is behind a NAT that limits connections from the "
"outside to the GNUnet port and that cannot be traversed using UPnP. Note "
@@ -4718,15 +4758,15 @@
"connections. Use YES only if you get no connections otherwise."
msgstr ""
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:784
msgid "Which port should be used by the TCP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
msgid "Should we try to determine our external IP using UPnP?"
msgstr ""
-#: contrib/config-daemon.scm:833
+#: contrib/config-daemon.scm:797
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4734,34 +4774,46 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
-#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
+#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
msgid "Which IPs are not allowed to connect?"
msgstr ""
-#: contrib/config-daemon.scm:856
+#: contrib/config-daemon.scm:820
msgid ""
"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
"network interface."
msgstr ""
-#: contrib/config-daemon.scm:868
+#: contrib/config-daemon.scm:832
msgid "TCP transport"
msgstr ""
-#: contrib/config-daemon.scm:886
+#: contrib/config-daemon.scm:850
msgid "Which port should be used by the HTTP transport?"
msgstr ""
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:862
+msgid "Which is the external port of the HTTP transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:863
+msgid ""
+"Use this option if your firewall maps say port 80 to your real HTTP port. "
+"This can be useful in making the HTTP messages appear even more legit "
+"(without the need for running gnunetd as root due to the use of a "
+"priviledged port)."
+msgstr ""
+
+#: contrib/config-daemon.scm:874
msgid "HTTP transport"
msgstr ""
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:889
msgid "Which port should be used by the UDP IPv4 transport?"
msgstr ""
-#: contrib/config-daemon.scm:926
+#: contrib/config-daemon.scm:902
msgid ""
"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
"supports UPnP. You should disable this option if you are sure that you are "
@@ -4769,75 +4821,75 @@
"will not do much harm (only cost a small amount of resources)."
msgstr ""
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:913
msgid "What is the maximum transfer unit for UDP?"
msgstr ""
-#: contrib/config-daemon.scm:961
+#: contrib/config-daemon.scm:937
msgid ""
"Which IPs are allowed to connect? Leave empty to allow connections from any "
"IP."
msgstr ""
-#: contrib/config-daemon.scm:973
+#: contrib/config-daemon.scm:949
msgid "UDP transport"
msgstr ""
-#: contrib/config-daemon.scm:992
+#: contrib/config-daemon.scm:968
msgid "Which port should be used by the TCP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
+#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
msgid ""
"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
msgstr ""
-#: contrib/config-daemon.scm:1028
+#: contrib/config-daemon.scm:1004
msgid "TCP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1021
msgid "Which port should be used by the UDP IPv6 transport?"
msgstr ""
-#: contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1033
msgid "What is the maximum transfer unit for UDP 6?"
msgstr ""
-#: contrib/config-daemon.scm:1093
+#: contrib/config-daemon.scm:1069
msgid "UDP6 transport"
msgstr ""
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1087
#, fuzzy
msgid "Network interface"
msgstr "Giao diện mạng:"
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1099
msgid "External IP address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1135
+#: contrib/config-daemon.scm:1111
msgid "External IPv6 address (leave empty to try auto-detection)"
msgstr ""
-#: contrib/config-daemon.scm:1147
+#: contrib/config-daemon.scm:1123
msgid "Transports"
msgstr ""
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1146
msgid "What is the maximum number of bytes per second that we may receive?"
msgstr ""
-#: contrib/config-daemon.scm:1182
+#: contrib/config-daemon.scm:1158
msgid "What is the maximum number of bytes per second that we may send?"
msgstr ""
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1170
msgid "What is the maximum CPU load (percentage)?"
msgstr ""
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1172
msgid ""
"Which CPU load can be tolerated. Load here always refers to the total "
"system load, that is it includes CPU utilization by other processes. A "
@@ -4847,11 +4899,11 @@
"Multiprocessors may use values above 100."
msgstr ""
-#: contrib/config-daemon.scm:1207
+#: contrib/config-daemon.scm:1183
msgid "What is the maximum IO load (permille)?"
msgstr ""
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1185
msgid ""
"Which IO load can be tolerated. Load here refers to the percentage of CPU "
"cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4861,36 +4913,36 @@
"values are typically between 10 and 75."
msgstr ""
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1196
msgid "What is the maximum CPU load (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1221
+#: contrib/config-daemon.scm:1197
msgid ""
"Which CPU load can be tolerated. This is the hard limit, so once it is "
"reached, gnunetd will start to massively drop data to reduce the load. Use "
"with caution."
msgstr ""
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1208
msgid "What is the maximum upstream bandwidth (hard limit)?"
msgstr ""
-#: contrib/config-daemon.scm:1233
+#: contrib/config-daemon.scm:1209
msgid ""
"The limit is given as a percentage of the MAXNETUPBPS limit. Use 100 to "
"have MAXNETUPBPS be the hard limit. Use zero for no limit."
msgstr ""
-#: contrib/config-daemon.scm:1244
+#: contrib/config-daemon.scm:1220
msgid "Should we disable random padding (experimental option)?"
msgstr ""
-#: contrib/config-daemon.scm:1256
+#: contrib/config-daemon.scm:1232
msgid "Use basic bandwidth limitation? (YES/NO). If in doubt, say YES."
msgstr ""
-#: contrib/config-daemon.scm:1258
+#: contrib/config-daemon.scm:1234
msgid ""
"Basic bandwidth limitation (YES) means simply that the bandwidth limits "
"specified apply to GNUnet and only to GNUnet. If set to YES, you simply "
@@ -4935,12 +4987,12 @@
"since it is irrelevant)."
msgstr ""
-#: contrib/config-daemon.scm:1275
+#: contrib/config-daemon.scm:1251
#, fuzzy
msgid "Network interface to monitor"
msgstr "Giao diện mạng:"
-#: contrib/config-daemon.scm:1276
+#: contrib/config-daemon.scm:1252
msgid ""
"For which interfaces should we do accounting? GNUnet will evaluate the "
"total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -4951,11 +5003,11 @@
"number reported by 'gnunet-win-tool -n'."
msgstr ""
-#: contrib/config-daemon.scm:1287
+#: contrib/config-daemon.scm:1263
msgid "Load management"
msgstr ""
-#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
msgid "Root node"
msgstr ""
@@ -5088,6 +5140,10 @@
msgid "The directory for GNUnet files that belong to the user."
msgstr ""
+#, fuzzy
+#~ msgid "Path settings"
+#~ msgstr "Thiết lập khác"
+
#~ msgid "specify nickname"
#~ msgstr "chỉ ra tên nick"
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2007-09-29 21:26:22 UTC
(rev 5669)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2007-09-29 22:47:47 UTC
(rev 5670)
@@ -371,7 +371,8 @@
" INDEX vkey (vkey),"
" INDEX prio (prio,vkey),"
" INDEX expire (expire,vkey,type),"
- " INDEX anonLevel (anonLevel,prio,vkey,type)" ")
ENGINE=MyISAM");
+ " INDEX anonLevel (anonLevel,prio,vkey,type)"
+ ") ENGINE=MyISAM");
}
else
{
@@ -388,7 +389,8 @@
" INDEX vkey (vkey),"
" INDEX prio (prio,vkey),"
" INDEX expire (expire,vkey,type),"
- " INDEX anonLevel (anonLevel,prio,vkey,type)" ")
ENGINE=InnoDB");
+ " INDEX anonLevel (anonLevel,prio,vkey,type)"
+ ") ENGINE=InnoDB");
}
if (mysql_error (dbh->dbf)[0])
{
@@ -849,7 +851,7 @@
iterateHelper (unsigned int type,
int is_asc,
int is_prio,
- int is_migr,
+ int is_migr,
unsigned int iter_select, Datum_Iterator iter, void *closure)
{
Datastore_Value *datum;
@@ -871,7 +873,7 @@
MYSQL_BIND rbind[7];
MYSQL_STMT *stmt;
- GE_ASSERT(NULL, ( (is_migr == 1) || (is_migr == 0)));
+ GE_ASSERT (NULL, ((is_migr == 1) || (is_migr == 0)));
if (is_asc)
{
last_prio = 0;
@@ -909,14 +911,15 @@
qbind[3 + is_migr].buffer_type = MYSQL_TYPE_LONGLONG;
qbind[3 + is_migr].buffer = &last_vkey;
qbind[3 + is_migr].is_unsigned = YES;
- if (is_migr) {
- qbind[2].buffer_type = MYSQL_TYPE_LONGLONG;
- qbind[2].buffer = &now;
- qbind[2].is_unsigned = YES;
- qbind[5].buffer_type = MYSQL_TYPE_LONGLONG;
- qbind[5].buffer = &now;
- qbind[5].is_unsigned = YES;
- }
+ if (is_migr)
+ {
+ qbind[2].buffer_type = MYSQL_TYPE_LONGLONG;
+ qbind[2].buffer = &now;
+ qbind[2].is_unsigned = YES;
+ qbind[5].buffer_type = MYSQL_TYPE_LONGLONG;
+ qbind[5].buffer = &now;
+ qbind[5].is_unsigned = YES;
+ }
hashSize = sizeof (HashCode512);
memset (rbind, 0, sizeof (rbind));
Modified: GNUnet/src/applications/vpn/vpn.c
===================================================================
--- GNUnet/src/applications/vpn/vpn.c 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/src/applications/vpn/vpn.c 2007-09-29 22:47:47 UTC (rev 5670)
@@ -1593,7 +1593,7 @@
#if HAVE_PLIBC_FD
plibc_fd_set_blocking (handle, 0);
#else
- __win_SetHandleBlockingMode(handle, 0);
+ __win_SetHandleBlockingMode (handle, 0);
#endif
}
#else
Modified: GNUnet/src/include/plibc.h
===================================================================
--- GNUnet/src/include/plibc.h 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/src/include/plibc.h 2007-09-29 22:47:47 UTC (rev 5670)
@@ -29,15 +29,16 @@
#define _PLIBC_H_
#ifndef SIGALRM
- #define SIGALRM 14
+#define SIGALRM 14
#endif
#ifdef __cplusplus
-extern "C" {
+extern "C"
+{
#endif
#ifdef Q_OS_WIN32
- #define WINDOWS 1
+#define WINDOWS 1
#endif
#define HAVE_PLIBC_FD 0
@@ -45,7 +46,7 @@
#ifdef WINDOWS
#if ENABLE_NLS
- #include "langinfo.h"
+#include "langinfo.h"
#endif
#include <windows.h>
@@ -77,8 +78,8 @@
#define int64_t long long
#define int32_t long
-struct stat64
-{
+ struct stat64
+ {
_dev_t st_dev;
_ino_t st_ino;
_mode_t st_mode;
@@ -90,112 +91,112 @@
__time64_t st_atime;
__time64_t st_mtime;
__time64_t st_ctime;
-};
+ };
#ifndef pid_t
- #define pid_t int
+#define pid_t int
#endif
#ifndef WEXITSTATUS
- #define WEXITSTATUS(status) (((status) & 0xff00) >> 8)
+#define WEXITSTATUS(status) (((status) & 0xff00) >> 8)
#endif
/* Thanks to the Cygwin project */
-#define ENOCSI 43 /* No CSI structure available */
-#define EL2HLT 44 /* Level 2 halted */
+#define ENOCSI 43 /* No CSI structure available */
+#define EL2HLT 44 /* Level 2 halted */
#ifndef EDEADLK
- #define EDEADLK 45 /* Deadlock condition */
+#define EDEADLK 45 /* Deadlock condition */
#endif
#ifndef ENOLCK
- #define ENOLCK 46 /* No record locks available */
+#define ENOLCK 46 /* No record locks available */
#endif
-#define EBADE 50 /* Invalid exchange */
-#define EBADR 51 /* Invalid request descriptor */
-#define EXFULL 52 /* Exchange full */
-#define ENOANO 53 /* No anode */
-#define EBADRQC 54 /* Invalid request code */
-#define EBADSLT 55 /* Invalid slot */
+#define EBADE 50 /* Invalid exchange */
+#define EBADR 51 /* Invalid request descriptor */
+#define EXFULL 52 /* Exchange full */
+#define ENOANO 53 /* No anode */
+#define EBADRQC 54 /* Invalid request code */
+#define EBADSLT 55 /* Invalid slot */
#ifndef EDEADLOCK
- #define EDEADLOCK EDEADLK /* File locking deadlock error */
+#define EDEADLOCK EDEADLK /* File locking deadlock error */
#endif
-#define EBFONT 57 /* Bad font file fmt */
-#define ENOSTR 60 /* Device not a stream */
-#define ENODATA 61 /* No data (for no delay io) */
-#define ETIME 62 /* Timer expired */
-#define ENOSR 63 /* Out of streams resources */
-#define ENONET 64 /* Machine is not on the network */
-#define ENOPKG 65 /* Package not installed */
-#define EREMOTE 66 /* The object is remote */
-#define ENOLINK 67 /* The link has been severed */
-#define EADV 68 /* Advertise error */
-#define ESRMNT 69 /* Srmount error */
-#define ECOMM 70 /* Communication error on send */
-#define EPROTO 71 /* Protocol error */
-#define EMULTIHOP 74 /* Multihop attempted */
-#define ELBIN 75 /* Inode is remote (not really error) */
-#define EDOTDOT 76 /* Cross mount point (not really error) */
-#define EBADMSG 77 /* Trying to read unreadable message */
-#define ENOTUNIQ 80 /* Given log. name not unique */
-#define EBADFD 81 /* f.d. invalid for this operation */
-#define EREMCHG 82 /* Remote address changed */
-#define ELIBACC 83 /* Can't access a needed shared lib */
-#define ELIBBAD 84 /* Accessing a corrupted shared lib */
-#define ELIBSCN 85 /* .lib section in a.out corrupted */
-#define ELIBMAX 86 /* Attempting to link in too many libs */
-#define ELIBEXEC 87 /* Attempting to exec a shared library */
+#define EBFONT 57 /* Bad font file fmt */
+#define ENOSTR 60 /* Device not a stream */
+#define ENODATA 61 /* No data (for no delay io) */
+#define ETIME 62 /* Timer expired */
+#define ENOSR 63 /* Out of streams resources */
+#define ENONET 64 /* Machine is not on the network */
+#define ENOPKG 65 /* Package not installed */
+#define EREMOTE 66 /* The object is remote */
+#define ENOLINK 67 /* The link has been severed */
+#define EADV 68 /* Advertise error */
+#define ESRMNT 69 /* Srmount error */
+#define ECOMM 70 /* Communication error on send */
+#define EPROTO 71 /* Protocol error */
+#define EMULTIHOP 74 /* Multihop attempted */
+#define ELBIN 75 /* Inode is remote (not really error) */
+#define EDOTDOT 76 /* Cross mount point (not really error) */
+#define EBADMSG 77 /* Trying to read unreadable message */
+#define ENOTUNIQ 80 /* Given log. name not unique */
+#define EBADFD 81 /* f.d. invalid for this operation */
+#define EREMCHG 82 /* Remote address changed */
+#define ELIBACC 83 /* Can't access a needed shared lib */
+#define ELIBBAD 84 /* Accessing a corrupted shared lib */
+#define ELIBSCN 85 /* .lib section in a.out corrupted */
+#define ELIBMAX 86 /* Attempting to link in too many libs */
+#define ELIBEXEC 87 /* Attempting to exec a shared library */
#ifndef ENOSYS
- #define ENOSYS 88 /* Function not implemented */
+#define ENOSYS 88 /* Function not implemented */
#endif
-#define ENMFILE 89 /* No more files */
+#define ENMFILE 89 /* No more files */
#ifndef ENOTEMPTY
- #define ENOTEMPTY 90 /* Directory not empty */
+#define ENOTEMPTY 90 /* Directory not empty */
#endif
#ifndef ENAMETOOLONG
- #define ENAMETOOLONG 91 /* File or path name too long */
+#define ENAMETOOLONG 91 /* File or path name too long */
#endif
-#define ELOOP 92 /* Too many symbolic links */
-#define EOPNOTSUPP 95 /* Operation not supported on transport endpoint */
-#define EPFNOSUPPORT 96 /* Protocol family not supported */
-#define ECONNRESET 104 /* Connection reset by peer */
-#define ENOBUFS 105 /* No buffer space available */
-#define EAFNOSUPPORT 106 /* Address family not supported by protocol family */
-#define EPROTOTYPE 107 /* Protocol wrong type for socket */
-#define ENOTSOCK 108 /* Socket operation on non-socket */
-#define ENOPROTOOPT 109 /* Protocol not available */
-#define ESHUTDOWN 110 /* Can't send after socket shutdown */
-#define ECONNREFUSED 111 /* Connection refused */
-#define EADDRINUSE 112 /* Address already in use */
-#define ECONNABORTED 113 /* Connection aborted */
-#define ENETUNREACH 114 /* Network is unreachable */
-#define ENETDOWN 115 /* Network interface is not configured */
+#define ELOOP 92 /* Too many symbolic links */
+#define EOPNOTSUPP 95 /* Operation not supported on transport
endpoint */
+#define EPFNOSUPPORT 96 /* Protocol family not supported */
+#define ECONNRESET 104 /* Connection reset by peer */
+#define ENOBUFS 105 /* No buffer space available */
+#define EAFNOSUPPORT 106 /* Address family not supported by protocol
family */
+#define EPROTOTYPE 107 /* Protocol wrong type for socket */
+#define ENOTSOCK 108 /* Socket operation on non-socket */
+#define ENOPROTOOPT 109 /* Protocol not available */
+#define ESHUTDOWN 110 /* Can't send after socket shutdown */
+#define ECONNREFUSED 111 /* Connection refused */
+#define EADDRINUSE 112 /* Address already in use */
+#define ECONNABORTED 113 /* Connection aborted */
+#define ENETUNREACH 114 /* Network is unreachable */
+#define ENETDOWN 115 /* Network interface is not configured */
#ifndef ETIMEDOUT
- #define ETIMEDOUT 116 /* Connection timed out */
+#define ETIMEDOUT 116 /* Connection timed out */
#endif
-#define EHOSTDOWN 117 /* Host is down */
-#define EHOSTUNREACH 118 /* Host is unreachable */
-#define EINPROGRESS 119 /* Connection already in progress */
-#define EALREADY 120 /* Socket already connected */
-#define EDESTADDRREQ 121 /* Destination address required */
-#define EMSGSIZE 122 /* Message too long */
-#define EPROTONOSUPPORT 123 /* Unknown protocol */
-#define ESOCKTNOSUPPORT 124 /* Socket type not supported */
-#define EADDRNOTAVAIL 125 /* Address not available */
-#define ENETRESET 126 /* Connection aborted by network */
-#define EISCONN 127 /* Socket is already connected */
-#define ENOTCONN 128 /* Socket is not connected */
-#define ETOOMANYREFS 129 /* Too many references: cannot splice */
-#define EPROCLIM 130 /* Too many processes */
-#define EUSERS 131 /* Too many users */
-#define EDQUOT 132 /* Disk quota exceeded */
-#define ESTALE 133 /* Unknown error */
+#define EHOSTDOWN 117 /* Host is down */
+#define EHOSTUNREACH 118 /* Host is unreachable */
+#define EINPROGRESS 119 /* Connection already in progress */
+#define EALREADY 120 /* Socket already connected */
+#define EDESTADDRREQ 121 /* Destination address required */
+#define EMSGSIZE 122 /* Message too long */
+#define EPROTONOSUPPORT 123 /* Unknown protocol */
+#define ESOCKTNOSUPPORT 124 /* Socket type not supported */
+#define EADDRNOTAVAIL 125 /* Address not available */
+#define ENETRESET 126 /* Connection aborted by network */
+#define EISCONN 127 /* Socket is already connected */
+#define ENOTCONN 128 /* Socket is not connected */
+#define ETOOMANYREFS 129 /* Too many references: cannot splice */
+#define EPROCLIM 130 /* Too many processes */
+#define EUSERS 131 /* Too many users */
+#define EDQUOT 132 /* Disk quota exceeded */
+#define ESTALE 133 /* Unknown error */
#ifndef ENOTSUP
- #define ENOTSUP 134 /* Not supported */
+#define ENOTSUP 134 /* Not supported */
#endif
-#define ENOMEDIUM 135 /* No medium (in tape drive) */
-#define ENOSHARE 136 /* No such host or network path */
-#define ECASECLASH 137 /* Filename exists with different case */
-#define EWOULDBLOCK EAGAIN /* Operation would block */
-#define EOVERFLOW 139 /* Value too large for defined data type */
+#define ENOMEDIUM 135 /* No medium (in tape drive) */
+#define ENOSHARE 136 /* No such host or network path */
+#define ECASECLASH 137 /* Filename exists with different case */
+#define EWOULDBLOCK EAGAIN /* Operation would block */
+#define EOVERFLOW 139 /* Value too large for defined data type */
#undef HOST_NOT_FOUND
#define HOST_NOT_FOUND 1
@@ -209,65 +210,65 @@
#define PROT_READ 0x1
#define PROT_WRITE 0x2
#define MAP_SHARED 0x1
-#define MAP_PRIVATE 0x2 /* unsupported */
+#define MAP_PRIVATE 0x2 /* unsupported */
#define MAP_FIXED 0x10
#define MAP_FAILED ((void *)-1)
-struct statfs
-{
- long f_type; /* type of filesystem (see below) */
- long f_bsize; /* optimal transfer block size */
- long f_blocks; /* total data blocks in file system */
- long f_bfree; /* free blocks in fs */
- long f_bavail; /* free blocks avail to non-superuser */
- long f_files; /* total file nodes in file system */
- long f_ffree; /* free file nodes in fs */
- long f_fsid; /* file system id */
- long f_namelen; /* maximum length of filenames */
- long f_spare[6]; /* spare for later */
-};
+ struct statfs
+ {
+ long f_type; /* type of filesystem (see below) */
+ long f_bsize; /* optimal transfer block size */
+ long f_blocks; /* total data blocks in file system */
+ long f_bfree; /* free blocks in fs */
+ long f_bavail; /* free blocks avail to non-superuser */
+ long f_files; /* total file nodes in file system */
+ long f_ffree; /* free file nodes in fs */
+ long f_fsid; /* file system id */
+ long f_namelen; /* maximum length of filenames */
+ long f_spare[6]; /* spare for later */
+ };
/* Taken from the Wine project <http://www.winehq.org>
/wine/include/winternl.h */
-enum SYSTEM_INFORMATION_CLASS
-{
- SystemBasicInformation = 0,
- Unknown1,
- SystemPerformanceInformation = 2,
- SystemTimeOfDayInformation = 3, /* was SystemTimeInformation */
- Unknown4,
- SystemProcessInformation = 5,
- Unknown6,
- Unknown7,
- SystemProcessorPerformanceInformation = 8,
- Unknown9,
- Unknown10,
- SystemDriverInformation,
- Unknown12,
- Unknown13,
- Unknown14,
- Unknown15,
- SystemHandleList,
- Unknown17,
- Unknown18,
- Unknown19,
- Unknown20,
- SystemCacheInformation,
- Unknown22,
- SystemInterruptInformation = 23,
- SystemExceptionInformation = 33,
- SystemRegistryQuotaInformation = 37,
- SystemLookasideInformation = 45
-};
+ enum SYSTEM_INFORMATION_CLASS
+ {
+ SystemBasicInformation = 0,
+ Unknown1,
+ SystemPerformanceInformation = 2,
+ SystemTimeOfDayInformation = 3, /* was SystemTimeInformation */
+ Unknown4,
+ SystemProcessInformation = 5,
+ Unknown6,
+ Unknown7,
+ SystemProcessorPerformanceInformation = 8,
+ Unknown9,
+ Unknown10,
+ SystemDriverInformation,
+ Unknown12,
+ Unknown13,
+ Unknown14,
+ Unknown15,
+ SystemHandleList,
+ Unknown17,
+ Unknown18,
+ Unknown19,
+ Unknown20,
+ SystemCacheInformation,
+ Unknown22,
+ SystemInterruptInformation = 23,
+ SystemExceptionInformation = 33,
+ SystemRegistryQuotaInformation = 37,
+ SystemLookasideInformation = 45
+ };
-typedef struct
-{
+ typedef struct
+ {
LARGE_INTEGER IdleTime;
LARGE_INTEGER KernelTime;
LARGE_INTEGER UserTime;
LARGE_INTEGER Reserved1[2];
ULONG Reserved2;
-} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;
+ } SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;
#define sleep(secs) (Sleep(secs * 1000))
@@ -284,11 +285,11 @@
#define SHUT_RDWR SD_BOTH
/* Operations for flock() */
-#define LOCK_SH 1 /* shared lock */
-#define LOCK_EX 2 /* exclusive lock */
-#define LOCK_NB 4 /* or'd with one of the above to prevent
- blocking */
-#define LOCK_UN 8 /* remove lock */
+#define LOCK_SH 1 /* shared lock */
+#define LOCK_EX 2 /* exclusive lock */
+#define LOCK_NB 4 /* or'd with one of the above to prevent
+ blocking */
+#define LOCK_UN 8 /* remove lock */
/* Not supported under MinGW */
#define S_IRGRP 0
@@ -314,277 +315,278 @@
*/
#define index(s, c) strchr(s, c)
-BOOL _plibc_CreateShortcut(const char *pszSrc, const char *pszDest);
-BOOL _plibc_DereferenceShortcut(char *pszShortcut);
-char *plibc_ChooseDir(char *pszTitle, unsigned long ulFlags);
-char *plibc_ChooseFile(char *pszTitle, unsigned long ulFlags);
-long QueryRegistry(HKEY hMainKey, char *pszKey, char *pszSubKey,
- char *pszBuffer, long *pdLength);
+ BOOL _plibc_CreateShortcut (const char *pszSrc, const char *pszDest);
+ BOOL _plibc_DereferenceShortcut (char *pszShortcut);
+ char *plibc_ChooseDir (char *pszTitle, unsigned long ulFlags);
+ char *plibc_ChooseFile (char *pszTitle, unsigned long ulFlags);
+ long QueryRegistry (HKEY hMainKey, char *pszKey, char *pszSubKey,
+ char *pszBuffer, long *pdLength);
-BOOL __win_IsHandleMarkedAsBlocking(SOCKET hHandle);
-void __win_SetHandleBlockingMode(SOCKET s, BOOL bBlocking);
-void __win_DiscardHandleBlockingMode(SOCKET s);
-int _win_isSocketValid(int s);
-int plibc_conv_to_win_path(const char *pszUnix, char *pszWindows);
+ BOOL __win_IsHandleMarkedAsBlocking (SOCKET hHandle);
+ void __win_SetHandleBlockingMode (SOCKET s, BOOL bBlocking);
+ void __win_DiscardHandleBlockingMode (SOCKET s);
+ int _win_isSocketValid (int s);
+ int plibc_conv_to_win_path (const char *pszUnix, char *pszWindows);
-typedef void (*TPanicProc) (int, char *);
-void plibc_set_panic_proc(TPanicProc proc);
+ typedef void (*TPanicProc) (int, char *);
+ void plibc_set_panic_proc (TPanicProc proc);
-int flock(int fd, int operation);
-int fsync(int fildes);
-int inet_pton(int af, const char *src, void *dst);
-int inet_pton4(const char *src, u_char *dst, int pton);
+ int flock (int fd, int operation);
+ int fsync (int fildes);
+ int inet_pton (int af, const char *src, void *dst);
+ int inet_pton4 (const char *src, u_char * dst, int pton);
#if USE_IPV6
-int inet_pton6(const char *src, u_char *dst);
+ int inet_pton6 (const char *src, u_char * dst);
#endif
-int truncate(const char *fname, int distance);
-int statfs(const char *path, struct statfs *buf);
-const char *hstrerror(int err);
-void gettimeofday(struct timeval *tp, void *tzp);
-int mkstemp(char *tmplate);
-char *strptime (const char *buf, const char *format, struct tm *tm);
-char *ctime(const time_t *clock);
-char *ctime_r(const time_t *clock, char *buf);
-const char *inet_ntop(int af, const void *src, char *dst, size_t size);
-int plibc_init(char *pszOrg, char *pszApp);
-void plibc_shutdown();
-int plibc_initialized();
-int plibc_conv_to_win_path_ex(const char *pszUnix, char *pszWindows, int
derefLinks);
-void _SetErrnoFromWinError(long lWinError, char *pszCaller, int iLine);
-void SetErrnoFromWinsockError(long lWinError);
-void SetHErrnoFromWinError(long lWinError);
-void SetErrnoFromHRESULT(HRESULT hRes);
-FILE *_win_fopen(const char *filename, const char *mode);
-DIR *_win_opendir(const char *dirname);
-int _win_open(const char *filename, int oflag, ...);
+ int truncate (const char *fname, int distance);
+ int statfs (const char *path, struct statfs *buf);
+ const char *hstrerror (int err);
+ void gettimeofday (struct timeval *tp, void *tzp);
+ int mkstemp (char *tmplate);
+ char *strptime (const char *buf, const char *format, struct tm *tm);
+ char *ctime (const time_t * clock);
+ char *ctime_r (const time_t * clock, char *buf);
+ const char *inet_ntop (int af, const void *src, char *dst, size_t size);
+ int plibc_init (char *pszOrg, char *pszApp);
+ void plibc_shutdown ();
+ int plibc_initialized ();
+ int plibc_conv_to_win_path_ex (const char *pszUnix, char *pszWindows,
+ int derefLinks);
+ void _SetErrnoFromWinError (long lWinError, char *pszCaller, int iLine);
+ void SetErrnoFromWinsockError (long lWinError);
+ void SetHErrnoFromWinError (long lWinError);
+ void SetErrnoFromHRESULT (HRESULT hRes);
+ FILE *_win_fopen (const char *filename, const char *mode);
+ DIR *_win_opendir (const char *dirname);
+ int _win_open (const char *filename, int oflag, ...);
#ifdef ENABLE_NLS
-char *_win_bindtextdomain(const char *domainname, const char *dirname);
+ char *_win_bindtextdomain (const char *domainname, const char *dirname);
#endif
-int _win_chdir(const char *path);
-int _win_close(int fd);
-int _win_creat(const char *path, mode_t mode);
-int _win_fstat(int handle, struct stat *buffer);
-int _win_pipe(int *phandles);
-int _win_rmdir(const char *path);
-int _win_access( const char *path, int mode );
-int _win_chmod(const char *filename, int pmode);
-char *realpath(const char *file_name, char *resolved_name);
-long _win_random(void);
-int _win_remove(const char *path);
-int _win_rename(const char *oldname, const char *newname);
-int _win_stat(const char *path, struct stat *buffer);
-int _win_stat64(const char *path, struct stat64 *buffer);
-int _win_unlink(const char *filename);
-int _win_write(int fildes, const void *buf, size_t nbyte);
-int _win_read(int fildes, void *buf, size_t nbyte);
-size_t _win_fwrite(const void *buffer, size_t size, size_t count, FILE
*stream);
-size_t _win_fread( void *buffer, size_t size, size_t count, FILE *stream );
-int _win_symlink(const char *path1, const char *path2);
-void *_win_mmap(void *start, size_t len, int access, int flags, int fd,
- unsigned long long offset);
-int _win_munmap(void *start, size_t length);
-int _win_lstat(const char *path, struct stat *buf);
-int _win_lstat64(const char *path, struct stat64 *buf);
-int _win_readlink(const char *path, char *buf, size_t bufsize);
-int _win_accept(SOCKET s, struct sockaddr *addr, int *addrlen);
-int _win_printf(const char *format,...);
-int _win_fprintf(FILE *f,const char *format,...);
-int _win_vprintf(const char *format, va_list ap);
-int _win_vfprintf(FILE *stream, const char *format, va_list arg_ptr);
-int _win_vsprintf(char *dest,const char *format, va_list arg_ptr);
-int _win_vsnprintf(char* str, size_t size, const char *format, va_list
arg_ptr);
-int _win_snprintf(char *str,size_t size,const char *format,...);
-int _win_sprintf(char *dest,const char *format,...);
-int _win_vsscanf(const char* str, const char* format, va_list arg_ptr);
-int _win_sscanf(const char *str, const char *format, ...);
-int _win_vfscanf(FILE *stream, const char *format, va_list arg_ptr);
-int _win_vscanf(const char *format, va_list arg_ptr);
-int _win_scanf(const char *format, ...);
-int _win_fscanf(FILE *stream, const char *format, ...);
-pid_t _win_waitpid(pid_t pid, int *stat_loc, int options);
-int _win_bind(SOCKET s, const struct sockaddr *name, int namelen);
-int _win_connect(SOCKET s,const struct sockaddr *name, int namelen);
-int _win_getpeername(SOCKET s, struct sockaddr *name,
- int *namelen);
-int _win_getsockname(SOCKET s, struct sockaddr *name,
- int *namelen);
-int _win_getsockopt(SOCKET s, int level, int optname, char *optval,
- int *optlen);
-int _win_listen(SOCKET s, int backlog);
-int _win_recv(SOCKET s, char *buf, int len, int flags);
-int _win_recvfrom(SOCKET s, void *buf, int len, int flags,
- struct sockaddr *from, int *fromlen);
-int _win_select(int max_fd, fd_set * rfds, fd_set * wfds, fd_set * efds,
- const struct timeval *tv);
-int _win_send(SOCKET s, const char *buf, int len, int flags);
-int _win_sendto(SOCKET s, const char *buf, int len, int flags,
- const struct sockaddr *to, int tolen);
-int _win_setsockopt(SOCKET s, int level, int optname, const void *optval,
- int optlen);
-int _win_shutdown(SOCKET s, int how);
-SOCKET _win_socket(int af, int type, int protocol);
-struct hostent *_win_gethostbyaddr(const char *addr, int len, int type);
-struct hostent *_win_gethostbyname(const char *name);
-char *_win_strerror(int errnum);
-int IsWinNT();
+ int _win_chdir (const char *path);
+ int _win_close (int fd);
+ int _win_creat (const char *path, mode_t mode);
+ int _win_fstat (int handle, struct stat *buffer);
+ int _win_pipe (int *phandles);
+ int _win_rmdir (const char *path);
+ int _win_access (const char *path, int mode);
+ int _win_chmod (const char *filename, int pmode);
+ char *realpath (const char *file_name, char *resolved_name);
+ long _win_random (void);
+ int _win_remove (const char *path);
+ int _win_rename (const char *oldname, const char *newname);
+ int _win_stat (const char *path, struct stat *buffer);
+ int _win_stat64 (const char *path, struct stat64 *buffer);
+ int _win_unlink (const char *filename);
+ int _win_write (int fildes, const void *buf, size_t nbyte);
+ int _win_read (int fildes, void *buf, size_t nbyte);
+ size_t _win_fwrite (const void *buffer, size_t size, size_t count,
+ FILE * stream);
+ size_t _win_fread (void *buffer, size_t size, size_t count, FILE * stream);
+ int _win_symlink (const char *path1, const char *path2);
+ void *_win_mmap (void *start, size_t len, int access, int flags, int fd,
+ unsigned long long offset);
+ int _win_munmap (void *start, size_t length);
+ int _win_lstat (const char *path, struct stat *buf);
+ int _win_lstat64 (const char *path, struct stat64 *buf);
+ int _win_readlink (const char *path, char *buf, size_t bufsize);
+ int _win_accept (SOCKET s, struct sockaddr *addr, int *addrlen);
+ int _win_printf (const char *format, ...);
+ int _win_fprintf (FILE * f, const char *format, ...);
+ int _win_vprintf (const char *format, va_list ap);
+ int _win_vfprintf (FILE * stream, const char *format, va_list arg_ptr);
+ int _win_vsprintf (char *dest, const char *format, va_list arg_ptr);
+ int _win_vsnprintf (char *str, size_t size, const char *format,
+ va_list arg_ptr);
+ int _win_snprintf (char *str, size_t size, const char *format, ...);
+ int _win_sprintf (char *dest, const char *format, ...);
+ int _win_vsscanf (const char *str, const char *format, va_list arg_ptr);
+ int _win_sscanf (const char *str, const char *format, ...);
+ int _win_vfscanf (FILE * stream, const char *format, va_list arg_ptr);
+ int _win_vscanf (const char *format, va_list arg_ptr);
+ int _win_scanf (const char *format, ...);
+ int _win_fscanf (FILE * stream, const char *format, ...);
+ pid_t _win_waitpid (pid_t pid, int *stat_loc, int options);
+ int _win_bind (SOCKET s, const struct sockaddr *name, int namelen);
+ int _win_connect (SOCKET s, const struct sockaddr *name, int namelen);
+ int _win_getpeername (SOCKET s, struct sockaddr *name, int *namelen);
+ int _win_getsockname (SOCKET s, struct sockaddr *name, int *namelen);
+ int _win_getsockopt (SOCKET s, int level, int optname, char *optval,
+ int *optlen);
+ int _win_listen (SOCKET s, int backlog);
+ int _win_recv (SOCKET s, char *buf, int len, int flags);
+ int _win_recvfrom (SOCKET s, void *buf, int len, int flags,
+ struct sockaddr *from, int *fromlen);
+ int _win_select (int max_fd, fd_set * rfds, fd_set * wfds, fd_set * efds,
+ const struct timeval *tv);
+ int _win_send (SOCKET s, const char *buf, int len, int flags);
+ int _win_sendto (SOCKET s, const char *buf, int len, int flags,
+ const struct sockaddr *to, int tolen);
+ int _win_setsockopt (SOCKET s, int level, int optname, const void *optval,
+ int optlen);
+ int _win_shutdown (SOCKET s, int how);
+ SOCKET _win_socket (int af, int type, int protocol);
+ struct hostent *_win_gethostbyaddr (const char *addr, int len, int type);
+ struct hostent *_win_gethostbyname (const char *name);
+ char *_win_strerror (int errnum);
+ int IsWinNT ();
#if !HAVE_STRNDUP
-char *strndup (const char *s, size_t n);
+ char *strndup (const char *s, size_t n);
#endif
#if !HAVE_STRNLEN
-size_t strnlen (const char *str, size_t maxlen);
+ size_t strnlen (const char *str, size_t maxlen);
#endif
#define strcasecmp(a, b) stricmp(a, b)
#define strncasecmp(a, b, c) strnicmp(a, b, c)
-#endif /* WINDOWS */
+#endif /* WINDOWS */
#ifndef WINDOWS
- #define DIR_SEPARATOR '/'
- #define DIR_SEPARATOR_STR "/"
- #define PATH_SEPARATOR ';'
- #define PATH_SEPARATOR_STR ";"
- #define NEWLINE "\n"
+#define DIR_SEPARATOR '/'
+#define DIR_SEPARATOR_STR "/"
+#define PATH_SEPARATOR ';'
+#define PATH_SEPARATOR_STR ";"
+#define NEWLINE "\n"
#ifdef ENABLE_NLS
- #define BINDTEXTDOMAIN(d, n) bindtextdomain(d, n)
+#define BINDTEXTDOMAIN(d, n) bindtextdomain(d, n)
#endif
- #define CREAT(p, m) creat(p, m)
- #undef FOPEN
- #define FOPEN(f, m) fopen(f, m)
- #define FTRUNCATE(f, l) ftruncate(f, l)
- #define OPENDIR(d) opendir(d)
- #define OPEN open
- #define CHDIR(d) chdir(d)
- #define CLOSE(f) close(f)
- #define LSEEK(f, o, w) lseek(f, o, w)
- #define RMDIR(f) rmdir(f)
- #define ACCESS(p, m) access(p, m)
- #define CHMOD(f, p) chmod(f, p)
- #define FSTAT(h, b) fstat(h, b)
- #define PIPE(h) pipe(h)
- #define REMOVE(p) remove(p)
- #define RENAME(o, n) rename(o, n)
- #define STAT(p, b) stat(p, b)
- #define STAT64(p, b) stat64(p, b)
- #define UNLINK(f) unlink(f)
- #define WRITE(f, b, n) write(f, b, n)
- #define READ(f, b, n) read(f, b, n)
- #define GN_FREAD(b, s, c, f) fread(b, s, c, f)
- #define GN_FWRITE(b, s, c, f) fwrite(b, s, c, f)
- #define SYMLINK(a, b) symlink(a, b)
- #define MMAP(s, l, p, f, d, o) mmap(s, l, p, f, d, o)
- #define MUNMAP(s, l) munmap(s, l)
- #define STRERROR(i) strerror(i)
- #define RANDOM() random()
- #define READLINK(p, b, s) readlink(p, b, s)
- #define LSTAT(p, b) lstat(p, b)
- #define LSTAT64(p, b) lstat64(p, b)
- #define PRINTF printf
- #define FPRINTF fprintf
- #define VPRINTF(f, a) vprintf(f, a)
- #define VFPRINTF(s, f, a) vfprintf(s, f, a)
- #define VSPRINTF(d, f, a) vsprintf(d, f, a)
- #define VSNPRINTF(str, size, fmt, a) vsnprintf(str, size, fmt, a)
- #define _REAL_SNPRINTF snprintf
- #define SPRINTF sprintf
- #define VSSCANF(s, f, a) vsscanf(s, f, a)
- #define SSCANF sscanf
- #define VFSCANF(s, f, a) vfscanf(s, f, a)
- #define VSCANF(f, a) vscanf(f, a)
- #define SCANF scanf
- #define FSCANF fscanf
- #define WAITPID(p, s, o) waitpid(p, s, o)
- #define ACCEPT(s, a, l) accept(s, a, l)
- #define BIND(s, n, l) bind(s, n, l)
- #define CONNECT(s, n, l) connect(s, n, l)
- #define GETPEERNAME(s, n, l) getpeername(s, n, l)
- #define GETSOCKNAME(s, n, l) getsockname(s, n, l)
- #define GETSOCKOPT(s, l, o, v, p) getsockopt(s, l, o, v, p)
- #define LISTEN(s, b) listen(s, b)
- #define RECV(s, b, l, f) recv(s, b, l, f)
- #define RECVFROM(s, b, l, f, r, o) recvfrom(s, b, l, f, r, o)
- #define SELECT(n, r, w, e, t) select(n, r, w, e, t)
- #define SEND(s, b, l, f) send(s, b, l, f)
- #define SENDTO(s, b, l, f, o, n) sendto(s, b, l, f, o, n)
- #define SETSOCKOPT(s, l, o, v, n) setsockopt(s, l, o, v, n)
- #define SHUTDOWN(s, h) shutdown(s, h)
- #define SOCKET(a, t, p) socket(a, t, p)
- #define GETHOSTBYADDR(a, l, t) gethostbyname(a, l, t)
- #define GETHOSTBYNAME(n) gethostbyname(n)
+#define CREAT(p, m) creat(p, m)
+#undef FOPEN
+#define FOPEN(f, m) fopen(f, m)
+#define FTRUNCATE(f, l) ftruncate(f, l)
+#define OPENDIR(d) opendir(d)
+#define OPEN open
+#define CHDIR(d) chdir(d)
+#define CLOSE(f) close(f)
+#define LSEEK(f, o, w) lseek(f, o, w)
+#define RMDIR(f) rmdir(f)
+#define ACCESS(p, m) access(p, m)
+#define CHMOD(f, p) chmod(f, p)
+#define FSTAT(h, b) fstat(h, b)
+#define PIPE(h) pipe(h)
+#define REMOVE(p) remove(p)
+#define RENAME(o, n) rename(o, n)
+#define STAT(p, b) stat(p, b)
+#define STAT64(p, b) stat64(p, b)
+#define UNLINK(f) unlink(f)
+#define WRITE(f, b, n) write(f, b, n)
+#define READ(f, b, n) read(f, b, n)
+#define GN_FREAD(b, s, c, f) fread(b, s, c, f)
+#define GN_FWRITE(b, s, c, f) fwrite(b, s, c, f)
+#define SYMLINK(a, b) symlink(a, b)
+#define MMAP(s, l, p, f, d, o) mmap(s, l, p, f, d, o)
+#define MUNMAP(s, l) munmap(s, l)
+#define STRERROR(i) strerror(i)
+#define RANDOM() random()
+#define READLINK(p, b, s) readlink(p, b, s)
+#define LSTAT(p, b) lstat(p, b)
+#define LSTAT64(p, b) lstat64(p, b)
+#define PRINTF printf
+#define FPRINTF fprintf
+#define VPRINTF(f, a) vprintf(f, a)
+#define VFPRINTF(s, f, a) vfprintf(s, f, a)
+#define VSPRINTF(d, f, a) vsprintf(d, f, a)
+#define VSNPRINTF(str, size, fmt, a) vsnprintf(str, size, fmt, a)
+#define _REAL_SNPRINTF snprintf
+#define SPRINTF sprintf
+#define VSSCANF(s, f, a) vsscanf(s, f, a)
+#define SSCANF sscanf
+#define VFSCANF(s, f, a) vfscanf(s, f, a)
+#define VSCANF(f, a) vscanf(f, a)
+#define SCANF scanf
+#define FSCANF fscanf
+#define WAITPID(p, s, o) waitpid(p, s, o)
+#define ACCEPT(s, a, l) accept(s, a, l)
+#define BIND(s, n, l) bind(s, n, l)
+#define CONNECT(s, n, l) connect(s, n, l)
+#define GETPEERNAME(s, n, l) getpeername(s, n, l)
+#define GETSOCKNAME(s, n, l) getsockname(s, n, l)
+#define GETSOCKOPT(s, l, o, v, p) getsockopt(s, l, o, v, p)
+#define LISTEN(s, b) listen(s, b)
+#define RECV(s, b, l, f) recv(s, b, l, f)
+#define RECVFROM(s, b, l, f, r, o) recvfrom(s, b, l, f, r, o)
+#define SELECT(n, r, w, e, t) select(n, r, w, e, t)
+#define SEND(s, b, l, f) send(s, b, l, f)
+#define SENDTO(s, b, l, f, o, n) sendto(s, b, l, f, o, n)
+#define SETSOCKOPT(s, l, o, v, n) setsockopt(s, l, o, v, n)
+#define SHUTDOWN(s, h) shutdown(s, h)
+#define SOCKET(a, t, p) socket(a, t, p)
+#define GETHOSTBYADDR(a, l, t) gethostbyname(a, l, t)
+#define GETHOSTBYNAME(n) gethostbyname(n)
#else
- #define DIR_SEPARATOR '\\'
- #define DIR_SEPARATOR_STR "\\"
- #define PATH_SEPARATOR ':'
- #define PATH_SEPARATOR_STR ":"
- #define NEWLINE "\r\n"
+#define DIR_SEPARATOR '\\'
+#define DIR_SEPARATOR_STR "\\"
+#define PATH_SEPARATOR ':'
+#define PATH_SEPARATOR_STR ":"
+#define NEWLINE "\r\n"
#ifdef ENABLE_NLS
- #define BINDTEXTDOMAIN(d, n) _win_bindtextdomain(d, n)
+#define BINDTEXTDOMAIN(d, n) _win_bindtextdomain(d, n)
#endif
- #define CREAT(p, m) _win_creat(p, m)
- #define FOPEN(f, m) _win_fopen(f, m)
- #define FTRUNCATE(f, l) ftruncate(f, l)
- #define OPENDIR(d) _win_opendir(d)
- #define OPEN _win_open
- #define CHDIR(d) _win_chdir(d)
- #define CLOSE(f) _win_close(f)
- #define LSEEK(f, o, w) lseek(f, o, w)
- #define FSTAT(h, b) _win_fstat(h, b)
- #define RMDIR(f) _win_rmdir(f)
- #define ACCESS(p, m) _win_access(p, m)
- #define CHMOD(f, p) _win_chmod(f, p)
- #define PIPE(h) _win_pipe(h)
- #define RANDOM() _win_random()
- #define REMOVE(p) _win_remove(p)
- #define RENAME(o, n) _win_rename(o, n)
- #define STAT(p, b) _win_stat(p, b)
- #define STAT64(p, b) _win_stat64(p, b)
- #define UNLINK(f) _win_unlink(f)
- #define WRITE(f, b, n) _win_write(f, b, n)
- #define READ(f, b, n) _win_read(f, b, n)
- #define GN_FREAD(b, s, c, f) _win_fread(b, s, c, f)
- #define GN_FWRITE(b, s, c, f) _win_fwrite(b, s, c, f)
- #define SYMLINK(a, b) _win_symlink(a, b)
- #define MMAP(s, l, p, f, d, o) _win_mmap(s, l, p, f, d, o)
- #define MUNMAP(s, l) _win_munmap(s, l)
- #define STRERROR(i) _win_strerror(i)
- #define READLINK(p, b, s) _win_readlink(p, b, s)
- #define LSTAT(p, b) _win_lstat(p, b)
- #define LSTAT64(p, b) _win_lstat64(p, b)
- #define PRINTF(f, ...) _win_printf(f , __VA_ARGS__)
- #define FPRINTF(fil, fmt, ...) _win_fprintf(fil, fmt, __VA_ARGS__)
- #define VPRINTF(f, a) _win_vprintf(f, a)
- #define VFPRINTF(s, f, a) _win_vfprintf(s, f, a)
- #define VSPRINTF(d, f, a) _win_vsprintf(d, f, a)
- #define VSNPRINTF(str, size, fmt, a) _win_vsnprintf(str, size, fmt, a)
- #define _REAL_SNPRINTF(str, size, fmt, ...) _win_snprintf(str, size, fmt,
__VA_ARGS__)
- #define SPRINTF(d, f, ...) _win_sprintf(d, f, __VA_ARGS__)
- #define VSSCANF(s, f, a) _win_vsscanf(s, f, a)
- #define SSCANF(s, f, ...) _win_sscanf(s, f, __VA_ARGS__)
- #define VFSCANF(s, f, a) _win_vfscanf(s, f, a)
- #define VSCANF(f, a) _win_vscanf(f, a)
- #define SCANF(f, ...) _win_scanf(f, __VA_ARGS__)
- #define FSCANF(s, f, ...) _win_fscanf(s, f, __VA_ARGS__)
- #define WAITPID(p, s, o) _win_waitpid(p, s, o)
- #define ACCEPT(s, a, l) _win_accept(s, a, l)
- #define BIND(s, n, l) _win_bind(s, n, l)
- #define CONNECT(s, n, l) _win_connect(s, n, l)
- #define GETPEERNAME(s, n, l) _win_getpeername(s, n, l)
- #define GETSOCKNAME(s, n, l) _win_getsockname(s, n, l)
- #define GETSOCKOPT(s, l, o, v, p) _win_getsockopt(s, l, o, v, p)
- #define LISTEN(s, b) _win_listen(s, b)
- #define RECV(s, b, l, f) _win_recv(s, b, l, f)
- #define RECVFROM(s, b, l, f, r, o) _win_recvfrom(s, b, l, f, r, o)
- #define SELECT(n, r, w, e, t) _win_select(n, r, w, e, t)
- #define SEND(s, b, l, f) _win_send(s, b, l, f)
- #define SENDTO(s, b, l, f, o, n) _win_sendto(s, b, l, f, o, n)
- #define SETSOCKOPT(s, l, o, v, n) _win_setsockopt(s, l, o, v, n)
- #define SHUTDOWN(s, h) _win_shutdown(s, h)
- #define SOCKET(a, t, p) _win_socket(a, t, p)
- #define GETHOSTBYADDR(a, l, t) _win_gethostbyname(a, l, t)
- #define GETHOSTBYNAME(n) _win_gethostbyname(n)
+#define CREAT(p, m) _win_creat(p, m)
+#define FOPEN(f, m) _win_fopen(f, m)
+#define FTRUNCATE(f, l) ftruncate(f, l)
+#define OPENDIR(d) _win_opendir(d)
+#define OPEN _win_open
+#define CHDIR(d) _win_chdir(d)
+#define CLOSE(f) _win_close(f)
+#define LSEEK(f, o, w) lseek(f, o, w)
+#define FSTAT(h, b) _win_fstat(h, b)
+#define RMDIR(f) _win_rmdir(f)
+#define ACCESS(p, m) _win_access(p, m)
+#define CHMOD(f, p) _win_chmod(f, p)
+#define PIPE(h) _win_pipe(h)
+#define RANDOM() _win_random()
+#define REMOVE(p) _win_remove(p)
+#define RENAME(o, n) _win_rename(o, n)
+#define STAT(p, b) _win_stat(p, b)
+#define STAT64(p, b) _win_stat64(p, b)
+#define UNLINK(f) _win_unlink(f)
+#define WRITE(f, b, n) _win_write(f, b, n)
+#define READ(f, b, n) _win_read(f, b, n)
+#define GN_FREAD(b, s, c, f) _win_fread(b, s, c, f)
+#define GN_FWRITE(b, s, c, f) _win_fwrite(b, s, c, f)
+#define SYMLINK(a, b) _win_symlink(a, b)
+#define MMAP(s, l, p, f, d, o) _win_mmap(s, l, p, f, d, o)
+#define MUNMAP(s, l) _win_munmap(s, l)
+#define STRERROR(i) _win_strerror(i)
+#define READLINK(p, b, s) _win_readlink(p, b, s)
+#define LSTAT(p, b) _win_lstat(p, b)
+#define LSTAT64(p, b) _win_lstat64(p, b)
+#define PRINTF(f, ...) _win_printf(f , __VA_ARGS__)
+#define FPRINTF(fil, fmt, ...) _win_fprintf(fil, fmt, __VA_ARGS__)
+#define VPRINTF(f, a) _win_vprintf(f, a)
+#define VFPRINTF(s, f, a) _win_vfprintf(s, f, a)
+#define VSPRINTF(d, f, a) _win_vsprintf(d, f, a)
+#define VSNPRINTF(str, size, fmt, a) _win_vsnprintf(str, size, fmt, a)
+#define _REAL_SNPRINTF(str, size, fmt, ...) _win_snprintf(str, size, fmt,
__VA_ARGS__)
+#define SPRINTF(d, f, ...) _win_sprintf(d, f, __VA_ARGS__)
+#define VSSCANF(s, f, a) _win_vsscanf(s, f, a)
+#define SSCANF(s, f, ...) _win_sscanf(s, f, __VA_ARGS__)
+#define VFSCANF(s, f, a) _win_vfscanf(s, f, a)
+#define VSCANF(f, a) _win_vscanf(f, a)
+#define SCANF(f, ...) _win_scanf(f, __VA_ARGS__)
+#define FSCANF(s, f, ...) _win_fscanf(s, f, __VA_ARGS__)
+#define WAITPID(p, s, o) _win_waitpid(p, s, o)
+#define ACCEPT(s, a, l) _win_accept(s, a, l)
+#define BIND(s, n, l) _win_bind(s, n, l)
+#define CONNECT(s, n, l) _win_connect(s, n, l)
+#define GETPEERNAME(s, n, l) _win_getpeername(s, n, l)
+#define GETSOCKNAME(s, n, l) _win_getsockname(s, n, l)
+#define GETSOCKOPT(s, l, o, v, p) _win_getsockopt(s, l, o, v, p)
+#define LISTEN(s, b) _win_listen(s, b)
+#define RECV(s, b, l, f) _win_recv(s, b, l, f)
+#define RECVFROM(s, b, l, f, r, o) _win_recvfrom(s, b, l, f, r, o)
+#define SELECT(n, r, w, e, t) _win_select(n, r, w, e, t)
+#define SEND(s, b, l, f) _win_send(s, b, l, f)
+#define SENDTO(s, b, l, f, o, n) _win_sendto(s, b, l, f, o, n)
+#define SETSOCKOPT(s, l, o, v, n) _win_setsockopt(s, l, o, v, n)
+#define SHUTDOWN(s, h) _win_shutdown(s, h)
+#define SOCKET(a, t, p) _win_socket(a, t, p)
+#define GETHOSTBYADDR(a, l, t) _win_gethostbyname(a, l, t)
+#define GETHOSTBYNAME(n) _win_gethostbyname(n)
#endif
@@ -593,6 +595,6 @@
#endif
-#endif //_PLIBC_H_
+#endif //_PLIBC_H_
/* end of plibc.h */
Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/src/util/network/io.c 2007-09-29 22:47:47 UTC (rev 5670)
@@ -182,7 +182,8 @@
mode = !doBlock;
#if HAVE_PLIBC_FD
- if (ioctlsocket (plibc_fd_get_handle(s->handle), FIONBIO, &mode) ==
SOCKET_ERROR)
+ if (ioctlsocket (plibc_fd_get_handle (s->handle), FIONBIO, &mode) ==
+ SOCKET_ERROR)
#else
if (ioctlsocket (s->handle, FIONBIO, &mode) == SOCKET_ERROR)
#endif
@@ -197,7 +198,7 @@
#if HAVE_PLIBC_FD
plibc_fd_set_blocking (s->handle, doBlock);
#else
- __win_SetHandleBlockingMode(s->handle, doBlock);
+ __win_SetHandleBlockingMode (s->handle, doBlock);
#endif
return 0;
}
@@ -220,7 +221,7 @@
#if HAVE_PLIBC_FD
return plibc_fd_get_blocking (s->handle);
#else
- return __win_IsHandleMarkedAsBlocking(s->handle);
+ return __win_IsHandleMarkedAsBlocking (s->handle);
#endif
#endif
}
Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c 2007-09-29 21:26:22 UTC (rev 5669)
+++ GNUnet/src/util/network/select.c 2007-09-29 22:47:47 UTC (rev 5670)
@@ -777,7 +777,7 @@
#if HAVE_PLIBC_FD
plibc_fd_set_blocking (handle, 0);
#else
- __win_SetHandleBlockingMode(handle, 0);
+ __win_SetHandleBlockingMode (handle, 0);
#endif
/* don't report errors because Win9x doesn't support
SetNamedPipeHandleState() */
#else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5670 - in GNUnet: . libltdl m4 po src/applications/sqstore_mysql src/applications/vpn src/include src/util/network,
gnunet <=