Attachment #46057 for bug #70813

View | Details | Raw Unified | Return to bug 70813
Collapse All | Expand All

Lines 126-133 Link Here

(-)ls/ls.c Sun Aug 22 00:52:15 2004 (-1 / +20 lines)
126	int f_sectime; /* print the real time for all files */	126	int f_sectime; /* print the real time for all files */
127	static int f_singlecol; /* use single column output */	127	static int f_singlecol; /* use single column output */
128	int f_size; /* list size in short listing */	128	int f_size; /* list size in short listing */
		129	int f_sgroup; /* Show group on output */
129	int f_slash; /* similar to f_type, but only for dirs */	130	int f_slash; /* similar to f_type, but only for dirs */
130	int f_sortacross; /* sort across rows, not down columns */	131	int f_sortacross; /* sort across rows, not down columns */
		132	int f_sowner; /* Show owner in output */
131	int f_statustime; /* use time of last mode change */	133	int f_statustime; /* use time of last mode change */
132	static int f_stream; /* stream the output, separate with commas */	134	static int f_stream; /* stream the output, separate with commas */
133	static int f_timesort; /* sort by time vice name */	135	static int f_timesort; /* sort by time vice name */
Lines 208-213 Link Here
208	f_singlecol = 0;	210	f_singlecol = 0;
209	f_stream = 0;	211	f_stream = 0;
210	break;	212	break;
		213	case 'O':
		214	f_flags = 1;
		215	break;
211	case 'x':	216	case 'x':
212	f_sortacross = 1;	217	f_sortacross = 1;
213	f_longform = 0;	218	f_longform = 0;
Lines 259-264 Link Here
259	f_nosort = 1;	264	f_nosort = 1;
260	break;	265	break;
261	case 'g': /* Compatibility with 4.3BSD. */	266	case 'g': /* Compatibility with 4.3BSD. */
		267	#ifndef COMPAT_43
		268	f_longform = 1;
		269	f_singlecol = 0;
		270	f_stream = 0;
		271	f_sowner = 1;
		272	#else
		273	f_sowner = 0;
		274	#endif
262	break;	275	break;
263	case 'h':	276	case 'h':
264	f_humanval = 1;	277	f_humanval = 1;
Lines 277-285 Link Here
277	break;	290	break;
278	case 'n':	291	case 'n':
279	f_numericonly = 1;	292	f_numericonly = 1;
		293	f_longform = 1;
		294	f_singlecol = 0;
		295	f_stream = 0;
280	break;	296	break;
281	case 'o':	297	case 'o':
282	f_flags = 1;	298	f_longform = 1;
		299	f_singlecol = 0;
		300	f_stream = 0;
		301	f_sgroup = 1;
283	break;	302	break;
284	case 'p':	303	case 'p':
285	f_slash = 1;	304	f_slash = 1;

Lines 53-60 Link Here

(-)ls/ls.h Sun Aug 22 00:52:15 2004 (+2 lines)
53	extern int f_nonprint; /* show unprintables as ? */	53	extern int f_nonprint; /* show unprintables as ? */
54	extern int f_sectime; /* print the real time for all files */	54	extern int f_sectime; /* print the real time for all files */
55	extern int f_size; /* list size in short listing */	55	extern int f_size; /* list size in short listing */
		56	extern int f_sgroup; /* Show group on output */
56	extern int f_slash; /* append a '/' if the file is a directory */	57	extern int f_slash; /* append a '/' if the file is a directory */
57	extern int f_sortacross; /* sort across rows, not down columns */	58	extern int f_sortacross; /* sort across rows, not down columns */
		59	extern int f_sowner; /* Show owner on output */
58	extern int f_statustime; /* use time of last mode change */	60	extern int f_statustime; /* use time of last mode change */
59	extern int f_notabs; /* don't use tab-separated multi-col output */	61	extern int f_notabs; /* don't use tab-separated multi-col output */
60	extern int f_type; /* add type character for non-regular files */	62	extern int f_type; /* add type character for non-regular files */

Lines 191-199 Link Here

(-)ls/print.c Sun Aug 22 00:52:15 2004 (-3 / +5 lines)
191	prevdev = sp->st_dev;	191	prevdev = sp->st_dev;
192	}	192	}
193	np = p->fts_pointer;	193	np = p->fts_pointer;
194	(void)printf("%s %u %-s %-*s ", buf, dp->s_nlink,	194	(void)printf("%s %u ", buf, dp->s_nlink);
195	sp->st_nlink, dp->s_user, np->user, dp->s_group,	195	if(!f_sowner)
196	np->group);	196	(void)printf("%-*s ", dp->s_user, np->user);
		197	if(!f_sgroup)
		198	(void)printf("%-*s ", dp->s_group, np->group);
197	if (f_flags)	199	if (f_flags)
198	(void)printf("%-*s ", dp->s_flags, np->flags);	200	(void)printf("%-*s ", dp->s_flags, np->flags);
199	if (f_label)	201	if (f_label)

Return to bug 70813