Attachment #37379 for bug #60270




	int c = 0;
	int is_space = 1;
	int device = 0;
	char *start = s;

	while (*s) {
		if (c == DIR_COLS)

						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++] = start;
				is_space = 0;
				if ((c-1 == DIR_PERM) && ((*s == 'b')||(*s == 'c'))) {
					device = 1;
				}

			}
		}
		s++;




	int c = 0;
	int is_space = 1;
	int device = 0;
	char *start = s;

	while (*s) {
		if (c == DIR_COLS)

						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++] = start;
				is_space = 0;
				if ((c-1 == DIR_PERM) && ((*s == 'b')||(*s == 'c'))) {
					device = 1;
				}

			}
		}
		s++;

Return to bug 60270

Lines 213-218 Link Here

(-)shfs/Linux-2.4/shell.c (-2 / +6 lines)
213	int c = 0;	213	int c = 0;
214	int is_space = 1;	214	int is_space = 1;
215	int device = 0;	215	int device = 0;
		216	char *start = s;
216		217
217	while (*s) {	218	while (*s) {
218	if (c == DIR_COLS)	219	if (c == DIR_COLS)
Lines 227-243 Link Here
227	s++;	228	s++;
228	}	229	}
229	*s = '\0';	230	*s = '\0';
		231	start = s+1;
230	is_space = 1;	232	is_space = 1;
		233	} else {
		234	if (c != DIR_NAME)
		235	start = s+1;
231	}	236	}
232	} else {	237	} else {
233	if (is_space) {	238	if (is_space) {
234	/* (b)lock/(c)haracter device hack */	239	/* (b)lock/(c)haracter device hack */
235	col[c++] = s;	240	col[c++] = start;
236	is_space = 0;	241	is_space = 0;
237	if ((c-1 == DIR_PERM) && ((s == 'b')\|\|(s == 'c'))) {	242	if ((c-1 == DIR_PERM) && ((s == 'b')\|\|(s == 'c'))) {
238	device = 1;	243	device = 1;
239	}	244	}
240
241	}	245	}
242	}	246	}
243	s++;	247	s++;

Lines 225-230 Link Here

(-)shfs/Linux-2.6/shell.c (-2 / +6 lines)
225	int c = 0;	225	int c = 0;
226	int is_space = 1;	226	int is_space = 1;
227	int device = 0;	227	int device = 0;
		228	char *start = s;
228		229
229	while (*s) {	230	while (*s) {
230	if (c == DIR_COLS)	231	if (c == DIR_COLS)
Lines 239-255 Link Here
239	s++;	240	s++;
240	}	241	}
241	*s = '\0';	242	*s = '\0';
		243	start = s+1;
242	is_space = 1;	244	is_space = 1;
		245	} else {
		246	if (c != DIR_NAME)
		247	start = s+1;
243	}	248	}
244	} else {	249	} else {
245	if (is_space) {	250	if (is_space) {
246	/* (b)lock/(c)haracter device hack */	251	/* (b)lock/(c)haracter device hack */
247	col[c++] = s;	252	col[c++] = start;
248	is_space = 0;	253	is_space = 0;
249	if ((c-1 == DIR_PERM) && ((s == 'b')\|\|(s == 'c'))) {	254	if ((c-1 == DIR_PERM) && ((s == 'b')\|\|(s == 'c'))) {
250	device = 1;	255	device = 1;
251	}	256	}
252
253	}	257	}
254	}	258	}
255	s++;	259	s++;