From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 10/19] test: add -L support to test if it's a symbolic link
Date: Tue, 4 Sep 2012 21:50:08 +0200 [thread overview]
Message-ID: <1346788217-16042-10-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/test.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/commands/test.c b/commands/test.c
index 9ffa892..18eeaab 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -43,6 +43,7 @@ typedef enum {
OPT_DIRECTORY,
OPT_FILE,
OPT_EXISTS,
+ OPT_SYMBOLIC_LINK,
OPT_MAX,
} test_opts;
@@ -62,6 +63,7 @@ static char *test_options[] = {
[OPT_FILE] = "-f",
[OPT_DIRECTORY] = "-d",
[OPT_EXISTS] = "-e",
+ [OPT_SYMBOLIC_LINK] = "-L",
};
static int parse_opt(const char *opt)
@@ -140,9 +142,10 @@ static int do_test(int argc, char *argv[])
case OPT_FILE:
case OPT_DIRECTORY:
case OPT_EXISTS:
+ case OPT_SYMBOLIC_LINK:
adv = 2;
if (ap[1] && *ap[1] != ']' && strlen(ap[1])) {
- expr = stat(ap[1], &statbuf);
+ expr = (opt == OPT_SYMBOLIC_LINK ? lstat : stat)(ap[1], &statbuf);
if (expr < 0) {
expr = 0;
break;
@@ -160,6 +163,10 @@ static int do_test(int argc, char *argv[])
expr = 1;
break;
}
+ if (opt == OPT_SYMBOLIC_LINK && S_ISLNK(statbuf.st_mode)) {
+ expr = 1;
+ break;
+ }
}
break;
@@ -224,7 +231,7 @@ static const char *test_aliases[] = { "[", NULL};
static const __maybe_unused char cmd_test_help[] =
"Usage: test [OPTIONS]\n"
-"options: !, =, !=, -eq, -ne, -ge, -gt, -le, -lt, -o, -a, -z, -n, -d, -e, -f\n"
+"options: !, =, !=, -eq, -ne, -ge, -gt, -le, -lt, -o, -a, -z, -n, -d, -e, -f, -L\n"
"see 'man test' on your PC for more information.\n";
static const __maybe_unused char cmd_test_usage[] = "minimal test like /bin/sh";
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev 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 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-09-04 19:50 ` [PATCH 11/19] command: " 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 ` [PATCH 14/19] dirname: add -V option to return only path related to the mountpoint Jean-Christophe PLAGNIOL-VILLARD
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-10-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