9
0
Fork 0

Merge branch 'for-next/basename-dirname'

This commit is contained in:
Sascha Hauer 2012-07-02 10:58:52 +02:00
commit 7242eb7605
4 changed files with 110 additions and 0 deletions

View File

@ -198,6 +198,20 @@ config CMD_AUTOMOUNT
this directory available (discover USB devices, bring network interface
up and finally mount the filesystem).
config CMD_BASENAME
tristate
prompt "basename"
help
Strip directory and suffix from filenames and store the result in a
environment variable
config CMD_DIRNAME
tristate
prompt "dirname"
help
Strip last component of file name and store the result in a
environment variable
endmenu
menu "console "

View File

@ -66,3 +66,5 @@ obj-$(CONFIG_CMD_IOMEM) += iomem.o
obj-$(CONFIG_CMD_LINUX_EXEC) += linux_exec.o
obj-$(CONFIG_CMD_AUTOMOUNT) += automount.o
obj-$(CONFIG_CMD_GLOBAL) += global.o
obj-$(CONFIG_CMD_BASENAME) += basename.o
obj-$(CONFIG_CMD_DIRNAME) += dirname.o

47
commands/basename.c Normal file
View File

@ -0,0 +1,47 @@
/*
* basename.c - strip directory and suffix from filenames
*
* Copyright (c) 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <common.h>
#include <command.h>
#include <libgen.h>
#include <environment.h>
static int do_basename(int argc, char *argv[])
{
if (argc != 3)
return COMMAND_ERROR_USAGE;
setenv(argv[2], basename(argv[1]));
return 0;
}
BAREBOX_CMD_HELP_START(basename)
BAREBOX_CMD_HELP_USAGE("basename NAME BASENAME\n")
BAREBOX_CMD_HELP_SHORT("strip NAME and store into $BASENAME\n")
BAREBOX_CMD_HELP_END
BAREBOX_CMD_START(basename)
.cmd = do_basename,
.usage = "strip directory and suffix from filenames",
BAREBOX_CMD_HELP(cmd_basename_help)
BAREBOX_CMD_END

47
commands/dirname.c Normal file
View File

@ -0,0 +1,47 @@
/*
* dirname.c - strip directory and suffix from filenames
*
* Copyright (c) 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <common.h>
#include <command.h>
#include <libgen.h>
#include <environment.h>
static int do_dirname(int argc, char *argv[])
{
if (argc != 3)
return COMMAND_ERROR_USAGE;
setenv(argv[2], dirname(argv[1]));
return 0;
}
BAREBOX_CMD_HELP_START(dirname)
BAREBOX_CMD_HELP_USAGE("dirname NAME DIRNAME\n")
BAREBOX_CMD_HELP_SHORT("strip last componext of NAME and store into $DIRNAME\n")
BAREBOX_CMD_HELP_END
BAREBOX_CMD_START(dirname)
.cmd = do_dirname,
.usage = "strip last component from file name",
BAREBOX_CMD_HELP(cmd_dirname_help)
BAREBOX_CMD_END