Changed the way the parse_chmod() function is called.

This commit is contained in:
Wayne Davison
2006-01-30 17:53:13 +00:00
parent 7627e92c54
commit 81b096feef

18
chmod.c
View File

@@ -23,8 +23,7 @@ struct chmod_mode_struct {
/* Parse a chmod-style argument, and break it down into one or more AND/OR
* pairs in a linked list. We use a state machine to walk through the
* options. */
struct chmod_mode_struct *parse_chmod(const char *modestr,
struct chmod_mode_struct *append_to)
int parse_chmod(const char *modestr, struct chmod_mode_struct **root_mode_ptr)
{
int state = STATE_1ST_HALF;
int where = 0, what = 0, op = 0, topbits = 0, topoct = 0, flags = 0;
@@ -154,17 +153,18 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
if (state == STATE_ERROR) {
free_chmod_mode(first_mode);
return NULL;
return 0;
}
if (append_to) {
for (prev_mode = append_to; prev_mode->next; )
prev_mode = prev_mode->next;
prev_mode->next = first_mode;
return append_to;
if (!(curr_mode = *root_mode_ptr))
*root_mode_ptr = first_mode;
else {
while (curr_mode->next)
curr_mode = curr_mode->next;
curr_mode->next = first_mode;
}
return first_mode;
return 1;
}