Magellan Linux

Contents of /trunk/shfs/patches/shfs-0.35-space_chars.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (show annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 1276 byte(s)
-import

1 --- shfs/Linux-2.4/shell.c 31 May 2004 16:32:13 -0000 1.6
2 +++ shfs/Linux-2.4/shell.c 3 Jun 2004 09:09:54 -0000
3 @@ -213,6 +213,7 @@
4 int c = 0;
5 int is_space = 1;
6 int device = 0;
7 + char *start = s;
8
9 while (*s) {
10 if (c == DIR_COLS)
11 @@ -227,17 +228,20 @@
12 s++;
13 }
14 *s = '\0';
15 + start = s+1;
16 is_space = 1;
17 + } else {
18 + if (c != DIR_NAME)
19 + start = s+1;
20 }
21 } else {
22 if (is_space) {
23 /* (b)lock/(c)haracter device hack */
24 - col[c++] = s;
25 + col[c++] = start;
26 is_space = 0;
27 if ((c-1 == DIR_PERM) && ((*s == 'b')||(*s == 'c'))) {
28 device = 1;
29 }
30 -
31 }
32 }
33 s++;
34 --- shfs/Linux-2.6/shell.c 31 May 2004 16:32:13 -0000 1.7
35 +++ shfs/Linux-2.6/shell.c 3 Jun 2004 09:09:57 -0000
36 @@ -225,6 +225,7 @@
37 int c = 0;
38 int is_space = 1;
39 int device = 0;
40 + char *start = s;
41
42 while (*s) {
43 if (c == DIR_COLS)
44 @@ -239,17 +240,20 @@
45 s++;
46 }
47 *s = '\0';
48 + start = s+1;
49 is_space = 1;
50 + } else {
51 + if (c != DIR_NAME)
52 + start = s+1;
53 }
54 } else {
55 if (is_space) {
56 /* (b)lock/(c)haracter device hack */
57 - col[c++] = s;
58 + col[c++] = start;
59 is_space = 0;
60 if ((c-1 == DIR_PERM) && ((*s == 'b')||(*s == 'c'))) {
61 device = 1;
62 }
63 -
64 }
65 }
66 s++;