Trivial changes: whitespace and modes.
Remote whitespace at the ends of lines. Remove blank lines from the ends of files. Change modes on source files so that they are not executable. Signed-off-by: Dan Cross <cross@gajendra.net>
This commit is contained in:
parent
77a0a5b519
commit
fa325e9b42
1021 changed files with 5688 additions and 6193 deletions
|
|
@ -48,7 +48,7 @@ static void removevacfile(void);
|
|||
#ifdef PLAN9PORT
|
||||
/*
|
||||
* We're between a rock and a hard place here.
|
||||
* The pw library (getpwnam, etc.) reads the
|
||||
* The pw library (getpwnam, etc.) reads the
|
||||
* password and group files into an on-stack buffer,
|
||||
* so if you have some huge groups, you overflow
|
||||
* the stack. Because of this, the thread library turns
|
||||
|
|
@ -136,10 +136,10 @@ threadmain(int argc, char **argv)
|
|||
default:
|
||||
usage();
|
||||
}ARGEND
|
||||
|
||||
|
||||
if(argc == 0 && !stdinname)
|
||||
usage();
|
||||
|
||||
|
||||
if(archivefile && (vacfile || diffvac)){
|
||||
fprint(2, "cannot use -a with -f, -d\n");
|
||||
usage();
|
||||
|
|
@ -266,7 +266,7 @@ threadmain(int argc, char **argv)
|
|||
}
|
||||
if(fdiff)
|
||||
vacfiledecref(fdiff);
|
||||
|
||||
|
||||
/*
|
||||
* Record the maximum qid so that vacs can be merged
|
||||
* without introducing overlapping qids. Older versions
|
||||
|
|
@ -313,7 +313,7 @@ recentarchive(VacFs *fs, char *path)
|
|||
char buf[10];
|
||||
int year, mmdd, nn, n, n1;
|
||||
char *p;
|
||||
|
||||
|
||||
fp = vacfsgetroot(fs);
|
||||
de = vdeopen(fp);
|
||||
year = 0;
|
||||
|
|
@ -339,7 +339,7 @@ recentarchive(VacFs *fs, char *path)
|
|||
return nil;
|
||||
}
|
||||
fp = f;
|
||||
|
||||
|
||||
de = vdeopen(fp);
|
||||
mmdd = 0;
|
||||
nn = 0;
|
||||
|
|
@ -440,7 +440,7 @@ enum {
|
|||
|
||||
/*
|
||||
* Archive the file named name, which has stat info d,
|
||||
* into the vac directory fp (p = parent).
|
||||
* into the vac directory fp (p = parent).
|
||||
*
|
||||
* If we're doing a vac -d against another archive, the
|
||||
* equivalent directory to fp in that archive is diffp.
|
||||
|
|
@ -469,7 +469,7 @@ vac(VacFile *fp, VacFile *diffp, char *name, Dir *d)
|
|||
|
||||
if(merge && vacmerge(fp, name) >= 0)
|
||||
return;
|
||||
|
||||
|
||||
if(verbose)
|
||||
fprint(2, "%s%s\n", name, (d->mode&DMDIR) ? "/" : "");
|
||||
|
||||
|
|
@ -551,7 +551,7 @@ vac(VacFile *fp, VacFile *diffp, char *name, Dir *d)
|
|||
if(vacfilegetentries(fdiff, &e, nil) >= 0)
|
||||
if(vacfilesetentries(f, &e, nil) >= 0){
|
||||
bsize = e.dsize;
|
||||
|
||||
|
||||
/*
|
||||
* Or if -q is set, and the metadata looks the same,
|
||||
* don't even bother reading the file.
|
||||
|
|
@ -565,7 +565,7 @@ vac(VacFile *fp, VacFile *diffp, char *name, Dir *d)
|
|||
vdcleanup(&vddiff);
|
||||
goto Out;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Skip over presumably-unchanged prefix
|
||||
* of an append-only file.
|
||||
|
|
@ -631,7 +631,7 @@ vacstdin(VacFile *fp, char *name)
|
|||
warn("vacfilecreate %s: %r", name);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
off = 0;
|
||||
while((n = read(0, buf, sizeof buf)) > 0){
|
||||
if(vacfilewrite(f, buf, n, off) < 0){
|
||||
|
|
@ -660,7 +660,7 @@ vacmergefile(VacFile *fp, VacFile *mp, VacDir *d, char *vacfile,
|
|||
VtEntry ed, em;
|
||||
VacFile *mf;
|
||||
VacFile *f;
|
||||
|
||||
|
||||
mf = vacfilewalk(mp, d->elem);
|
||||
if(mf == nil){
|
||||
warn("could not walk %s in %s", d->elem, vacfile);
|
||||
|
|
@ -671,7 +671,7 @@ vacmergefile(VacFile *fp, VacFile *mp, VacDir *d, char *vacfile,
|
|||
vacfiledecref(mf);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
if((f = vacfilecreate(fp, d->elem, d->mode)) == nil){
|
||||
warn("vacfilecreate %s: %r", d->elem);
|
||||
vacfiledecref(mf);
|
||||
|
|
@ -693,7 +693,7 @@ vacmergefile(VacFile *fp, VacFile *mp, VacDir *d, char *vacfile,
|
|||
vacfiledecref(f);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
vacfiledecref(mf);
|
||||
vacfiledecref(f);
|
||||
return 0;
|
||||
|
|
@ -778,4 +778,3 @@ warn(char *fmt, ...)
|
|||
fprint(2, "\n");
|
||||
va_end(arg);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue