[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r1577 - GNUnet/contrib GNUnet/src/applications/advertising
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r1577 - GNUnet/contrib GNUnet/src/applications/advertising GNUnet/src/applications/testbed GNUnet/src/applications/transport GNUnet/src/conf GNUnet/src/include GNUnet/src/util GNUnet-docs/WWW gnunet-gtk gnunet-gtk/po |
|
Date: |
Sun, 17 Jul 2005 16:46:35 -0700 (PDT) |
Author: grothoff
Date: 2005-07-17 16:46:20 -0700 (Sun, 17 Jul 2005)
New Revision: 1577
Modified:
GNUnet-docs/WWW/download.php3
GNUnet/contrib/config-daemon.in
GNUnet/contrib/gnunet.root
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/advertising/bootstrap.c
GNUnet/src/applications/testbed/testbed.c
GNUnet/src/applications/transport/transport.c
GNUnet/src/conf/mconf_textbox.c
GNUnet/src/include/gnunet_identity_service.h
GNUnet/src/util/kblockkey_test.c
gnunet-gtk/ChangeLog
gnunet-gtk/mkinstalldirs
gnunet-gtk/po/Makefile.in
Log:
last minute fixes
Modified: GNUnet/contrib/config-daemon.in
===================================================================
--- GNUnet/contrib/config-daemon.in 2005-07-17 23:21:45 UTC (rev 1576)
+++ GNUnet/contrib/config-daemon.in 2005-07-17 23:46:20 UTC (rev 1577)
@@ -57,12 +57,12 @@
of free space is recommended.
Default: GNUNETD_HOME = /var/lib/GNUnet
- config HELOEXPIRES
+ config HELLOEXPIRES
int "How many minutes should peer advertisements last?"
default 1440
depends on Meta::ADVANCED
help
- How many minutes is the current IP valid? (GNUnet will sign
HELO
+ How many minutes is the current IP valid? (GNUnet will sign
HELLO
messages with this expiration timeline. If you are on dialup, 60
(for 1 hour) is suggested. If you are having a static IP
address,
you may want to set this to a large value (say 14400). The
default
@@ -70,7 +70,7 @@
choose the expiration to be smaller than the frequency with
which
your IP changes.
The largest legal value is 14400 (10 days).
- Default: HELOEXPIRES = 1440
+ Default: HELLOEXPIRES = 1440
config LOGLEVEL
string "Log level"
@@ -303,7 +303,7 @@
NILS: can we only show this item if
the user selected topology = toplogy_f2f?
- config HELOEXCHANGE
+ config HELLOEXCHANGE
bool "Participate in network topology management"
default y
depends on Meta::ADVANCED
@@ -312,11 +312,11 @@
reachable from the Internet and that contains GNUnet clients
and to
a public network, typically the Internet (and is this host is
thus
in the position of a router, typically doing NAT), then this
option
- should be set to 'NO'. It prevents the node from forwarding
HELOs
+ should be set to 'NO'. It prevents the node from forwarding
HELLOs
other than its own. If you do not know what the above is about,
just
keep it set to YES (which is also the default when the option
is not
given).
- Default is yes: HELOEXCHANGE = YES
+ Default is yes: HELLOEXCHANGE = YES
config TRUSTED
string "IPs allowed to use gnunetd server"
@@ -580,8 +580,8 @@
string "Hostname of the sender host"
default "myhost.example.com"
help
- Hostname of the sender host to use in the HELO message
of the SMTP
- protocol (not to be confused with the HELO in the
GNUnet p2p
+ Hostname of the sender host to use in the HELLO message
of the SMTP
+ protocol (not to be confused with the HELLO in the
GNUnet p2p
protocol). Pick a hostname that works for your SMTP
server. This
hostname has nothing to do with the hostname of the
SMTP server or
your E-mail sender address (though those names should
work in most
Modified: GNUnet/contrib/gnunet.root
===================================================================
--- GNUnet/contrib/gnunet.root 2005-07-17 23:21:45 UTC (rev 1576)
+++ GNUnet/contrib/gnunet.root 2005-07-17 23:46:20 UTC (rev 1577)
@@ -21,7 +21,7 @@
#
[GNUNETD]
GNUNETD_HOME = "/var/lib/GNUnet"
-HELOEXPIRES = 1440
+HELLOEXPIRES = 1440
LOGLEVEL = "WARNING"
LOGFILE = "$GNUNETD_HOME/logs"
KEEPLOG = "0"
@@ -48,7 +48,7 @@
INTERFACE = ""
IP = ""
F2F = "$GNUNETD_HOME/friends"
-HELOEXCHANGE = YES
+HELLOEXCHANGE = YES
TRUSTED = "127.0.0.0/8;"
#
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2005-07-17 23:21:45 UTC
(rev 1576)
+++ GNUnet/src/applications/advertising/advertising.c 2005-07-17 23:46:20 UTC
(rev 1577)
@@ -45,13 +45,13 @@
/**
* Send our hello to a random connected host on a regular basis.
*/
-#define hello_BROADCAST_FREQUENCY (2 * cronMINUTES)
+#define HELLO_BROADCAST_FREQUENCY (2 * cronMINUTES)
/**
* From time to time, forward one hello from one peer to
* a random other peer.
*/
-#define hello_FORWARD_FREQUENCY (4 * cronMINUTES)
+#define HELLO_FORWARD_FREQUENCY (4 * cronMINUTES)
/**
* Meanings of the bits in activeCronJobs (ACJ).
@@ -61,7 +61,7 @@
#define ACJ_FORWARD 2
#define ACJ_ALL (ACJ_ANNOUNCE | ACJ_FORWARD)
-#define DEBUG_helloEXCHANGE NO
+#define DEBUG_ADVERTISING NO
static CoreAPIForApplication * coreAPI;
@@ -157,7 +157,7 @@
(char*)&enc);
return SYSERR; /* message invalid */
}
- if ((TIME_T)ntohl(msg->expirationTime) > TIME(NULL) + MAX_hello_EXPIRES) {
+ if ((TIME_T)ntohl(msg->expirationTime) > TIME(NULL) + MAX_HELLO_EXPIRES) {
LOG(LOG_WARNING,
_("hello message received invalid (expiration time over limit).
Dropping.\n"));
return SYSERR;
@@ -166,7 +166,7 @@
return OK; /* not good, but do process rest of message */
if (stats != NULL)
stats->change(stat_hello_in, 1);
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_INFO,
_("hello advertisement for protocol %d received.\n"),
ntohs(msg->protocol));
@@ -206,7 +206,7 @@
FREE(copy);
return OK;
} else {
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_DEBUG,
"advertised hello differs from prior knowledge,"
" requireing ping-pong confirmation.\n");
@@ -352,7 +352,7 @@
return;
hash2enc(&hi->hashPubKey,
&other);
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_DEBUG,
"Entering '%s' with target '%s'.\n",
__FUNCTION__,
@@ -368,7 +368,7 @@
coreAPI->unicast(hi,
&sd->m->header,
prio,
- hello_BROADCAST_FREQUENCY);
+ HELLO_BROADCAST_FREQUENCY);
if (stats != NULL)
stats->change(stat_hello_out,
1);
@@ -387,7 +387,7 @@
proto,
NO);
if (NULL == helo) {
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_DEBUG,
"Exit from '%s' (error: '%s' failed).\n",
__FUNCTION__,
@@ -398,7 +398,7 @@
tsession = transport->connect(helo);
FREE(helo);
if (tsession == NULL) {
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_DEBUG,
"Exit from '%s' (%s error).\n",
__FUNCTION__,
@@ -413,7 +413,7 @@
(char*)&sd->m->header,
P2P_hello_MESSAGE_size(sd->m));
transport->disconnect(tsession);
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_DEBUG,
"Exit from %s.\n",
__FUNCTION__);
@@ -434,7 +434,7 @@
return; /* network load too high... */
if (0 != randomi(*prob))
return; /* ignore */
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_CRON,
"Enter '%s'.\n",
__FUNCTION__);
@@ -446,7 +446,7 @@
sd.m = transport->createhello(tapi->protocolNumber);
if (sd.m == NULL)
return;
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_INFO,
_("Advertising my transport %d to selected peers.\n"),
tapi->protocolNumber);
@@ -464,7 +464,7 @@
(HostIterator)&broadcastHelper,
&sd);
FREE(sd.m);
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_CRON,
"Exit '%s'.\n",
__FUNCTION__);
@@ -535,7 +535,7 @@
if (randomi((*probability)+1) != 0)
return; /* only forward with a certain chance,
(on average: 1 peer per run!) */
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_CRON,
"forwarding hellos\n");
#endif
@@ -567,7 +567,7 @@
count = coreAPI->forAllConnectedNodes(NULL,
NULL);
if (count > 0) {
- fcc.delay = (*probability) * hello_BROADCAST_FREQUENCY; /* send before
the next round */
+ fcc.delay = (*probability) * HELLO_BROADCAST_FREQUENCY; /* send before
the next round */
fcc.msg = helo;
fcc.prob = count;
coreAPI->forAllConnectedNodes((PerNodeCallback) &forwardCallback,
@@ -587,7 +587,7 @@
if (getCPULoad() > 100)
return; /* CPU load too high... */
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_CRON,
"Enter '%s'.\n",
__FUNCTION__);
@@ -598,7 +598,7 @@
identity->forEachHost(0, /* ignore blacklisting */
&forwardhelloHelper,
&count);
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
LOG(LOG_CRON,
"Exit '%s'.\n",
__FUNCTION__);
@@ -644,25 +644,25 @@
"DISABLE-ADVERTISEMENTS",
"YES"))
delCronJob(&broadcasthello,
- hello_BROADCAST_FREQUENCY,
+ HELLO_BROADCAST_FREQUENCY,
NULL);
activeCronJobs -= ACJ_ANNOUNCE;
} else {
if (testConfigurationString("NETWORK",
- "helloEXCHANGE",
+ "HELLOEXCHANGE",
"YES"))
addCronJob(&broadcasthello,
15 * cronSECONDS,
- hello_BROADCAST_FREQUENCY,
+ HELLO_BROADCAST_FREQUENCY,
NULL);
activeCronJobs += ACJ_ANNOUNCE;
}
if (ACJ_FORWARD == (activeCronJobs & ACJ_FORWARD)) {
if (! testConfigurationString("NETWORK",
- "helloEXCHANGE",
+ "HELLOEXCHANGE",
"YES"))
delCronJob(&forwardhello,
- hello_FORWARD_FREQUENCY,
+ HELLO_FORWARD_FREQUENCY,
NULL); /* seven minutes: exchange */
activeCronJobs -= ACJ_FORWARD;
} else {
@@ -671,7 +671,7 @@
"YES"))
addCronJob(&broadcasthello,
15 * cronSECONDS,
- hello_BROADCAST_FREQUENCY,
+ HELLO_BROADCAST_FREQUENCY,
NULL);
activeCronJobs += ACJ_FORWARD;
}
@@ -737,7 +737,7 @@
"YES")) {
addCronJob(&broadcasthello,
15 * cronSECONDS,
- hello_BROADCAST_FREQUENCY,
+ HELLO_BROADCAST_FREQUENCY,
NULL);
activeCronJobs += ACJ_ANNOUNCE;
} else {
@@ -745,15 +745,15 @@
_("Network advertisements disabled by configuration!\n"));
}
if (testConfigurationString("NETWORK",
- "helloEXCHANGE",
+ "HELLOEXCHANGE",
"YES") == YES) {
addCronJob(&forwardhello,
4 * cronMINUTES,
- hello_FORWARD_FREQUENCY,
+ HELLO_FORWARD_FREQUENCY,
NULL);
activeCronJobs += ACJ_FORWARD;
}
-#if DEBUG_helloEXCHANGE
+#if DEBUG_ADVERTISING
else
LOG(LOG_DEBUG,
"hello forwarding disabled!\n");
@@ -774,13 +774,13 @@
stopBootstrap();
if (ACJ_ANNOUNCE == (activeCronJobs & ACJ_ANNOUNCE)) {
delCronJob(&broadcasthello,
- hello_BROADCAST_FREQUENCY,
+ HELLO_BROADCAST_FREQUENCY,
NULL);
activeCronJobs -= ACJ_ANNOUNCE;
}
if (ACJ_FORWARD == (activeCronJobs & ACJ_FORWARD)) {
delCronJob(&forwardhello,
- hello_FORWARD_FREQUENCY,
+ HELLO_FORWARD_FREQUENCY,
NULL); /* seven minutes: exchange */
activeCronJobs -= ACJ_FORWARD;
}
Modified: GNUnet/src/applications/advertising/bootstrap.c
===================================================================
--- GNUnet/src/applications/advertising/bootstrap.c 2005-07-17 23:21:45 UTC
(rev 1576)
+++ GNUnet/src/applications/advertising/bootstrap.c 2005-07-17 23:46:20 UTC
(rev 1577)
@@ -61,7 +61,7 @@
(hcq->helosCount > 0) ) {
/* select hello by random */
rndidx = randomi(hcq->helosCount);
-#if DEBUG_helloEXCHANGE
+#if DEBUG_BOOTSTRAP
LOG(LOG_DEBUG,
"%s chose hello %d of %d\n",
__FUNCTION__,
Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c 2005-07-17 23:21:45 UTC (rev
1576)
+++ GNUnet/src/applications/testbed/testbed.c 2005-07-17 23:46:20 UTC (rev
1577)
@@ -319,7 +319,7 @@
"DISABLE-ADVERTISEMENTS",
"YES"));
FREENONNULL(setConfigurationString("NETWORK",
- "helloEXCHANGE",
+ "HELLOEXCHANGE",
"NO"));
triggerGlobalConfigurationRefresh();
sendAcknowledgement(client, OK);
@@ -336,7 +336,7 @@
"DISABLE-ADVERTISEMENTS",
"NO"));
FREENONNULL(setConfigurationString("NETWORK",
- "helloEXCHANGE",
+ "HELLOEXCHANGE",
"YES"));
triggerGlobalConfigurationRefresh();
sendAcknowledgement(client, OK);
@@ -1268,7 +1268,7 @@
LOG(LOG_WARNING,
_("Exit register (error: no http response read).\n"));
}
-#if DEBUG_helloEXCHANGE
+#if DEBUG_TESTBED
LOG(LOG_INFO,
"Exit register (%d seconds before timeout)\n",
(int)(start + 300 * cronSECONDS - cronTime(NULL))/cronSECONDS);
Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c 2005-07-17 23:21:45 UTC
(rev 1576)
+++ GNUnet/src/applications/transport/transport.c 2005-07-17 23:46:20 UTC
(rev 1577)
@@ -42,7 +42,7 @@
static unsigned int helo_live;
static Mutex tapis_lock;
-#define hello_RECREATE_FREQ (5 * cronMINUTES)
+#define HELLO_RECREATE_FREQ (5 * cronMINUTES)
@@ -109,8 +109,8 @@
tapis[tapi->protocolNumber] = tapi;
tapi->helo = NULL;
addCronJob((CronJob)&createSignedhello,
- hello_RECREATE_FREQ,
- hello_RECREATE_FREQ,
+ HELLO_RECREATE_FREQ,
+ HELLO_RECREATE_FREQ,
tapi);
return OK;
}
@@ -626,8 +626,8 @@
helo_live = getConfigurationInt("GNUNETD",
"HELLOEXPIRES") * 60; /* minutes to seconds */
- if (helo_live > MAX_hello_EXPIRES)
- helo_live = MAX_hello_EXPIRES;
+ if (helo_live > MAX_HELLO_EXPIRES)
+ helo_live = MAX_HELLO_EXPIRES;
if (helo_live <= 0) {
helo_live = 60 * 60;
@@ -730,7 +730,7 @@
for (i=0;i<tapis_count;i++) {
if (tapis[i] != NULL) {
delCronJob((CronJob)&createSignedhello,
- hello_RECREATE_FREQ,
+ HELLO_RECREATE_FREQ,
tapis[i]);
ptr = bindDynamicMethod(tapis[i]->libHandle,
"donetransport_",
Modified: GNUnet/src/conf/mconf_textbox.c
===================================================================
--- GNUnet/src/conf/mconf_textbox.c 2005-07-17 23:21:45 UTC (rev 1576)
+++ GNUnet/src/conf/mconf_textbox.c 2005-07-17 23:46:20 UTC (rev 1577)
@@ -26,6 +26,8 @@
* @author Nils Durner
*/
+#include "platform.h"
+#include "gnunet_util.h"
#include "mconf_dialog.h"
static void back_lines (int n);
Modified: GNUnet/src/include/gnunet_identity_service.h
===================================================================
--- GNUnet/src/include/gnunet_identity_service.h 2005-07-17 23:21:45 UTC
(rev 1576)
+++ GNUnet/src/include/gnunet_identity_service.h 2005-07-17 23:46:20 UTC
(rev 1577)
@@ -37,7 +37,7 @@
* change (would break compatibility with peers that have a different
* limit).
*/
-#define MAX_hello_EXPIRES (60 * 60 * 24 * 10)
+#define MAX_HELLO_EXPIRES (60 * 60 * 24 * 10)
/**
* Type of an iterator over the hosts. Note that each
Modified: GNUnet/src/util/kblockkey_test.c
===================================================================
--- GNUnet/src/util/kblockkey_test.c 2005-07-17 23:21:45 UTC (rev 1576)
+++ GNUnet/src/util/kblockkey_test.c 2005-07-17 23:46:20 UTC (rev 1577)
@@ -228,9 +228,10 @@
}
-void initRAND(); /* hostkey_* */
+void initRAND(void); /* hostkey_* */
+void initKBlockKey(void);
+void doneKBlockKey(void);
-
int main(int argc, char * argv[]) {
int failureCount = 0;
HashCode512 in;
@@ -238,6 +239,7 @@
initLockingGcrypt();
initRAND();
+ initKBlockKey();
makeRandomId(&in);
hostkey = makeKblockKey(&in);
@@ -257,6 +259,7 @@
if (OK != testPrivateKeyEncoding(hostkey))
failureCount++;
freePrivateKey(hostkey);
+ doneKBlockKey();
doneLockingGcrypt();
if (failureCount == 0) {
Modified: GNUnet-docs/WWW/download.php3
===================================================================
--- GNUnet-docs/WWW/download.php3 2005-07-17 23:21:45 UTC (rev 1576)
+++ GNUnet-docs/WWW/download.php3 2005-07-17 23:46:20 UTC (rev 1577)
@@ -87,10 +87,10 @@
ARRAY("0.7.0", "08-2005"));
W("A pre-release for 0.7.0 is available:");
echo "<ul>\n";
-LIV(extlink_("download/GNUnet-0.7.0pre5.tar.bz2", "GNUnet-0.7.0pre5.tar.bz2
(1263 kb)"));
-LIV(extlink_("download/GNUnet-0.7.0pre5.tar.gz" , "GNUnet-0.7.0pre5.tar.gz
(1836 kb)"));
-LIV(extlink_("download/gnunet-gtk-0.7.0pre5.tar.bz2",
"gnunet-gtk-0.7.0pre5.tar.bz2 (299 kb)"));
-LIV(extlink_("download/gnunet-gtk-0.7.0pre5.tar.gz" ,
"gnunet-gtk-0.7.0pre5.tar.gz (376 kb)"));
+LIV(extlink_("download/GNUnet-0.7.0pre5.tar.bz2", "GNUnet-0.7.0pre5.tar.bz2
(1281 kb)"));
+LIV(extlink_("download/GNUnet-0.7.0pre5.tar.gz" , "GNUnet-0.7.0pre5.tar.gz
(1848 kb)"));
+LIV(extlink_("download/gnunet-gtk-0.7.0pre5.tar.bz2",
"gnunet-gtk-0.7.0pre5.tar.bz2 (447 kb)"));
+LIV(extlink_("download/gnunet-gtk-0.7.0pre5.tar.gz" ,
"gnunet-gtk-0.7.0pre5.tar.gz (598 kb)"));
LIV(extlink_("download/win/Setup-0.7-pre4.exe" , "Setup-0.7-pre4.exe (4896
kb)"));
LIV(extlink_("download/win/Setup-0.7-pre4.exe.asc" , "Setup-0.7-pre4.exe.asc
(1 kb)"));
echo "</ul>\n";
Modified: gnunet-gtk/ChangeLog
===================================================================
--- gnunet-gtk/ChangeLog 2005-07-17 23:21:45 UTC (rev 1576)
+++ gnunet-gtk/ChangeLog 2005-07-17 23:46:20 UTC (rev 1577)
@@ -1,3 +1,6 @@
+Mon Jul 18 01:30:09 CEST 2005
+ Releasing 0.7.0pre5.
+
Fri Jul 15 13:06:40 CEST 2005
Fixed problem with gnunet-gtk hanging on shutdown.
Modified: gnunet-gtk/mkinstalldirs
===================================================================
--- gnunet-gtk/mkinstalldirs 2005-07-17 23:21:45 UTC (rev 1576)
+++ gnunet-gtk/mkinstalldirs 2005-07-17 23:46:20 UTC (rev 1577)
@@ -1,21 +1,33 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <address@hidden>
+
+scriptversion=2005-02-02.21
+
+# Original author: Noah Friedman <address@hidden>
# Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <address@hidden> or send patches to
+# <address@hidden>.
errstatus=0
dirmode=""
usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <address@hidden>."
+
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
- echo "$usage" 1>&2
- exit 0
+ echo "$usage"
+ exit $?
;;
-m) # -m PERM arg
shift
@@ -23,6 +35,10 @@
dirmode=$1
shift
;;
+ --version)
+ echo "$0 $scriptversion"
+ exit $?
+ ;;
--) # stop option processing
shift
break
@@ -50,17 +66,37 @@
0) exit 0 ;;
esac
+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error. This is a problem when calling mkinstalldirs
+# from a parallel make. We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
- if mkdir -p -- . 2>/dev/null; then
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec 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.
+ test -d ./-p && rmdir ./-p
+ test -d ./--version && rmdir ./--version
fi
;;
*)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+ test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
+ else
+ # Clean up after NextStep and OpenStep mkdir.
+ for d in ./-m ./-p ./--version "./$dirmode";
+ do
+ test -d $d && rmdir $d
+ done
fi
;;
esac
@@ -84,17 +120,17 @@
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
- errstatus=$lasterr
+ errstatus=$lasterr
else
- if test ! -z "$dirmode"; then
+ if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
- lasterr=""
- chmod "$dirmode" "$pathcomp" || lasterr=$?
+ lasterr=""
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
fi
fi
@@ -107,5 +143,8 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
Modified: gnunet-gtk/po/Makefile.in
===================================================================
--- gnunet-gtk/po/Makefile.in 2005-07-17 23:21:45 UTC (rev 1576)
+++ gnunet-gtk/po/Makefile.in 2005-07-17 23:46:20 UTC (rev 1577)
@@ -11,7 +11,7 @@
# Origin: gettext-0.13
PACKAGE = gnunet-gtk
-VERSION = 0.7.0pre4
+VERSION = 0.7.0pre5
SHELL = /bin/sh
@@ -20,7 +20,7 @@
top_srcdir = ..
-prefix = /home/grothoff/
+prefix = /home/grothoff
exec_prefix = ${prefix}
datadir = ${prefix}/share
localedir = $(datadir)/locale
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r1577 - GNUnet/contrib GNUnet/src/applications/advertising GNUnet/src/applications/testbed GNUnet/src/applications/transport GNUnet/src/conf GNUnet/src/include GNUnet/src/util GNUnet-docs/WWW gnunet-gtk gnunet-gtk/po,
grothoff <=