1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
Index: src/copy.c
===================================================================
RCS file: /fetish/cu/src/copy.c,v
retrieving revision 1.203
diff -u -p -r1.203 copy.c
--- src/copy.c 29 Jul 2006 17:13:28 -0000 1.203
+++ src/copy.c 17 Aug 2006 09:18:52 -0000
@@ -1168,7 +1168,7 @@ copy_internal (char const *src_name, cha
return false;
}
}
-
+ {
bool backup_directories = true;
if (x->backup_type != no_backups
&& (!S_ISDIR (dst_sb.st_mode) || backup_directories))
@@ -1235,6 +1235,7 @@ copy_internal (char const *src_name, cha
}
new_dst = true;
}
+ }
}
}
Index: src/ls.c
===================================================================
RCS file: /fetish/cu/src/ls.c,v
retrieving revision 1.435
diff -u -p -r1.435 ls.c
--- src/ls.c 9 Aug 2006 09:45:17 -0000 1.435
+++ src/ls.c 17 Aug 2006 09:18:52 -0000
@@ -3139,13 +3139,14 @@ sort_files (void)
use_strcmp = true;
assert (sort_type != sort_version);
}
-
+ {
/* When sort_type == sort_time, use time_type as subindex. */
int timeoffset = sort_type == sort_time ? time_type : 0;
qsort (files, files_index, sizeof *files,
sort_functions[sort_type + timeoffset][use_strcmp][sort_reverse]
[directories_first]);
+ }
}
/* List all the files now in the table. */
Index: src/remove.c
===================================================================
RCS file: /fetish/cu/src/remove.c,v
retrieving revision 1.156
diff -u -p -r1.156 remove.c
--- src/remove.c 3 Jul 2006 17:38:20 -0000 1.156
+++ src/remove.c 17 Aug 2006 09:18:52 -0000
@@ -202,9 +202,10 @@ pop_dir (Dirstack_state *ds)
{
size_t n_lengths = obstack_object_size (&ds->len_stack) / sizeof (size_t);
size_t *length = obstack_base (&ds->len_stack);
+ size_t top_len;
assert (n_lengths > 0);
- size_t top_len = length[n_lengths - 1];
+ top_len = length[n_lengths - 1];
assert (top_len >= 2);
/* Pop the specified length of file name. */
@@ -336,10 +337,11 @@ AD_stack_top (Dirstack_state const *ds)
static void
AD_stack_pop (Dirstack_state *ds)
{
+ struct AD_ent *top;
assert (0 < AD_stack_height (ds));
/* operate on Active_dir. pop and free top entry */
- struct AD_ent *top = AD_stack_top (ds);
+ top = AD_stack_top (ds);
if (top->unremovable)
hash_free (top->unremovable);
obstack_blank (&ds->Active_dir, -(int) sizeof (struct AD_ent));
@@ -506,6 +508,7 @@ AD_mark_helper (Hash_table **ht, char *f
if (*ht == NULL)
xalloc_die ();
}
+ {
void *ent = hash_insert (*ht, filename);
if (ent == NULL)
xalloc_die ();
@@ -514,7 +517,7 @@ AD_mark_helper (Hash_table **ht, char *f
if (ent != filename)
free (filename);
}
-
+ }
}
/* Mark FILENAME (in current directory) as unremovable. */
@@ -1059,6 +1062,7 @@ fd_to_subdirp (int fd_cwd, char const *f
return NULL;
}
+ {
DIR *subdir_dirp = fdopendir (fd_sub);
if (subdir_dirp == NULL)
{
@@ -1067,6 +1071,7 @@ fd_to_subdirp (int fd_cwd, char const *f
}
return subdir_dirp;
+ }
}
/* Remove entries in the directory open on DIRP
@@ -1302,9 +1307,10 @@ remove_dir (int fd_cwd, Dirstack_state *
/* The name of the directory that we have just processed,
nominally removing all of its contents. */
char *empty_dir;
+ int fd;
AD_pop_and_chdir (&dirp, ds, &empty_dir);
- int fd = (dirp != NULL ? dirfd (dirp) : AT_FDCWD);
+ fd = (dirp != NULL ? dirfd (dirp) : AT_FDCWD);
assert (dirp != NULL || AD_stack_height (ds) == 1);
/* Try to remove EMPTY_DIR only if remove_cwd_entries succeeded. */
@@ -1381,6 +1387,7 @@ rm_1 (Dirstack_state *ds, char const *fi
AD_push_initial (ds);
AD_INIT_OTHER_MEMBERS ();
+ {
int fd_cwd = AT_FDCWD;
enum RM_status status = remove_entry (fd_cwd, ds, filename, x, NULL);
if (status == RM_NONEMPTY_DIR)
@@ -1399,6 +1406,7 @@ rm_1 (Dirstack_state *ds, char const *fi
ds_clear (ds);
return status;
+ }
}
/* Remove all files and/or directories specified by N_FILES and FILE.
@@ -1421,9 +1429,11 @@ rm (size_t n_files, char const *const *f
}
cycle_check_init (&ds->cycle_check_state);
+ {
enum RM_status s = rm_1 (ds, file[i], x, &cwd_errno);
assert (VALID_STATUS (s));
UPDATE_STATUS (status, s);
+ }
}
if (x->require_restore_cwd && cwd_errno)
Index: src/rm.c
===================================================================
RCS file: /fetish/cu/src/rm.c,v
retrieving revision 1.139
diff -u -p -r1.139 rm.c
--- src/rm.c 20 Feb 2006 12:48:11 -0000 1.139
+++ src/rm.c 17 Aug 2006 09:18:52 -0000
@@ -358,8 +358,10 @@ main (int argc, char **argv)
if (!yesno ())
exit (EXIT_SUCCESS);
}
+ {
enum RM_status status = rm (n_files, file, &x);
assert (VALID_STATUS (status));
exit (status == RM_ERROR ? EXIT_FAILURE : EXIT_SUCCESS);
+ }
}
}
|
