mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ps/test-chmtime-get'

Browse Source 
Test cleanup.

* ps/test-chmtime-get:
  t/helper: 'test-chmtime (--get|-g)' to print only the mtime
This commit is contained in:
Junio C Hamano
2018-04-25 13:29:00 +09:00
parent 3d5a179ec0 decf711fc1
commit deb9845a0a
10 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
t/helper/test-chmtime.c
View File

@ -18,20 +18,30 @@
*
* Examples:
*
* To just print the mtime use --verbose and set the file mtime offset to 0:
* To print the mtime and the file name use --verbose and set
* the file mtime offset to 0:
*
* test-tool chmtime -v +0 file
*
* To print only the mtime use --get:
*
* test-tool chmtime --get file
*
* To set the mtime to current time:
*
* test-tool chmtime =+0 file
*
* To set the file mtime offset to +1 and print the new value:
*
* test-tool chmtime --get +1 file
*
*/
#include "test-tool.h"
#include "git-compat-util.h"
#include <utime.h>
static const char usage_str[] = "-v|--verbose (+|=|=+|=-|-)<seconds> <file>...";
static const char usage_str[] =
"(-v|--verbose|-g|--get) (+|=|=+|=-|-)<seconds> <file>...";
static int timespec_arg(const char *arg, long int *set_time, int *set_eq)
{
@ -47,7 +57,6 @@ static int timespec_arg(const char *arg, long int *set_time, int *set_eq)
}
*set_time = strtol(timespec, &test, 10);
if (*test) {
fprintf(stderr, "Not a base-10 integer: %s\n", arg + 1);
return 0;
}
if ((*set_eq && *set_time < 0) || *set_eq == 2) {
@ -60,6 +69,7 @@ static int timespec_arg(const char *arg, long int *set_time, int *set_eq)
int cmd__chmtime(int argc, const char **argv)
{
static int verbose;
static int get;
int i = 1;
/* no mtime change by default */
@ -69,18 +79,34 @@ int cmd__chmtime(int argc, const char **argv)
if (argc < 3)
goto usage;
if (strcmp(argv[i], "--verbose") == 0 || strcmp(argv[i], "-v") == 0) {
if (strcmp(argv[i], "--get") == 0 || strcmp(argv[i], "-g") == 0) {
get = 1;
++i;
} else if (strcmp(argv[i], "--verbose") == 0 || strcmp(argv[i], "-v") == 0) {
verbose = 1;
++i;
}
if (timespec_arg(argv[i], &set_time, &set_eq))
if (i == argc) {
goto usage;
}
if (timespec_arg(argv[i], &set_time, &set_eq)) {
++i;
else
} else {
if (get == 0) {
fprintf(stderr, "Not a base-10 integer: %s\n", argv[i] + 1);
goto usage;
}
}
if (i == argc)
goto usage;
for (; i < argc; i++) {
struct stat sb;
struct utimbuf utb;
uintmax_t mtime;
if (stat(argv[i], &sb) < 0) {
fprintf(stderr, "Failed to stat %s: %s\n",
@ -100,8 +126,10 @@ int cmd__chmtime(int argc, const char **argv)
utb.actime = sb.st_atime;
utb.modtime = set_eq ? set_time : sb.st_mtime + set_time;
if (verbose) {
uintmax_t mtime = utb.modtime < 0 ? 0: utb.modtime;
mtime = utb.modtime < 0 ? 0: utb.modtime;
if (get) {
printf("%"PRIuMAX"\n", mtime);
} else if (verbose) {
printf("%"PRIuMAX"\t%s\n", mtime, argv[i]);
}