Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7627e92
)
Changed the way the parse_chmod() function is called.
author
Wayne Davison
<wayned@samba.org>
Mon, 30 Jan 2006 17:53:13 +0000
(17:53 +0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 30 Jan 2006 17:53:13 +0000
(17:53 +0000)
chmod.c
patch
|
blob
|
blame
|
history
diff --git
a/chmod.c
b/chmod.c
index
3f9c8b4
..
8a6adfd
100644
(file)
--- a/
chmod.c
+++ b/
chmod.c
@@
-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. */
/* 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;
{
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);
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
;
}
}