[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_4-13-g7655d89

[Mats Erik Andersson]

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  7655d892c2a10adb6b1a8681253a96cf610cff46 (commit)
      from  ec8c9a31b46d325a2c1147dacd43971405e97c5d (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=7655d892c2a10adb6b1a8681253a96cf610cff46


commit 7655d892c2a10adb6b1a8681253a96cf610cff46
Author: Mats Erik Andersson <address@hidden>
Date:   Wed Aug 19 15:46:03 2015 +0200

    Function name collision on AIX systems.

diff --git a/ChangeLog b/ChangeLog
index e6e23de..6ef514f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-19  Mats Erik Andersson  <address@hidden>
+
+       AIX systems have a system call send_file().  Rename our calls.
+       * src/tftp.c (send_file): Rename to...
+       (tftp_sendfile): ... this.
+       (put): Call tftp_sendfile, not send_file.
+       * src/tftpd.c (send_file): Rename to...
+       (tftpd_sendfile): ... this.
+       (formats): List tftpd_sendfile call, not send_file.
+
 2015-08-15  Mats Erik Andersson  <address@hidden>
 
        telnetd: Premature connection closure.
diff --git a/src/tftp.c b/src/tftp.c
index 1d3c353..d0fbd6f 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -236,7 +236,7 @@ set_port (struct sockaddr_storage *ss, in_port_t port)
 }
 
 void recvfile (int, char *, char *);
-void send_file (int, char *, char *);
+void tftp_sendfile (int, char *, char *);
 
 static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
@@ -614,7 +614,7 @@ put (int argc, char *argv[])
       if (verbose)
        printf ("putting %s to %s:%s [%s]\n", cp, hostname, targ, mode);
       set_port (&peeraddr, port);
-      send_file (fd, targ, mode);
+      tftp_sendfile (fd, targ, mode);
       return;
     }
   /* this assumes the target is a directory */
@@ -634,7 +634,7 @@ put (int argc, char *argv[])
       if (verbose)
        printf ("putting %s to %s:%s [%s]\n", argv[n], hostname, targ, mode);
       set_port (&peeraddr, port);
-      send_file (fd, targ, mode);
+      tftp_sendfile (fd, targ, mode);
     }
 }
 
@@ -980,7 +980,7 @@ setverbose (int argc _GL_UNUSED_PARAMETER, char *argv[] 
_GL_UNUSED_PARAMETER)
  * Send the requested file.
  */
 void
-send_file (int fd, char *name, char *mode)
+tftp_sendfile (int fd, char *name, char *mode)
 {
   register struct tftphdr *ap; /* data and ack packets */
   struct tftphdr *r_init (void), *dp;
diff --git a/src/tftpd.c b/src/tftpd.c
index 56002a0..48d2b96 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -416,7 +416,7 @@ main (int argc, char *argv[])
 
 struct formats;
 int validate_access (char **, int);
-void send_file (struct formats *);
+void tftpd_sendfile (struct formats *);
 void recvfile (struct formats *);
 
 struct formats
@@ -428,8 +428,8 @@ struct formats
   int f_convert;
 } formats[] =
   {
-    {"netascii", validate_access, send_file, recvfile, 1},
-    {"octet", validate_access, send_file, recvfile, 0},
+    {"netascii", validate_access, tftpd_sendfile, recvfile, 1},
+    {"octet", validate_access, tftpd_sendfile, recvfile, 0},
     {0, NULL, NULL, NULL, 0}
   };
 
@@ -648,7 +648,7 @@ timer (int sig _GL_UNUSED_PARAMETER)
  * Send the requested file.
  */
 void
-send_file (struct formats *pf)
+tftpd_sendfile (struct formats *pf)
 {
   struct tftphdr *dp, *r_init (void);
   register struct tftphdr *ap; /* ack packet */

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

Summary of changes:
 ChangeLog   |   10 ++++++++++
 src/tftp.c  |    8 ++++----
 src/tftpd.c |    8 ++++----
 3 files changed, 18 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU Inetutils