- Fix for CURRENT

- Bump PORTREVISION
- Pass maintainership to submiiter

Submitted by:	Guy Brand <gb isis.u-strasbg.fr> (via private email)
This commit is contained in:
Thomas Abthorpe 2008-04-25 19:46:13 +00:00
parent 5f28dd4a82
commit 46398f6ab8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=211981
2 changed files with 42 additions and 8 deletions

View file

@ -7,11 +7,12 @@
PORTNAME= tree
PORTVERSION= 1.5.1.1
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://mama.indstate.edu/linux/tree/ CENKES
EXTRACT_SUFX= .tgz
MAINTAINER= tabthorpe@FreeBSD.org
MAINTAINER= gb@isis.u-strasbg.fr
COMMENT= Display a tree-view of directories with optional color or HTML output
MAKE_ENV+= MKDIR="${MKDIR}"
@ -19,10 +20,4 @@ MAKE_ENV+= MKDIR="${MKDIR}"
MAN1= tree.1
PLIST_FILES= bin/tree
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 800000
IGNORE= garbage output under 8.X
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View file

@ -8,6 +8,15 @@
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
@@ -148,7 +147,7 @@
int findino(ino_t, dev_t);
void *xmalloc(size_t), *xrealloc(void *, size_t);
void listdir(char *, int *, int *, u_long, dev_t), usage(int);
-void parse_dir_colors(), printit(unsigned char *), free_dir(struct _info **), indent();
+void parse_dir_colors(), printit(char *), free_dir(struct _info **), indent();
void saveino(ino_t, dev_t);
char **split(char *, char *, int *);
char *gidtoname(int), *uidtoname(int), *do_date(time_t);
@@ -178,12 +177,6 @@
char *sLevel, *curdir, *outfilename = NULL;
FILE *outfile;
@ -21,3 +30,33 @@
int main(int argc, char **argv)
{
@@ -622,7 +615,7 @@
#ifdef __USE_FILE_OFFSET64
if (inodeflag) sprintf(path," %7lld",(*dir)->inode);
#else
- if (inodeflag) sprintf(path," %7ld",(*dir)->inode);
+ if (inodeflag) sprintf(path," %7i",(*dir)->inode);
#endif
if (devflag) sprintf(path+strlen(path), " %3d", (int)(*dir)->dev);
#ifdef __EMX__
@@ -1041,8 +1034,10 @@
} else {
if (Hflag) fprintf(outfile,"<br>\t\t\t\t ");
for(i=0;dirs[i];i++) {
+ if( dirs[i] <= 0 )
+ break;
fprintf(outfile,"%s ",
- dirs[i+1] ? (dirs[i]==1 ? linedraw->vert : (Hflag? "&nbsp;&nbsp;&nbsp;" : " ") )
+ dirs[i+1] > 0 ? (dirs[i]==1 ? linedraw->vert : (Hflag? "&nbsp;&nbsp;&nbsp;" : " ") )
: (dirs[i]==1 ? linedraw->vert_left:linedraw->corner));
}
}
@@ -1180,7 +1175,7 @@
return t->name;
}
-void printit(unsigned char *s)
+void printit(char *s)
{
int c;