1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-06 13:17:31 +02:00
openwrt-xburst/package/shfs/patches/105-space_chars.patch

67 lines
1.3 KiB
Diff
Raw Normal View History

--- shfs-0.35.orig/shfs/Linux-2.4/shell.c 31 May 2004 16:32:13 -0000 1.6
+++ shfs-0.35/shfs/Linux-2.4/shell.c 3 Jun 2004 09:09:54 -0000
@@ -213,6 +213,7 @@
int c = 0;
int is_space = 1;
int device = 0;
+ char *start = s;
while (*s) {
if (c == DIR_COLS)
@@ -227,17 +228,20 @@
s++;
}
*s = '\0';
+ start = s+1;
is_space = 1;
+ } else {
+ if (c != DIR_NAME)
+ start = s+1;
}
} else {
if (is_space) {
/* (b)lock/(c)haracter device hack */
- col[c++] = s;
+ col[c++] = start;
is_space = 0;
if ((c-1 == DIR_PERM) && ((*s == 'b')||(*s == 'c'))) {
device = 1;
}
-
}
}
s++;
--- shfs-0.35.orig/shfs/Linux-2.6/shell.c 31 May 2004 16:32:13 -0000 1.7
+++ shfs-0.35/shfs/Linux-2.6/shell.c 3 Jun 2004 09:09:57 -0000
@@ -225,6 +225,7 @@
int c = 0;
int is_space = 1;
int device = 0;
+ char *start = s;
while (*s) {
if (c == DIR_COLS)
@@ -239,17 +240,20 @@
s++;
}
*s = '\0';
+ start = s+1;
is_space = 1;
+ } else {
+ if (c != DIR_NAME)
+ start = s+1;
}
} else {
if (is_space) {
/* (b)lock/(c)haracter device hack */
- col[c++] = s;
+ col[c++] = start;
is_space = 0;
if ((c-1 == DIR_PERM) && ((*s == 'b')||(*s == 'c'))) {
device = 1;
}
-
}
}
s++;