head 1.5; access; symbols OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_HEAD:1.2; locks; strict; comment @# @; 1.5 date 2008.06.07.18.50.56; author rse; state Exp; branches; next 1.4; commitid is6CNwTZzMdD336t; 1.4 date 2008.06.04.20.27.24; author rse; state Exp; branches; next 1.3; commitid pkcjZMASh3PIGF5t; 1.3 date 2007.01.10.18.44.25; author rse; state Exp; branches; next 1.2; commitid yvhQp4ZZ8t8LxZ1s; 1.2 date 2006.10.27.18.21.32; author rse; state Exp; branches; next 1.1; commitid kDRdg67VFQfnPlSr; 1.1 date 2006.10.27.18.18.58; author rse; state Exp; branches; next ; commitid 8hjoPRorZi5vOlSr; desc @@ 1.5 log @upgrading package: tree 1.5.1.2 -> 1.5.2 @ text @Index: man/tree.1 --- man/tree.1.orig 2008-06-04 17:35:31 +0200 +++ man/tree.1 2008-06-07 20:49:03 +0200 @@@@ -25,8 +25,8 @@@@ .br .SH DESCRIPTION \fITree\fP is a recursive directory listing program that produces a depth -indented listing of files, which is colorized ala \fIdircolors\fP if the \fBLS_COLORS\fP -environment variable is set and output is to tty. With no arguments, +indented listing of files. Color is supported ala \fIdircolors\fP if the \fBLS_COLORS\fP +environment variable is set, output is to a tty, and the \fB-C\fP flag is used. With no arguments, \fItree\fP lists the files in the current directory. When directory arguments are given, \fItree\fP lists all the files and/or directories found in the given directories each in turn. Upon completion of listing all @@@@ -149,11 +149,7 @@@@ .PP .TP .B -N -Print non-printable characters as is instead of the default carrot notation. -.PP -.TP -.B -v -Sort the output by version. +Print non-printable characters as is instead of the default caret notation. .PP .TP .B -r Index: tree.c --- tree.c.orig 2008-06-04 21:45:46 +0200 +++ tree.c 2008-06-07 20:49:20 +0200 @@@@ -33,6 +33,12 @@@@ #include #include #include + +#if !defined(LINUX_BIGFILE) && defined(__linux__) +# define stat64 stat +# define lstat64 lstat +#endif + #ifdef __EMX__ /* for OS/2 systems */ # define INCL_DOSFILEMGR # define INCL_DOSNLS @@@@ -143,7 +149,6 @@@@ /* Function prototypes: */ int color(u_short, char *, char, char), cmd(char *), patmatch(char *, char *); int alnumsort(struct _info **, struct _info **); -int versort(struct _info **a, struct _info **b); int reversealnumsort(struct _info **, struct _info **); int timesort(struct _info **, struct _info **); int dirsfirstsort(struct _info **, struct _info **); @@@@ -200,7 +205,8 @@@@ q = p = dtotal = ftotal = 0; aflag = dflag = fflag = lflag = pflag = sflag = Fflag = uflag = gflag = FALSE; Dflag = qflag = Nflag = Hflag = Rflag = hflag = FALSE; - noindent = force_color = nocolor = xdev = noreport = nolinks = FALSE; + noindent = force_color = xdev = noreport = nolinks = FALSE; + nocolor = TRUE; inodeflag = devflag = FALSE; flimit = 0; dirs = xmalloc(sizeof(int) * (maxdirs=4096)); @@@@ -296,9 +302,6 @@@@ case 'r': cmpfunc = reversealnumsort; break; - case 'v': - cmpfunc = versort; - break; case 'H': Hflag = TRUE; if (argv[n] == NULL) { @@@@ -658,7 +661,7 @@@@ #ifdef __USE_FILE_OFFSET64 if (inodeflag) sprintf(path," %7lld",(*dir)->inode); #else - if (inodeflag) sprintf(path," %7ld",(*dir)->inode); + if (inodeflag) sprintf(path," %7ld", (long int)((*dir)->inode)); #endif if (devflag) sprintf(path+strlen(path), " %3d", (int)(*dir)->dev); #ifdef __EMX__ @@@@ -917,11 +920,6 @@@@ return strcmp((*a)->name,(*b)->name); } -int versort(struct _info **a, struct _info **b) -{ - return strverscmp((*a)->name,(*b)->name); -} - int reversealnumsort(struct _info **a, struct _info **b) { return strcmp((*b)->name,(*a)->name); @ 1.4 log @upgrading package: tree 1.5.1.1 -> 1.5.1.2 @ text @d2 2 a3 2 --- man/tree.1.orig 2007-06-11 15:22:14 +0200 +++ man/tree.1 2008-06-04 22:20:33 +0200 d15 1 a15 1 @@@@ -149,7 +149,7 @@@@ d20 4 d29 3 a31 3 --- tree.c.orig 2008-06-04 16:15:11 +0200 +++ tree.c 2008-06-04 22:20:33 +0200 @@@@ -31,6 +31,12 @@@@ d44 9 a52 1 @@@@ -196,7 +202,8 @@@@ d60 1 d62 11 a72 2 dirs[0] = 0; @@@@ -624,7 +631,7 @@@@ d81 12 @ 1.3 log @upgrading package: tree 1.5.0 -> 1.5.1 @ text @d2 2 a3 2 --- man/tree.1.orig 2007-01-09 21:53:30 +0100 +++ man/tree.1 2007-01-10 19:42:01 +0100 d25 3 a27 13 --- tree.c.orig 2007-01-09 22:07:16 +0100 +++ tree.c 2007-01-10 19:42:47 +0100 @@@@ -17,7 +17,9 @@@@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#if defined(__linux__) #include +#endif #include #include #include @@@@ -32,6 +34,12 @@@@ d40 1 a40 10 @@@@ -181,7 +189,7 @@@@ #ifdef CYGWIN extern int MB_CUR_MAX; -#else +#elif defined(__linux__) extern size_t MB_CUR_MAX; #endif @@@@ -194,7 +202,8 @@@@ d50 1 a50 1 @@@@ -624,7 +633,7 @@@@ @ 1.2 log @merge in Fedora Core patches @ text @d1 3 a3 3 Index: tree.1 --- tree.1.orig 2004-08-15 01:29:06 +0200 +++ tree.1 2006-10-27 20:20:38 +0200 d15 1 a15 6 @@@@ -139,11 +139,11 @@@@ .TP .B -q Print non-printable characters in filenames as question marks instead of the default -carrot notation. +caret notation. d25 5 a29 10 --- tree.c.orig 2004-08-16 03:07:21 +0200 +++ tree.c 2006-10-27 20:20:38 +0200 @@@@ -19,9 +19,6 @@@@ #ifdef LINUX_BIGFILE # define _LARGEFILE64_SOURCE -#else -# define stat64 stat -# define lstat64 lstat #endif d31 3 d35 3 a37 1 @@@@ -38,6 +35,12 @@@@ d42 1 a42 1 +#if !defined(LINUX_BIGFILE) d50 1 a50 3 @@@@ -189,7 +192,9 @@@@ FILE *outfile; int *dirs, maxdirs; d52 4 a55 1 +#ifdef __linux__ d57 1 a57 1 +#endif d59 1 a59 3 int main(int argc, char **argv) { @@@@ -200,8 +205,9 @@@@ d62 1 a62 1 Dflag = qflag = Nflag = Hflag = Rflag = FALSE; d65 1 a66 1 + nocolor = TRUE; d68 10 a77 2 Level = -1; @ 1.1 log @new package: tree 1.5.0 (Filesystem Tree Listing) @ text @d1 28 d31 1 a31 1 +++ tree.c 2006-10-27 20:16:19 +0200 d65 11 @