mirror of
https://github.com/sheumann/hush.git
synced 2024-12-27 01:32:08 +00:00
8876fb2f59
Manuel,
I rewrite bb_getopt_ulflags() function for more universal usage.
My version support now:
- options with arguments (optional arg as GNU extension also)
- complementaly and/or incomplementaly and/or incongruously and/or list
options
- long_opt (all applets may have long option, add supporting is trivial)
This realisation full compatibile from your version.
Code size grow 480 bytes, but only coreutils/* over compensate this size
after using new function. Last patch reduced over 800 bytes and not full
applied to all. "mkdir" and "mv" applets have long_opt now for demonstrate
trivial addition support long_opt with usage new bb_getopt_ulflags().
Complementaly and/or incomplementaly and/or incongruously and/or list options
logic is not trivial, but new "cut" and "grep" applets using this logic
for examples with full demostrating. New "grep" applet reduced over 300
bytes.
Mark,
Also. I removed bug from "grep" applet.
$ echo a b | busybox grep -e a b
a b
a b
But right is printing one only.
--w
vodz
67 lines
1.8 KiB
C
67 lines
1.8 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini rm implementation for busybox
|
|
*
|
|
* Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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
|
|
*
|
|
*/
|
|
|
|
/* BB_AUDIT SUSv3 compliant */
|
|
/* http://www.opengroup.org/onlinepubs/007904975/utilities/rm.html */
|
|
|
|
/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
|
|
*
|
|
* Size reduction.
|
|
*/
|
|
|
|
#include <unistd.h>
|
|
#include "busybox.h"
|
|
|
|
extern int rm_main(int argc, char **argv)
|
|
{
|
|
int status = 0;
|
|
int flags = 0;
|
|
unsigned long opt;
|
|
|
|
bb_opt_complementaly = "f-i:i-f";
|
|
opt = bb_getopt_ulflags(argc, argv, "fiRr");
|
|
if(opt & 1)
|
|
flags |= FILEUTILS_FORCE;
|
|
if(opt & 2)
|
|
flags |= FILEUTILS_INTERACTIVE;
|
|
if(opt & 12)
|
|
flags |= FILEUTILS_RECUR;
|
|
|
|
if (*(argv += optind) != NULL) {
|
|
do {
|
|
const char *base = bb_get_last_path_component(*argv);
|
|
|
|
if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
|
|
bb_error_msg("cannot remove `.' or `..'");
|
|
} else if (remove_file(*argv, flags) >= 0) {
|
|
continue;
|
|
}
|
|
status = 1;
|
|
} while (*++argv);
|
|
} else if (!(flags & FILEUTILS_FORCE)) {
|
|
bb_show_usage();
|
|
}
|
|
|
|
return status;
|
|
}
|