8nl/micro-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed xargs

Browse source
This commit is contained in:
Your Name 2025-05-05 15:51:14 +03:00
parent 7462b0978c
commit 497aaec9fe
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/xargs.c
View file

@ -14,7 +14,7 @@
#define ARG_MAX 10000 #define ARG_MAX 10000
#endif #endif
static int args_main; static int args;
static int args_added; static int args_added;
static char *cmd[ARG_MAX + 1]; static char *cmd[ARG_MAX + 1];
@ -41,14 +41,14 @@ enum {
}; };
static void clear_cmd(void) { static void clear_cmd(void) {
for (int i = 0; i < args_main; i++) { for (int i = 0; i < args; i++) {
if (cmd[i] != NULL) { if (cmd[i] != NULL) {
free(cmd[i]); free(cmd[i]);
cmd[i] = NULL; cmd[i] = NULL;
} }
} }
args_main = 0; args = 0;
args_added = 0; args_added = 0;
} }
@ -57,7 +57,7 @@ static int add_arg(const char *str, size_t chars, const char flag) {
args_added++; args_added++;
int ret = NORMAL; int ret = NORMAL;
if (args_main >= ARG_MAX) if (args >= ARG_MAX)
return ERROR; return ERROR;
else if (n_flag > 0 && args_added == n_flag && I_flag == NULL) else if (n_flag > 0 && args_added == n_flag && I_flag == NULL)
@ -67,7 +67,7 @@ static int add_arg(const char *str, size_t chars, const char flag) {
ret = STOP; ret = STOP;
if (!flag && I_flag) { if (!flag && I_flag) {
for (int i = 0; i < args_main; i++) for (int i = 0; i < args; i++)
if (strstr(cmd[i], I_flag)) { if (strstr(cmd[i], I_flag)) {
char *ptr = NULL; char *ptr = NULL;
CONTINUE: CONTINUE:
@ -86,8 +86,8 @@ CONTINUE:
return STOP; return STOP;
} }
cmd[args_main] = strdup(str); cmd[args] = strdup(str);
args_main++; args++;
return ret; return ret;
} }
@ -200,7 +200,7 @@ static int xargs(void) {
static int spawn(void) { static int spawn(void) {
if (t_flag) { if (t_flag) {
for (int i = 0; i < args_main; i++) for (int i = 0; i < args; i++)
fprintf(stderr, "%s ", cmd[i]); fprintf(stderr, "%s ", cmd[i]);
fputc('\n', stderr); fputc('\n', stderr);
@ -306,7 +306,7 @@ int main(int argc, char **argv) {
ret = 1; ret = 1;
/* Check NULL */ /* Check NULL */
for (int i = 0; i < args_main; i++) { for (int i = 0; i < args; i++) {
if (cmd[i] == NULL) { if (cmd[i] == NULL) {
fprintf(stderr, "xargs: strdup failed\n"); fprintf(stderr, "xargs: strdup failed\n");
clear_cmd(); clear_cmd();
@ -317,10 +317,10 @@ int main(int argc, char **argv) {
} }
/* Run */ /* Run */
if (stdin_stat == NORMAL) if (stdin_stat == NORMAL || stdin_stat == CEOF)
ret = spawn(); ret = spawn();
else if (stdin_stat == R_FLAG && !r_flag) else if (stdin_stat == R_FLAG && !r_flag && I_flag == NULL)
ret = spawn(); ret = spawn();
clear_cmd(); clear_cmd();