mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: BAREBOX <barebox@lists.infradead.org>
Subject: [PATCH 8/9] commands: ln: accept -s option
Date: Tue, 20 Oct 2026 09:09:33 +0200	[thread overview]
Message-ID: <20261020-fs-symlink-fixes-v1-8-e7ac8c29b08a@pengutronix.de> (raw)
In-Reply-To: <20261020-fs-symlink-fixes-v1-0-e7ac8c29b08a@pengutronix.de>

All links barebox creates are symbolic links, but ln does not accept
the -s option, so the common 'ln -s SRC DEST' fails with a usage error.
Accept -s and ignore it, so that users and scripts can use the familiar
syntax.

While at it, add a help text for the command.

Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/ln.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/commands/ln.c b/commands/ln.c
index 9206480300..c907b306c9 100644
--- a/commands/ln.c
+++ b/commands/ln.c
@@ -9,22 +9,46 @@
 #include <environment.h>
 #include <fs.h>
 #include <errno.h>
+#include <getopt.h>
 
 static int do_ln(int argc, char *argv[])
 {
-	if (argc != 3)
+	int opt;
+
+	while ((opt = getopt(argc, argv, "s")) > 0) {
+		switch (opt) {
+		case 's':
+			/* all links are symbolic, accept -s for compatibility */
+			break;
+		default:
+			return COMMAND_ERROR_USAGE;
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 2)
 		return COMMAND_ERROR_USAGE;
 
-	if (symlink(argv[1], argv[2]) < 0) {
+	if (symlink(argv[0], argv[1]) < 0) {
 		perror("ln");
 		return 1;
 	}
 	return 0;
 }
 
+BAREBOX_CMD_HELP_START(ln)
+BAREBOX_CMD_HELP_TEXT("Create a symbolic link DEST pointing to SRC.")
+BAREBOX_CMD_HELP_TEXT("")
+BAREBOX_CMD_HELP_TEXT("Options:")
+BAREBOX_CMD_HELP_OPT("-s", "ignored, all links are symbolic links")
+BAREBOX_CMD_HELP_END
+
 BAREBOX_CMD_START(ln)
 	.cmd		= do_ln,
 	BAREBOX_CMD_DESC("create symlink (make a new name for a file)")
-	BAREBOX_CMD_OPTS("SRC DEST")
+	BAREBOX_CMD_OPTS("[-s] SRC DEST")
 	BAREBOX_CMD_GROUP(CMD_GRP_FILE)
+	BAREBOX_CMD_HELP(cmd_ln_help)
 BAREBOX_CMD_END

-- 
2.47.3




  parent reply	other threads:[~2026-10-20  7:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-20  7:09 [PATCH 0/9] symlink fixes and improvements Sascha Hauer
2026-10-20  7:09 ` [PATCH 1/9] fs: ramfs: report symlink target length as st_size Sascha Hauer
2026-10-20  7:09 ` [PATCH 2/9] fs: qemu_fw_cfg: " Sascha Hauer
2026-10-20  7:09 ` [PATCH 3/9] fs: ramfs: create symlinks with mode 0777 Sascha Hauer
2026-10-20  7:09 ` [PATCH 4/9] fs: follow absolute symlinks from the root directory Sascha Hauer
2026-10-20  7:09 ` [PATCH 5/9] fs: allow trailing symlinks pointing to " Sascha Hauer
2026-10-20  7:09 ` [PATCH 6/9] fs: symlink: drop references taken by filename_create() Sascha Hauer
2026-10-20  7:09 ` [PATCH 7/9] test: self: dirfd: add tests for absolute symlinks Sascha Hauer
2026-10-20  7:09 ` Sascha Hauer [this message]
2026-10-20  7:09 ` [PATCH 9/9] commands: ln: create link inside DEST if it is a directory Sascha Hauer

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=20261020-fs-symlink-fixes-v1-8-e7ac8c29b08a@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --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