[SCM] GNU Inetutils branch, master, updated. inetutils-1_7-48-g2078716

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  20787168168e0a7bec3e51e0f10192ee633a5078 (commit)
       via  20b0ce22938f87daf7a0ff605926e13af04f3cee (commit)
      from  33a0a28de4e206f13da429608c0daab587940392 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=20787168168e0a7bec3e51e0f10192ee633a5078


commit 20787168168e0a7bec3e51e0f10192ee633a5078
Author: Giuseppe Scrivano <address@hidden>
Date:   Tue May 11 22:01:25 2010 +0200

    Fix a possible hang in tftpd.

diff --git a/ChangeLog b/ChangeLog
index 36da17b..0289bf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-05-11  Giuseppe Scrivano  <address@hidden>
 
+       * src/tftpd.c (timer): Use `siglongjmp' instead of `longjmp'.
+       (send_file): Use `sigsetjmp' instead of `setjmp'.
+       (recvfile): Likewise.
+
+       Reported by Hugo Heutinck <address@hidden>.
+
+2010-05-11  Giuseppe Scrivano  <address@hidden>
+
        * src/rcp.c (main): Change the test to check if the call to
        `asprintf' failed.
 
diff --git a/src/tftpd.c b/src/tftpd.c
index 07a8e34..f343f8a 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -508,7 +508,7 @@ timer (int sig)
   timeout += rexmtval;
   if (timeout >= maxtimeout)
     exit (1);
-  longjmp (timeoutbuf, 1);
+  siglongjmp (timeoutbuf, 1);
 }
 
 /*
@@ -537,7 +537,7 @@ send_file (struct formats *pf)
       dp->th_opcode = htons ((u_short) DATA);
       dp->th_block = htons ((u_short) block);
       timeout = 0;
-      setjmp (timeoutbuf);
+      sigsetjmp (timeoutbuf, SIGALRM);
 
     send_data:
       if (send (peer, (const char *) dp, size + 4, 0) != size + 4)
@@ -608,7 +608,7 @@ recvfile (struct formats *pf)
       ap->th_opcode = htons ((u_short) ACK);
       ap->th_block = htons ((u_short) block);
       block++;
-      setjmp (timeoutbuf);
+      sigsetjmp (timeoutbuf, SIGALRM);
     send_ack:
       if (send (peer, ackbuf, 4, 0) != 4)
        {

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=20b0ce22938f87daf7a0ff605926e13af04f3cee


commit 20b0ce22938f87daf7a0ff605926e13af04f3cee
Author: Giuseppe Scrivano <address@hidden>
Date:   Tue May 11 19:59:31 2010 +0200

    Change the test to check if the call to `asprintf' failed.

diff --git a/ChangeLog b/ChangeLog
index 7461ddb..36da17b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Giuseppe Scrivano  <address@hidden>
+
+       * src/rcp.c (main): Change the test to check if the call to
+       `asprintf' failed.
+
 2010-05-04  Giuseppe Scrivano  <address@hidden>
 
        * bootstrap: Update to the last gnulib version.
diff --git a/src/rcp.c b/src/rcp.c
index ce7e058..fa92d02 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -333,7 +333,7 @@ main (int argc, char *argv[])
                 iamrecursive ? " -r" : "", preserve_option ? " -p" : "",
                 targetshouldbedirectory ? " -d" : "");
 #endif
-  if (rc)
+  if (rc < 0)
     xalloc_die ();
 
   rem = -1;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |   13 +++++++++++++
 src/rcp.c   |    2 +-
 src/tftpd.c |    6 +++---
 3 files changed, 17 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils