xfs_io: implement 'utimes' command

Add the utimes command to provide a way to utilize
the futimens C library call. This is the
interface to the utimensat system call, which updates
the mtime and atime of a file.

[ sandeen: minor merge fixups, re-alphabetization ]

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/input.h b/include/input.h
index d02170f47cfb0026eca4375a35710ca308bbb84e..221678e055ef43a40e0f0ba990a720aadd0cd131 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -48,6 +48,7 @@ extern uid_t  uid_from_string(char *user);
 extern gid_t   gid_from_string(char *group);
 extern prid_t  prid_from_string(char *project);
 extern bool    isdigits_only(const char *str);
+extern int     timespec_from_string(const char *sec, const char *nsec, struct timespec *ts);
 
 #define HAVE_FTW_H 1   /* TODO: configure me */
 

diff --git a/io/Makefile b/io/Makefile
index 89cca661798eeda52727fab721563d237242a6f4..32df568d741bde809f475731358b2f4e49851d76 100644 (file)
--- a/io/Makefile
+++ b/io/Makefile
@@ -9,9 +9,9 @@ LTCOMMAND = xfs_io
 LSRCFILES = xfs_bmap.sh xfs_freeze.sh xfs_mkfile.sh
 HFILES = init.h io.h
 CFILES = init.c \
-       attr.c bmap.c encrypt.c file.c freeze.c fsync.c getrusage.c imap.c   \
-       link.c mmap.c open.c parent.c pread.c prealloc.c pwrite.c seek.c     \
-       shutdown.c sync.c truncate.c reflink.c cowextsize.c
+       attr.c bmap.c cowextsize.c encrypt.c file.c freeze.c fsync.c \
+       getrusage.c imap.c link.c mmap.c open.c parent.c pread.c prealloc.c \
+       pwrite.c reflink.c seek.c shutdown.c sync.c truncate.c utimes.c
 
 LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBPTHREAD)
 LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE)

diff --git a/io/init.c b/io/init.c
index 61b0d698b8e0ba346bab889fa407e3baf0162d78..06002e6c1c01c8c973c06455eb9e81b3d93a5839 100644 (file)
--- a/io/init.c
+++ b/io/init.c
@@ -59,8 +59,10 @@ init_commands(void)
        attr_init();
        bmap_init();
        copy_range_init();
+       cowextsize_init();
        encrypt_init();
        fadvise_init();
+       fiemap_init();
        file_init();
        flink_init();
        freeze_init();
@@ -69,7 +71,6 @@ init_commands(void)
        help_init();
        imap_init();
        inject_init();
-       seek_init();
        madvise_init();
        mincore_init();
        mmap_init();
@@ -77,18 +78,18 @@ init_commands(void)
        parent_init();
        pread_init();
        prealloc_init();
-       fiemap_init();
        pwrite_init();
        quit_init();
        readdir_init();
+       reflink_init();
        resblks_init();
+       seek_init();
        sendfile_init();
        shutdown_init();
        sync_init();
        sync_range_init();
        truncate_init();
-       reflink_init();
-       cowextsize_init();
+       utimes_init();
 }
 
 /*

diff --git a/io/io.h b/io/io.h
index d257daafde6e5dd9f050b6f4745ca5e82d23d5d4..c40aad069b0e645e9e69274748220841cbb6dcb8 100644 (file)
--- a/io/io.h
+++ b/io/io.h
@@ -114,6 +114,7 @@ extern void         seek_init(void);
 extern void            shutdown_init(void);
 extern void            sync_init(void);
 extern void            truncate_init(void);
+extern void            utimes_init(void);
 
 #ifdef HAVE_FADVISE
 extern void            fadvise_init(void);

diff --git a/io/utimes.c b/io/utimes.c
new file mode 100755 (executable)
index 0000000..faf9b8d
--- /dev/null
+++ b/io/utimes.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 Deepa Dinamani
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it would 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 the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "command.h"
+#include "input.h"
+#include "init.h"
+#include "io.h"
+
+static cmdinfo_t utimes_cmd;
+
+static void
+utimes_help(void)
+{
+       printf(_(
+"\n"
+" Update file atime and mtime of the current file with nansecond precision.\n"
+"\n"
+" Usage: utimes atime_sec atime_nsec mtime_sec mtime_nsec.\n"
+" *_sec: Seconds elapsed since 1970-01-01 00:00:00 UTC.\n"
+" *_nsec: Nanoseconds since the corresponding *_sec.\n"
+"\n"));
+}
+
+static int
+utimes_f(
+       int             argc,
+       char            **argv)
+{
+       struct timespec t[2];
+       int result;
+
+       /* Get the timestamps */
+       result = timespec_from_string(argv[1], argv[2], &t[0]);
+       if (result) {
+               fprintf(stderr, "Bad value for atime\n");
+               return 0;
+       }
+       result = timespec_from_string(argv[3], argv[4], &t[1]);
+       if (result) {
+               fprintf(stderr, "Bad value for mtime\n");
+               return 0;
+       }
+
+       /* Call futimens to update time. */
+       if (futimens(file->fd, t)) {
+               perror("futimens");
+               return 0;
+       }
+
+       return 0;
+}
+
+void
+utimes_init(void)
+{
+       utimes_cmd.name = "utimes";
+       utimes_cmd.cfunc = utimes_f;
+       utimes_cmd.argmin = 4;
+       utimes_cmd.argmax = 4;
+       utimes_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK;
+       utimes_cmd.args = _("atime_sec atime_nsec mtime_sec mtime_nsec");
+       utimes_cmd.oneline = _("Update file times of the current file");
+       utimes_cmd.help = utimes_help;
+
+       add_command(&utimes_cmd);
+}

diff --git a/libxcmd/input.c b/libxcmd/input.c
index 5a7dce353943986040420d6b0d9f7abf31395b87..8aeb3b022ce365f1519a33546c2fff033c373d8a 100644 (file)
--- a/libxcmd/input.c
+++ b/libxcmd/input.c
@@ -326,6 +326,28 @@ timestr(
        }
 }
 
+/*
+ * Convert from a pair of arbitrary user strings into a timespec.
+ */
+
+int
+timespec_from_string(
+       const char      * secs,
+       const char      * nsecs,
+       struct timespec * ts)
+{
+       char* p;
+       if (!secs || !nsecs || !ts)
+               return 1;
+       ts->tv_sec = strtoull(secs, &p, 0);
+       if (*p)
+               return 1;
+       ts->tv_nsec = strtoull(nsecs, &p, 0);
+       if (*p)
+               return 1;
+       return 0;
+}
+
 /*
  * Convert from arbitrary user strings into a numeric ID.
  * If it's all numeric, we convert that inplace, else we do

diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8
index 2c3ea9d4f5b03e3d4662211a627e8c44ba3fb361..024f7125d37fab4811731649de73a71d7a3563d1 100644 (file)
--- a/man/man8/xfs_io.8
+++ b/man/man8/xfs_io.8
@@ -640,6 +640,16 @@ Copy data into the open file beginning at
 Copy up to
 .I length
 bytes of data.
+.RE
+.PD
+.TP
+.BI utimes " atime_sec atime_nsec mtime_sec mtime_nsec"
+The utimes command changes the atime and mtime of the current file.
+sec uses UNIX timestamp notation and is the seconds elapsed since
+1970-01-01 00:00:00 UTC.
+nsec is the nanoseconds since the sec. This value needs to be in
+the range 0-999999999 with UTIME_NOW and UTIME_OMIT being exceptions.
+Each (sec, nsec) pair constitutes a single timestamp value.
 
 .SH MEMORY MAPPED I/O COMMANDS
 .TP
@@ -953,6 +963,7 @@ current file.
 .BR fstatfs (2),
 .BR fsync (2),
 .BR ftruncate (2),
+.BR futimens (3),
 .BR mmap (2),
 .BR msync (2),
 .BR open (2),