[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-207-g4a11f3a

[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  4a11f3a095f23a28b7ab2ee3f81fdfc6d2bf5fd5 (commit)
      from  1f40280ae3dd4096daa3ad86044bb65ac8a21194 (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=4a11f3a095f23a28b7ab2ee3f81fdfc6d2bf5fd5


commit 4a11f3a095f23a28b7ab2ee3f81fdfc6d2bf5fd5
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Dec 30 10:58:18 2011 +0100

    ftp,ftpd,rcp: Portable format string for long long.

diff --git a/ChangeLog b/ChangeLog
index db6610a..2b0c970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-30  Mats Erik Andersson <address@hidden>
+
+       * ftp/cmds.c (restart): Use `%lld' as format for long long int.
+       * ftpd/ftpcmd.y (rcmd,sizecmd): Likewise; also `%llu'.
+       * ftpd/ftpd.c (off_to_str): Likewise.
+       * src/rcp.c (source): Likewise.
+
 2011-12-25  Alfred M. Szmidt  <address@hidden>
 
        * libtelnet/encrypt.c: Fix indentation, and Use ANSI style
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 9ecb408..260cfd0 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -2364,7 +2364,7 @@ restart (int argc, char **argv)
     {
       restart_point = atol (argv[1]);
       printf ((sizeof (restart_point) > sizeof (long)
-              ? "restarting at %qd. %s\n"
+              ? "restarting at %lld. %s\n"
               : "restarting at %ld. %s\n"), restart_point,
              "execute get, put or append to initiate transfer");
     }
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index ecb392c..a9cce3a 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -582,7 +582,7 @@ rcmd
                        restart_point = $3;     /* XXX $3 is only "int" */
                        reply(350,
                              (sizeof(restart_point) > sizeof(long)
-                              ? "Restarting at %qd. %s"
+                              ? "Restarting at %lld. %s"
                               : "Restarting at %ld. %s"), restart_point,
                            "Send STORE or RETRIEVE to initiate transfer.");
                }
@@ -1276,7 +1276,7 @@ sizecmd(char *filename)
                else
                        reply(213,
                              (sizeof (stbuf.st_size) > sizeof(long)
-                              ? "%qu" : "%lu"), stbuf.st_size);
+                              ? "%llu" : "%lu"), stbuf.st_size);
                break; }
        case TYPE_A: {
                FILE *fin;
@@ -1302,7 +1302,7 @@ sizecmd(char *filename)
                }
                 fclose(fin);
 
-               reply(213, sizeof(count) > sizeof(long) ? "%qd" : "%ld",
+               reply(213, sizeof(count) > sizeof(long) ? "%lld" : "%ld",
                      count);
                break; }
        default:
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index e4e7b2b..0cce865 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -182,7 +182,7 @@ off_to_str (off_t off)
     next_buf = bufs;
 
   if (sizeof (off) > sizeof (long))
-    sprintf (*next_buf, "%qd", (long long int) off);
+    sprintf (*next_buf, "%lld", (long long int) off);
   else if (sizeof (off) == sizeof (long))
     sprintf (*next_buf, "%ld", off);
   else
diff --git a/src/rcp.c b/src/rcp.c
index b4801b4..3d54fc6 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -588,7 +588,7 @@ source (int argc, char *argv[])
 #define RCP_MODEMASK   (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)
       snprintf (buf, sizeof buf,
                (sizeof (stb.st_size) > sizeof (long)
-                ? "C%04o %qd %s\n"
+                ? "C%04o %lld %s\n"
                 : "C%04o %ld %s\n"),
                stb.st_mode & RCP_MODEMASK, stb.st_size, last);
       write (rem, buf, strlen (buf));

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

Summary of changes:
 ChangeLog     |    7 +++++++
 ftp/cmds.c    |    2 +-
 ftpd/ftpcmd.y |    6 +++---
 ftpd/ftpd.c   |    2 +-
 src/rcp.c     |    2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils