---
bin/mkcp.c | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/bin/mkcp.c b/bin/mkcp.c
index 716b809..d2f45e9 100644
--- a/bin/mkcp.c
+++ b/bin/mkcp.c
@@ -28,6 +28,14 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif /* HAVE_SYS_TYPES_H */
+
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif /* HAVE_SYS_STAT_H */
+
#include <stdio.h>
#if HAVE_STDLIB_H
@@ -68,15 +76,17 @@ const static struct option long_option[] = {
int main(int argc, char *argv[])
{
struct nilfs *nilfs;
+ struct stat statbuf;
nilfs_cno_t cno;
- char *dev, *progname;
- int ss, c, status;
+ char *dev, *dir, *pathname, *progname;
+ int ss, c, status, ret;
#ifdef _GNU_SOURCE
int option_index;
#endif /* _GNU_SOURCE */
ss = 0;
opterr = 0;
+ dev = dir = NULL;
if ((progname = strrchr(argv[0], '/')) == NULL)
progname = argv[0];
else
@@ -111,13 +121,25 @@ int main(int argc, char *argv[])
fprintf(stderr, "%s: too many arguments\n", progname);
exit(1);
} else if (optind > argc - 1)
- dev = NULL;
+ pathname = NULL;
else
- dev = argv[optind];
-
- nilfs = nilfs_open(dev, NULL, NILFS_OPEN_RDWR);
+ pathname = argv[optind];
+
+ if (pathname) {
+ ret = stat(pathname, &statbuf);
+ if (ret == -1) {
+ fprintf(stderr, "%s: cannot open %s: %s\n",
+ progname, pathname, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ if (S_ISDIR(statbuf.st_mode))
+ dir = pathname;
+ else
+ dev = pathname;
+ }
+ nilfs = nilfs_open(dev, dir, NILFS_OPEN_RDWR);
if (nilfs == NULL) {
- fprintf(stderr, "%s: %s: cannot open NILFS\n", progname, dev);
+ fprintf(stderr, "%s: %s: cannot open NILFS\n", progname, pathname);
exit(1);
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
