mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 14/19] dirname: add -V option to return only path related to the mountpoint
Date: Tue,  4 Sep 2012 21:50:12 +0200	[thread overview]
Message-ID: <1346788217-16042-14-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1346788217-16042-1-git-send-email-plagnioj@jcrosoft.com>

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 commands/dirname.c |   24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/commands/dirname.c b/commands/dirname.c
index cf1d0a0..f34d88d 100644
--- a/commands/dirname.c
+++ b/commands/dirname.c
@@ -24,20 +24,38 @@
 #include <command.h>
 #include <libgen.h>
 #include <environment.h>
+#include <fs.h>
+#include <getopt.h>
 
 static int do_dirname(int argc, char *argv[])
 {
-	if (argc != 3)
+	int opt;
+	int path_fs = 0;
+	int len = 0;
+
+	while ((opt = getopt(argc, argv, "V")) > 0) {
+		switch (opt) {
+		case 'V':
+			path_fs = 1;
+			break;
+		}
+	}
+
+	if (argc < optind + 2)
 		return COMMAND_ERROR_USAGE;
 
-	setenv(argv[2], dirname(argv[1]));
+	if (path_fs)
+		len = strlen(get_mounted_path(argv[optind]));
+
+	setenv(argv[optind + 1], dirname(argv[optind]) + len);
 
 	return 0;
 }
 
 BAREBOX_CMD_HELP_START(dirname)
-BAREBOX_CMD_HELP_USAGE("dirname NAME DIRNAME\n")
+BAREBOX_CMD_HELP_USAGE("dirname [-V] NAME DIRNAME\n")
 BAREBOX_CMD_HELP_SHORT("strip last componext of NAME and store into $DIRNAME\n")
+BAREBOX_CMD_HELP_SHORT("-V return the path relative to the mountpoint.\n")
 BAREBOX_CMD_HELP_END
 
 BAREBOX_CMD_START(dirname)
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-09-04 19:50 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-04 19:47 [PATCH 00/18 v5] fs: add symlink and readlink support Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:49 ` [PATCH 01/19] fs: add " Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 02/19] fs: fix rmdir with symlink Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 03/19] fs: rename stat to lstat as we implement lstat Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 04/19] fs: add symlink support Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 05/19] fs: implement stat Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 06/19] fs: open: add symlink support Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 07/19] fs: introduce get_mounted_path to get the path where a file is mounted Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 08/19] ramfs: add symlink and readlink support Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 09/19] nfs: add " Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 10/19] test: add -L support to test if it's a symbolic link Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 11/19] command: add readlink support Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 12/19] command: add ln support Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 13/19] ls: add symlink support to -l Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-09-04 19:50   ` [PATCH 15/19] recursive_action: add ACTION_FOLLOWLINKS support Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 16/19] envfs: introduce version major and minor Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 17/19] envfs: add support of variable inode size Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 18/19] envfs: add support of symlink Jean-Christophe PLAGNIOL-VILLARD
2012-09-04 19:50   ` [PATCH 19/19] defautenv: " Jean-Christophe PLAGNIOL-VILLARD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1346788217-16042-14-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox