diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-04-02 11:05:55 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-04-02 11:05:55 +0000 |
| commit | 8a54c977ed09f0b5a4c8c86047de0015bda0733e (patch) | |
| tree | 32bd2067893e9f45a2f4165ee4be29a70039444f | |
| parent | BOGO_PC is an invalid userland address, which indicates kbind() is now (diff) | |
| download | wireguard-openbsd-8a54c977ed09f0b5a4c8c86047de0015bda0733e.tar.xz wireguard-openbsd-8a54c977ed09f0b5a4c8c86047de0015bda0733e.zip | |
annoying white space
| -rw-r--r-- | usr.bin/rsync/downloader.c | 4 | ||||
| -rw-r--r-- | usr.bin/rsync/mktemp.c | 14 | ||||
| -rw-r--r-- | usr.bin/rsync/sender.c | 8 | ||||
| -rw-r--r-- | usr.bin/rsync/uploader.c | 7 |
4 files changed, 16 insertions, 17 deletions
diff --git a/usr.bin/rsync/downloader.c b/usr.bin/rsync/downloader.c index a65f23d7a30..405f7623759 100644 --- a/usr.bin/rsync/downloader.c +++ b/usr.bin/rsync/downloader.c @@ -1,4 +1,4 @@ -/* $Id: downloader.c,v 1.18 2019/03/23 16:04:28 deraadt Exp $ */ +/* $Id: downloader.c,v 1.19 2019/04/02 11:05:55 deraadt Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -414,7 +414,7 @@ rsync_downloader(struct download *p, struct sess *sess, int *ofd) /* Create the temporary file. */ - if (mktemplate(sess, &p->fname, + if (mktemplate(sess, &p->fname, f->path, sess->opts->recursive) == -1) { ERRX1(sess, "mktemplate"); goto out; diff --git a/usr.bin/rsync/mktemp.c b/usr.bin/rsync/mktemp.c index 870b252ff74..f789b5c727f 100644 --- a/usr.bin/rsync/mktemp.c +++ b/usr.bin/rsync/mktemp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mktemp.c,v 1.7 2019/02/18 22:47:34 benno Exp $ */ +/* $OpenBSD: mktemp.c,v 1.8 2019/04/02 11:05:55 deraadt Exp $ */ /* * Copyright (c) 1996-1998, 2008 Theo de Raadt * Copyright (c) 1997, 2008-2009 Todd C. Miller @@ -75,13 +75,13 @@ static int mktemp_internalat(int pfd, char *path, int slen, enum tmpmode mode, int flags, const char *link, mode_t dev_type, dev_t dev) { - char *start, *cp, *ep; - const char tempchars[] = TEMPCHARS; - unsigned int tries; - struct stat sb; + char *start, *cp, *ep; + const char tempchars[] = TEMPCHARS; + unsigned int tries; + struct stat sb; struct sockaddr_un sun; - size_t len; - int fd, saved_errno; + size_t len; + int fd, saved_errno; len = strlen(path); if (len < MIN_X || slen < 0 || (size_t)slen > len - MIN_X) { diff --git a/usr.bin/rsync/sender.c b/usr.bin/rsync/sender.c index 50377c61cda..ab7221a87d7 100644 --- a/usr.bin/rsync/sender.c +++ b/usr.bin/rsync/sender.c @@ -1,4 +1,4 @@ -/* $Id: sender.c,v 1.20 2019/03/23 16:04:28 deraadt Exp $ */ +/* $Id: sender.c,v 1.21 2019/04/02 11:05:55 deraadt Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -34,9 +34,9 @@ * A request from the receiver to download updated file data. */ struct send_dl { - int32_t idx; /* index in our file list */ - struct blkset *blks; /* the sender's block information */ - TAILQ_ENTRY(send_dl) entries; + int32_t idx; /* index in our file list */ + struct blkset *blks; /* the sender's block information */ + TAILQ_ENTRY(send_dl) entries; }; /* diff --git a/usr.bin/rsync/uploader.c b/usr.bin/rsync/uploader.c index 04a133706ac..70aab10e6f5 100644 --- a/usr.bin/rsync/uploader.c +++ b/usr.bin/rsync/uploader.c @@ -1,4 +1,4 @@ -/* $Id: uploader.c,v 1.19 2019/03/23 16:04:28 deraadt Exp $ */ +/* $Id: uploader.c,v 1.20 2019/04/02 11:05:55 deraadt Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2019 Florian Obser <florian@openbsd.org> @@ -624,8 +624,7 @@ post_dir(struct sess *sess, const struct upload *u, size_t idx) */ if (u->newdir[idx] || - (sess->opts->preserve_perms && - st.st_mode != f->st.mode)) { + (sess->opts->preserve_perms && st.st_mode != f->st.mode)) { rc = fchmodat(u->rootfd, f->path, f->st.mode, 0); if (rc == -1) { ERR(sess, "%s: fchmodat", f->path); @@ -1017,7 +1016,7 @@ rsync_uploader_tail(struct upload *u, struct sess *sess) if (!sess->opts->preserve_times && - !sess->opts->preserve_perms) + !sess->opts->preserve_perms) return 1; LOG2(sess, "fixing up directory times and permissions"); |