The mega whitespace patch.

Tabs have been converted to spaces and trailing whitespace have been removed.
I have fixed my emacs settings now :P

4 files changed, 172 insertions, 172 deletions

diff --git a/cli/btcli.c b/cli/btcli.c
index 6b5d8b1..11329b6 100644
--- a/cli/btcli.c
+++ b/cli/btcli.c
@@ -24,16 +24,16 @@ static void
 usage()
 {
     printf("Usage: btcli command [options] [files]\n"
-	   "Commands:\n"
-	   "add <file_1> ... [file_n]\n"
-	   "\tAdd the given torrents to btpd.\n"
-	   "\n"
-	   "del <file_1> ... [file_n]\n"
-	   "\tRemove the given torrents from btpd.\n"
-	   "\n"
-	   "die\n"
-	   "\tShut down btpd.\n"
-	   "\n"
+           "Commands:\n"
+           "add <file_1> ... [file_n]\n"
+           "\tAdd the given torrents to btpd.\n"
+           "\n"
+           "del <file_1> ... [file_n]\n"
+           "\tRemove the given torrents from btpd.\n"
+           "\n"
+           "die\n"
+           "\tShut down btpd.\n"
+           "\n"
            "list\n"
            "\tList active torrents.\n"
            "\n"
@@ -47,13 +47,13 @@ usage()
            "-w n\n"
            "\tRepeat every n seconds.\n"
            "\n"
-	   "Common options:\n"
-	   "--ipc key\n"
-	   "\tTalk to the btpd started with the same key.\n"
-	   "\n"
-	   "--help\n"
-	   "\tShow this help.\n"
-	   "\n");
+           "Common options:\n"
+           "--ipc key\n"
+           "\tTalk to the btpd started with the same key.\n"
+           "\n"
+           "--help\n"
+           "\tShow this help.\n"
+           "\n");
     exit(1);
 }
 
@@ -62,12 +62,12 @@ handle_error(int error)
 {
     switch (error) {
     case 0:
-	break;
+        break;
     case ENOENT:
     case ECONNREFUSED:
-	errx(1, "Couldn't connect. Check that btpd is running.");
+        errx(1, "Couldn't connect. Check that btpd is running.");
     default:
-	errx(1, "%s", strerror(error));
+        errx(1, "%s", strerror(error));
     }
 }
 
@@ -76,11 +76,11 @@ do_ipc_open(char *ipctok, struct ipc **ipc)
 {
     switch (ipc_open(ipctok, ipc)) {
     case 0:
-	break;
+        break;
     case EINVAL:
-	errx(1, "--ipc argument only takes letters and digits.");
+        errx(1, "--ipc argument only takes letters and digits.");
     case ENAMETOOLONG:
-	errx(1, "--ipc argument is too long.");
+        errx(1, "--ipc argument is too long.");
     }
 }
 
@@ -96,10 +96,10 @@ hash_cb(uint32_t index, uint8_t *hash, void *arg)
 {
     struct cb *cb = arg;
     if (hash != NULL)
-	if (bcmp(hash, cb->meta->piece_hash[index], SHA_DIGEST_LENGTH) == 0) {
-	    set_bit(cb->piece_field, index);
+        if (bcmp(hash, cb->meta->piece_hash[index], SHA_DIGEST_LENGTH) == 0) {
+            set_bit(cb->piece_field, index);
             cb->have++;
-	}
+        }
     printf("\rTested: %5.1f%%", 100.0 * (index + 1) / cb->meta->npieces);
     fflush(stdout);
 }
@@ -120,7 +120,7 @@ gen_ifile(char *path)
     size_t field_len;
 
     if ((errno = load_metainfo(path, -1, 1, &mi)) != 0)
-	err(1, "load_metainfo: %s", path);
+        err(1, "load_metainfo: %s", path);
 
     field_len = ceil(mi->npieces / 8.0);
     cb.path = path;
@@ -129,24 +129,24 @@ gen_ifile(char *path)
     cb.meta = mi;
 
     if (cb.piece_field == NULL)
-	errx(1, "Out of memory.\n");
+        errx(1, "Out of memory.\n");
 
     if ((errno = bts_hashes(mi, fd_cb, hash_cb, &cb)) != 0)
-	err(1, "bts_hashes");
+        err(1, "bts_hashes");
     printf("\nHave: %5.1f%%\n", 100.0 * cb.have / cb.meta->npieces);
 
     if ((errno = vopen(&fd, O_WRONLY|O_CREAT, "%s.i", path)) != 0)
-	err(1, "opening %s.i", path);
+        err(1, "opening %s.i", path);
 
     if (ftruncate(fd, field_len + mi->npieces *
-	    (off_t)ceil(mi->piece_length / (double)(1 << 17))) < 0)
-	err(1, "ftruncate: %s", path);
+            (off_t)ceil(mi->piece_length / (double)(1 << 17))) < 0)
+        err(1, "ftruncate: %s", path);
 
     if (write(fd, cb.piece_field, field_len) != field_len)
-	err(1, "write %s.i", path);
+        err(1, "write %s.i", path);
 
     if (close(fd) < 0)
-	err(1, "close %s.i", path);
+        err(1, "close %s.i", path);
 
     clear_metainfo(mi);
     free(mi);
@@ -173,45 +173,45 @@ cmd_add(int argc, char **argv)
     int ch;
     char *ipctok = NULL;
     while ((ch = getopt_long(argc, argv, "", add_opts, NULL)) != -1) {
-	switch(ch) {
-	case 1:
-	    ipctok = optarg;
-	    break;
-	default:
-	    usage();
-	}
+        switch(ch) {
+        case 1:
+            ipctok = optarg;
+            break;
+        default:
+            usage();
+        }
     }
     argc -= optind;
     argv += optind;
 
     if (argc < 1)
-	usage();
+        usage();
 
     for (int i = 0; i < argc; i++) {
-	int64_t code;
-	char *res;
-	int fd;
-	char *path;
-	errno = vopen(&fd, O_RDONLY, "%s.i", argv[i]);
-	if (errno == ENOENT) {
-	    printf("Testing %s for content.\n", argv[i]);
-	    gen_ifile(argv[i]);
-	} else if (errno != 0)
-	    err(1, "open %s.i", argv[i]);
-	else
-	    close(fd);
-
-	if ((errno = canon_path(argv[i], &path)) != 0)
-	    err(1, "canon_path");
-	do_add(ipctok, &path, 1, &res);
-	free(path);
-	benc_dget_int64(benc_first(res), "code", &code);
-	if (code == EEXIST)
-	    printf("btpd already had %s.\n", argv[i]);
-	else if (code != 0) {
-	    printf("btpd indicates error: %s for %s.\n",
-	        strerror(code), argv[i]);
-	}
+        int64_t code;
+        char *res;
+        int fd;
+        char *path;
+        errno = vopen(&fd, O_RDONLY, "%s.i", argv[i]);
+        if (errno == ENOENT) {
+            printf("Testing %s for content.\n", argv[i]);
+            gen_ifile(argv[i]);
+        } else if (errno != 0)
+            err(1, "open %s.i", argv[i]);
+        else
+            close(fd);
+
+        if ((errno = canon_path(argv[i], &path)) != 0)
+            err(1, "canon_path");
+        do_add(ipctok, &path, 1, &res);
+        free(path);
+        benc_dget_int64(benc_first(res), "code", &code);
+        if (code == EEXIST)
+            printf("btpd already had %s.\n", argv[i]);
+        else if (code != 0) {
+            printf("btpd indicates error: %s for %s.\n",
+                strerror(code), argv[i]);
+        }
         free(res);
     }
 }
@@ -237,45 +237,45 @@ cmd_del(int argc, char **argv)
     int ch;
     char *ipctok = NULL;
     while ((ch = getopt_long(argc, argv, "", del_opts, NULL)) != -1) {
-	switch(ch) {
-	case 1:
-	    ipctok = optarg;
-	    break;
-	default:
-	    usage();
-	}
+        switch(ch) {
+        case 1:
+            ipctok = optarg;
+            break;
+        default:
+            usage();
+        }
     }
     argc -= optind;
     argv += optind;
 
     if (argc < 1)
-	usage();
+        usage();
 
     uint8_t hashes[argc][20];
     char *res;
     const char *d;
 
     for (int i = 0; i < argc; i++) {
-	struct metainfo *mi;
-	if ((errno = load_metainfo(argv[i], -1, 0, &mi)) != 0)
-	    err(1, "load_metainfo: %s", argv[i]);
-	bcopy(mi->info_hash, hashes[i], 20);
-	clear_metainfo(mi);
-	free(mi);	
+        struct metainfo *mi;
+        if ((errno = load_metainfo(argv[i], -1, 0, &mi)) != 0)
+            err(1, "load_metainfo: %s", argv[i]);
+        bcopy(mi->info_hash, hashes[i], 20);
+        clear_metainfo(mi);
+        free(mi);
     }
-    
+
     do_del(ipctok, hashes, argc, &res);
     d = benc_first(res);
     for (int i = 0; i < argc; i++) {
-	int64_t code;
-	benc_dget_int64(d, "code", &code);
-	if (code == ENOENT)
-	    printf("btpd didn't have %s.\n", argv[i]);
-	else if (code != 0) {
-	    printf("btpd indicates error: %s for %s.\n",
-		   strerror(code), argv[i]);
-	}
-	d = benc_next(d);
+        int64_t code;
+        benc_dget_int64(d, "code", &code);
+        if (code == ENOENT)
+            printf("btpd didn't have %s.\n", argv[i]);
+        else if (code != 0) {
+            printf("btpd indicates error: %s for %s.\n",
+                   strerror(code), argv[i]);
+        }
+        d = benc_next(d);
     }
     free(res);
 }
@@ -302,13 +302,13 @@ cmd_die(int argc, char **argv)
     char *ipctok = NULL;
 
     while ((ch = getopt_long(argc, argv, "", die_opts, NULL)) != -1) {
-	switch (ch) {
-	case 1:
-	    ipctok = optarg;
-	    break;
-	default:
-	    usage();
-	}
+        switch (ch) {
+        case 1:
+            ipctok = optarg;
+            break;
+        default:
+            usage();
+        }
     }
     do_die(ipctok);
 }
@@ -420,14 +420,14 @@ grok_stat(char *ipctok, int iflag, int wait,
 again:
     do_stat(ipctok, &res);
     gettimeofday(&tv_cur, NULL);
-    if (old == NULL) 
-	ds = wait;
+    if (old == NULL)
+        ds = wait;
     else {
-	struct timeval delta;
-	timersub(&tv_old, &tv_cur, &delta);
-	ds = delta.tv_sec + delta.tv_usec / 1000000.0;
-	if (ds < 0)
-	    ds = wait;
+        struct timeval delta;
+        timersub(&tv_old, &tv_cur, &delta);
+        ds = delta.tv_sec + delta.tv_usec / 1000000.0;
+        if (ds < 0)
+            ds = wait;
     }
     tv_old = tv_cur;
     cur = parse_tors(res, hashes, nhashes);
@@ -484,7 +484,7 @@ cmd_stat(int argc, char **argv)
     int iflag = 0;
 
     while ((ch = getopt_long(argc, argv, "iw:", stat_opts, NULL)) != -1) {
-	switch (ch) {
+        switch (ch) {
         case 'i':
             iflag = 1;
             break;
@@ -493,12 +493,12 @@ cmd_stat(int argc, char **argv)
             if (wait <= 0)
                 errx(1, "-w argument must be an integer > 0.");
             break;
-	case 1:
-	    ipctok = optarg;
-	    break;
-	default:
-	    usage();
-	}
+        case 1:
+            ipctok = optarg;
+            break;
+        default:
+            usage();
+        }
     }
     argc -= optind;
     argv += optind;
@@ -531,13 +531,13 @@ cmd_list(int argc, char **argv)
     char *ipctok = NULL;
 
     while ((ch = getopt_long(argc, argv, "", list_opts, NULL)) != -1) {
-	switch (ch) {
-	case 1:
-	    ipctok = optarg;
-	    break;
-	default:
-	    usage();
-	}
+        switch (ch) {
+        case 1:
+            ipctok = optarg;
+            break;
+        default:
+            usage();
+        }
     }
     char *res;
     const char *p;
@@ -572,18 +572,18 @@ int
 main(int argc, char **argv)
 {
     if (argc < 2)
-	usage();
-    
+        usage();
+
     int found = 0;
     for (int i = 0; !found && i < ncmds; i++) {
-	if (strcmp(argv[1], cmd_table[i].name) == 0) {
-	    found = 1;
-	    cmd_table[i].fun(argc - 1, argv + 1);
-	}
+        if (strcmp(argv[1], cmd_table[i].name) == 0) {
+            found = 1;
+            cmd_table[i].fun(argc - 1, argv + 1);
+        }
     }
 
     if (!found)
-	usage();
+        usage();
 
     return 0;
 }
diff --git a/cli/btinfo.c b/cli/btinfo.c
index bd4a33b..f451c85 100644
--- a/cli/btinfo.c
+++ b/cli/btinfo.c
@@ -27,26 +27,26 @@ main(int argc, char **argv)
     int ch;
 
     while ((ch = getopt_long(argc, argv, "", longopts, NULL)) != -1)
-	usage();
+        usage();
 
     argc -= optind;
     argv += optind;
 
     if (argc < 1)
-	usage();
+        usage();
 
     while (argc > 0) {
-	struct metainfo *mi;
+        struct metainfo *mi;
 
-	if ((errno = load_metainfo(*argv, -1, 1, &mi)) != 0)
-	    err(1, "load_metainfo: %s", *argv);
+        if ((errno = load_metainfo(*argv, -1, 1, &mi)) != 0)
+            err(1, "load_metainfo: %s", *argv);
 
-	print_metainfo(mi);
-	clear_metainfo(mi);
-	free(mi);
+        print_metainfo(mi);
+        clear_metainfo(mi);
+        free(mi);
 
-	argc--;
-	argv++;
+        argc--;
+        argv++;
     }
 
     return 0;
diff --git a/cli/btpd_if.c b/cli/btpd_if.c
index 9990446..65502ac 100644
--- a/cli/btpd_if.c
+++ b/cli/btpd_if.c
@@ -19,21 +19,21 @@ ipc_open(const char *key, struct ipc **out)
     struct ipc *res;
 
     if (key == NULL)
-	key = "default";
+        key = "default";
     keylen = strlen(key);
     for (int i = 0; i < keylen; i++)
-	if (!isalnum(key[i]))
-	    return EINVAL;
+        if (!isalnum(key[i]))
+            return EINVAL;
 
     res = malloc(sizeof(*res));
     if (res == NULL)
-	return ENOMEM;
+        return ENOMEM;
 
     plen = sizeof(res->addr.sun_path);
     if (snprintf(res->addr.sun_path, plen,
-		 "/tmp/btpd_%u_%s", geteuid(), key) >= plen) {
-	free(res);
-	return ENAMETOOLONG;
+                 "/tmp/btpd_%u_%s", geteuid(), key) >= plen) {
+        free(res);
+        return ENAMETOOLONG;
     }
     res->addr.sun_family = AF_UNIX;
     *out = res;
@@ -55,13 +55,13 @@ ipc_connect(struct ipc *ipc, FILE **out)
     int error;
 
     if ((sd = socket(PF_UNIX, SOCK_STREAM, 0)) == -1)
-	return errno;
+        return errno;
 
     if (connect(sd, (struct sockaddr *)&ipc->addr, sizeof(ipc->addr)) == -1)
-	goto error;
+        goto error;
 
     if ((fp = fdopen(sd, "r+")) == NULL)
-	goto error;
+        goto error;
 
     *out = fp;
     return 0;
@@ -78,23 +78,23 @@ ipc_response(FILE *fp, char **out, uint32_t *len)
     char *buf;
 
     if (fread(&size, sizeof(size), 1, fp) != 1) {
-	if (ferror(fp))
-	    return errno;
-	else
-	    return ECONNRESET;
+        if (ferror(fp))
+            return errno;
+        else
+            return ECONNRESET;
     }
 
     if (size == 0)
-	return EINVAL;
+        return EINVAL;
 
     if ((buf = malloc(size)) == NULL)
-	return ENOMEM;
+        return ENOMEM;
 
     if (fread(buf, 1, size, fp) != size) {
-	if (ferror(fp))
-	    return errno;
-	else
-	    return ECONNRESET;
+        if (ferror(fp))
+            return errno;
+        else
+            return ECONNRESET;
     }
 
     *out = buf;
@@ -104,25 +104,25 @@ ipc_response(FILE *fp, char **out, uint32_t *len)
 
 static int
 ipc_req_res(struct ipc *ipc,
-	    const char *req, uint32_t qlen,
-	    char **res, uint32_t *rlen)
+            const char *req, uint32_t qlen,
+            char **res, uint32_t *rlen)
 {
     FILE *fp;
     int error;
 
     if ((error = ipc_connect(ipc, &fp)) != 0)
-	return error;
+        return error;
 
     if (fwrite(&qlen, sizeof(qlen), 1, fp) != 1)
-	goto error;
+        goto error;
     if (fwrite(req, 1, qlen, fp) != qlen)
-	goto error;
+        goto error;
     if (fflush(fp) != 0)
-	goto error;
+        goto error;
     if ((errno = ipc_response(fp, res, rlen)) != 0)
-	goto error;
+        goto error;
     if ((errno = benc_validate(*res, *rlen)) != 0)
-	goto error;
+        goto error;
 
     fclose(fp);
     return 0;
@@ -142,14 +142,14 @@ btpd_die(struct ipc *ipc)
     uint32_t rsiz;
 
     if ((error = ipc_req_res(ipc, shutdown, size, &response, &rsiz)) != 0)
-	return error;
+        return error;
 
     error = benc_validate(response, rsiz);
 
     if (error == 0) {
-	int64_t tmp;
+        int64_t tmp;
         benc_dget_int64(response, "code", &tmp);
-	error = tmp;
+        error = tmp;
     }
 
     free(response);
@@ -172,12 +172,12 @@ btpd_add(struct ipc *ipc, char **paths, unsigned npaths, char **out)
         buf_write(&iob, paths[i], plen);
     }
     buf_print(&iob, "e");
-    
+
     error = ipc_req_res(ipc, iob.buf, iob.buf_off, &res, &reslen);
     free(iob.buf);
     if (error == 0)
-	*out = res;
-    
+        *out = res;
+
     return error;
 }
 
@@ -210,11 +210,11 @@ btpd_del(struct ipc *ipc, uint8_t (*hash)[20], unsigned nhashes, char **out)
         buf_write(&iob, hash[i], 20);
     }
     buf_write(&iob, "e", 1);
-    
+
     error = ipc_req_res(ipc, iob.buf, iob.buf_off, &res, &reslen);
     free(iob.buf);
     if (error != 0)
-	return error;
+        return error;
 
     *out = res;
     return 0;
diff --git a/cli/btpd_if.h b/cli/btpd_if.h
index bda9739..e67770f 100644
--- a/cli/btpd_if.h
+++ b/cli/btpd_if.h
@@ -14,7 +14,7 @@ int ipc_close(struct ipc *ipc);
 
 int btpd_add(struct ipc *ipc, char **path, unsigned npaths, char **out);
 int btpd_del(struct ipc *ipc, uint8_t (*hash)[20],
-	     unsigned nhashes, char **out);
+             unsigned nhashes, char **out);
 int btpd_die(struct ipc *ipc);
 int btpd_stat(struct ipc *ipc, char **out);