mirror of
https://github.com/sheumann/hush.git
synced 2024-12-28 22:30:05 +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
112 lines
2.8 KiB
C
112 lines
2.8 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Utility routines.
|
|
*
|
|
* Copyright (C) many different people. If you wrote this, please
|
|
* acknowledge your work.
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "libbb.h"
|
|
|
|
#define HASH_SIZE 311 /* Should be prime */
|
|
#define hash_inode(i) ((i) % HASH_SIZE)
|
|
|
|
typedef struct ino_dev_hash_bucket_struct {
|
|
struct ino_dev_hash_bucket_struct *next;
|
|
ino_t ino;
|
|
dev_t dev;
|
|
char name[1];
|
|
} ino_dev_hashtable_bucket_t;
|
|
|
|
static ino_dev_hashtable_bucket_t *ino_dev_hashtable[HASH_SIZE];
|
|
|
|
/*
|
|
* Return 1 if statbuf->st_ino && statbuf->st_dev are recorded in
|
|
* `ino_dev_hashtable', else return 0
|
|
*
|
|
* If NAME is a non-NULL pointer to a character pointer, and there is
|
|
* a match, then set *NAME to the value of the name slot in that
|
|
* bucket.
|
|
*/
|
|
int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name)
|
|
{
|
|
ino_dev_hashtable_bucket_t *bucket;
|
|
|
|
bucket = ino_dev_hashtable[hash_inode(statbuf->st_ino)];
|
|
while (bucket != NULL) {
|
|
if ((bucket->ino == statbuf->st_ino) &&
|
|
(bucket->dev == statbuf->st_dev))
|
|
{
|
|
if (name) *name = bucket->name;
|
|
return 1;
|
|
}
|
|
bucket = bucket->next;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Add statbuf to statbuf hash table */
|
|
void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
|
|
{
|
|
int i;
|
|
size_t s;
|
|
ino_dev_hashtable_bucket_t *bucket;
|
|
|
|
i = hash_inode(statbuf->st_ino);
|
|
s = name ? strlen(name) : 0;
|
|
bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s);
|
|
bucket->ino = statbuf->st_ino;
|
|
bucket->dev = statbuf->st_dev;
|
|
if (name)
|
|
strcpy(bucket->name, name);
|
|
else
|
|
bucket->name[0] = '\0';
|
|
bucket->next = ino_dev_hashtable[i];
|
|
ino_dev_hashtable[i] = bucket;
|
|
}
|
|
|
|
#ifdef CONFIG_FEATURE_CLEAN_UP
|
|
/* Clear statbuf hash table */
|
|
void reset_ino_dev_hashtable(void)
|
|
{
|
|
int i;
|
|
ino_dev_hashtable_bucket_t *bucket;
|
|
|
|
for (i = 0; i < HASH_SIZE; i++) {
|
|
while (ino_dev_hashtable[i] != NULL) {
|
|
bucket = ino_dev_hashtable[i]->next;
|
|
free(ino_dev_hashtable[i]);
|
|
ino_dev_hashtable[i] = bucket;
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
|
|
/* END CODE */
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "linux"
|
|
c-basic-offset: 4
|
|
tab-width: 4
|
|
End:
|
|
*/
|