284 files changed, 285 insertions, 19 deletions
diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index abd7db3ab..714dac077 100644
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  Modified for busybox by Glenn McGrath <bug1@iinet.net.au>
 *  Added support output to stdout by Thomas Lundquist <thomasez@zelow.no>
@@ -64,4 +65,3 @@ int bunzip2_main(int argc, char **argv)
        return status;
 }
-/* vi:set ts=4: */
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 6ca59ac91..558e3cd48 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  Mini dpkg implementation for busybox.
 *  This is not meant as a replacement for dpkg
diff --git a/archival/libunarchive/archive_xread_all.c b/archival/libunarchive/archive_xread_all.c
index ebd64dc14..5e6cc1600 100644
--- a/archival/libunarchive/archive_xread_all.c
+++ b/archival/libunarchive/archive_xread_all.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c
index d85879797..fa36b6eed 100644
--- a/archival/libunarchive/archive_xread_all_eof.c
+++ b/archival/libunarchive/archive_xread_all_eof.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c
index a8ecf3799..67ed631e1 100644
--- a/archival/libunarchive/check_header_gzip.c
+++ b/archival/libunarchive/check_header_gzip.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include <stdlib.h>
 #include <unistd.h>
 #include "libbb.h"
diff --git a/archival/libunarchive/data_align.c b/archival/libunarchive/data_align.c
index e4a364006..1efe9d8e0 100644
--- a/archival/libunarchive/data_align.c
+++ b/archival/libunarchive/data_align.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 588b081a5..19e85f38e 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/data_extract_to_buffer.c b/archival/libunarchive/data_extract_to_buffer.c
index 3eaca98b3..fe76971df 100644
--- a/archival/libunarchive/data_extract_to_buffer.c
+++ b/archival/libunarchive/data_extract_to_buffer.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright 2002 Glenn McGrath
 *
diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libunarchive/data_extract_to_stdout.c
index f1be5dc67..a17a851ca 100644
--- a/archival/libunarchive/data_extract_to_stdout.c
+++ b/archival/libunarchive/data_extract_to_stdout.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/data_skip.c b/archival/libunarchive/data_skip.c
index 0c6e26e54..50f2375ac 100644
--- a/archival/libunarchive/data_skip.c
+++ b/archival/libunarchive/data_skip.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libunarchive/decompress_uncompress.c
index 1e859dcde..81764a47f 100644
--- a/archival/libunarchive/decompress_uncompress.c
+++ b/archival/libunarchive/decompress_uncompress.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include "libbb.h"
 /* uncompress for busybox -- (c) 2002 Robert Griebl
diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libunarchive/decompress_unlzma.c
index 10883581c..0fb1249cb 100644
--- a/archival/libunarchive/decompress_unlzma.c
+++ b/archival/libunarchive/decompress_unlzma.c
@@ -1,4 +1,4 @@
-/* vi:set ts=4: */
+/* vi: set sw=4 ts=4: */
 /*
 * Small lzma deflate implementation.
 * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
@@ -468,4 +468,3 @@ int unlzma(int src_fd, int dst_fd)
        return 0;
 }
-/* vi:set ts=4: */
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c
index 5b8385c0d..3aa6f6f69 100644
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libunarchive/filter_accept_list_reassign.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  Copyright (C) 2002 by Glenn McGrath
 *
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c
index 69c4bf2b2..44d964287 100644
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libunarchive/get_header_ar.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* Copyright 2001 Glenn McGrath.
 *
 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c
index f54b5af69..725c4911a 100644
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libunarchive/get_header_cpio.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* Copyright 2002 Laurence Anderson
 *
 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index f3f04b582..3302d9392 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 *
 *  FIXME:
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c
index e874beee1..58d890f85 100644
--- a/archival/libunarchive/get_header_tar_bz2.c
+++ b/archival/libunarchive/get_header_tar_bz2.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c
index 62df7b268..ea5726d1b 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/get_header_tar_lzma.c b/archival/libunarchive/get_header_tar_lzma.c
index 63dc8bc2c..e38583fef 100644
--- a/archival/libunarchive/get_header_tar_lzma.c
+++ b/archival/libunarchive/get_header_tar_lzma.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Small lzma deflate implementation.
 * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
@@ -20,4 +21,3 @@ char get_header_tar_lzma(archive_handle_t * archive_handle)
        return EXIT_FAILURE;
 }
-/* vi:set ts=4: */
diff --git a/archival/libunarchive/header_list.c b/archival/libunarchive/header_list.c
index 36a2d330a..bf21ecbf1 100644
--- a/archival/libunarchive/header_list.c
+++ b/archival/libunarchive/header_list.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include <stdio.h>
 #include "unarchive.h"
diff --git a/archival/libunarchive/header_skip.c b/archival/libunarchive/header_skip.c
index 5b3d46cb8..629fa5482 100644
--- a/archival/libunarchive/header_skip.c
+++ b/archival/libunarchive/header_skip.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include <stdio.h>
 #include "unarchive.h"
diff --git a/archival/libunarchive/header_verbose_list.c b/archival/libunarchive/header_verbose_list.c
index 7dc902e71..2c5404fb1 100644
--- a/archival/libunarchive/header_verbose_list.c
+++ b/archival/libunarchive/header_verbose_list.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
diff --git a/archival/libunarchive/init_handle.c b/archival/libunarchive/init_handle.c
index 1813131de..513f65585 100644
--- a/archival/libunarchive/init_handle.c
+++ b/archival/libunarchive/init_handle.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c
index c1a0aad4d..578b92963 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libunarchive/open_transformer.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
diff --git a/archival/libunarchive/seek_by_char.c b/archival/libunarchive/seek_by_char.c
index 81d5f8d7c..f4d8c2f2b 100644
--- a/archival/libunarchive/seek_by_char.c
+++ b/archival/libunarchive/seek_by_char.c
@@ -1,4 +1,4 @@
-/* vi:set ts=4:*/
+/* vi: set sw=4 ts=4: */
 /*
 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libunarchive/seek_by_jump.c
index fb99b26a7..ca3e4a033 100644
--- a/archival/libunarchive/seek_by_jump.c
+++ b/archival/libunarchive/seek_by_jump.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c
index 15e56a468..47cf812ef 100644
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libunarchive/unpack_ar_archive.c
@@ -1,4 +1,4 @@
-/* vi:set ts=4:*/
+/* vi: set sw=4 ts=4: */
 /*
 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
diff --git a/archival/unlzma.c b/archival/unlzma.c
index b4881af75..bb4b9db6b 100644
--- a/archival/unlzma.c
+++ b/archival/unlzma.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Small lzma deflate implementation.
 * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
@@ -64,4 +65,3 @@ int unlzma_main(int argc, char **argv)
        return status;
 }
-/* vi:set ts=4: */
diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c
index 32153bd2c..62a654777 100644
--- a/console-tools/setlogcons.c
+++ b/console-tools/setlogcons.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * setlogcons: Send kernel messages to the current console or to console N 
 *
diff --git a/coreutils/cal.c b/coreutils/cal.c
index a134380c3..89e02e2f5 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Calendar implementation for busybox
 *
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 11e9d5e87..061c20697 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -1,4 +1,4 @@
-/* vi: set sw=8 ts=8: */
+/* vi: set sw=4 ts=4: */
 /*
 * cut.c - minimalist version of cut
 *
diff --git a/coreutils/fold.c b/coreutils/fold.c
index 833935af3..665b93e6e 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* fold -- wrap each input line to fit in specified width.
   Written by David MacKenzie, djm@gnu.ai.mit.edu.
@@ -158,4 +159,3 @@ rescan:
        bb_fflush_stdout_and_exit(errs);
 }
-/* vi: set sw=4 ts=4: */
diff --git a/coreutils/install.c b/coreutils/install.c
index 90b3ef31b..57845cffd 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  Copyright (C) 2003 by Glenn McGrath <bug1@iinet.net.au>
 *
diff --git a/coreutils/libcoreutils/coreutils.h b/coreutils/libcoreutils/coreutils.h
index b93731bc7..102c7b5be 100644
--- a/coreutils/libcoreutils/coreutils.h
+++ b/coreutils/libcoreutils/coreutils.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
 */
diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index 9d7a0f559..41c4b779c 100644
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -1,4 +1,4 @@
-/* vi:set ts=4: */
+/* vi: set sw=4 ts=4: */
 /* nohup - invoke a utility immune to hangups.
 * 
 * Busybox version based on nohup specification at
diff --git a/coreutils/od.c b/coreutils/od.c
index 13f91eec7..8cd34bb16 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * od implementation for busybox
 * Based on code from util-linux v 2.11l
diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index 079a62fe8..d4eb2435d 100644
--- a/coreutils/printenv.c
+++ b/coreutils/printenv.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * printenv implementation for busybox
 *
diff --git a/coreutils/stat.c b/coreutils/stat.c
index d58eae10e..7e39d5ecd 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -1,4 +1,4 @@
-/* vi:set ts=4:*/
+/* vi: set sw=4 ts=4: */
 /*
 * stat -- display file or file system status
 *
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index bf03252ac..9dc5bb86d 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  Copyright 2003, Glenn McGrath <bug1@iinet.net.au>
 *
diff --git a/e2fsprogs/blkid/blkid.h b/e2fsprogs/blkid/blkid.h
index c051b2b85..979565e39 100644
--- a/e2fsprogs/blkid/blkid.h
+++ b/e2fsprogs/blkid/blkid.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * blkid.h - Interface for libblkid, a library to identify block devices
 *
diff --git a/e2fsprogs/blkid/blkidP.h b/e2fsprogs/blkid/blkidP.h
index 4ae9763d2..c7cb8abe9 100644
--- a/e2fsprogs/blkid/blkidP.h
+++ b/e2fsprogs/blkid/blkidP.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * blkidP.h - Internal interfaces for libblkid
 *
diff --git a/e2fsprogs/blkid/blkid_getsize.c b/e2fsprogs/blkid/blkid_getsize.c
index 3bc11e3f4..7a2133f0a 100644
--- a/e2fsprogs/blkid/blkid_getsize.c
+++ b/e2fsprogs/blkid/blkid_getsize.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * getsize.c --- get the size of a partition.
 *
diff --git a/e2fsprogs/blkid/cache.c b/e2fsprogs/blkid/cache.c
index 9c9b8c7e4..57118e1d4 100644
--- a/e2fsprogs/blkid/cache.c
+++ b/e2fsprogs/blkid/cache.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * cache.c - allocation/initialization/free routines for cache
 *
diff --git a/e2fsprogs/blkid/dev.c b/e2fsprogs/blkid/dev.c
index 5d56c5096..6d99504af 100644
--- a/e2fsprogs/blkid/dev.c
+++ b/e2fsprogs/blkid/dev.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * dev.c - allocation/initialization/free routines for dev
 *
diff --git a/e2fsprogs/blkid/devname.c b/e2fsprogs/blkid/devname.c
index 1e016a55d..b5c1bc9a8 100644
--- a/e2fsprogs/blkid/devname.c
+++ b/e2fsprogs/blkid/devname.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * devname.c - get a dev by its device inode name
 *
diff --git a/e2fsprogs/blkid/devno.c b/e2fsprogs/blkid/devno.c
index 89119945c..f3fa5c0cf 100644
--- a/e2fsprogs/blkid/devno.c
+++ b/e2fsprogs/blkid/devno.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * devno.c - find a particular device by its device number (major/minor)
 *
diff --git a/e2fsprogs/blkid/list.h b/e2fsprogs/blkid/list.h
index c1cbfec59..cbf16a059 100644
--- a/e2fsprogs/blkid/list.h
+++ b/e2fsprogs/blkid/list.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #if !defined(_BLKID_LIST_H) && !defined(LIST_HEAD)
 #define _BLKID_LIST_H
diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c
index 03bbc749c..211569779 100644
--- a/e2fsprogs/blkid/probe.c
+++ b/e2fsprogs/blkid/probe.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * probe.c - identify a block device by its contents, and return a dev
 *           struct with the details
diff --git a/e2fsprogs/blkid/probe.h b/e2fsprogs/blkid/probe.h
index 134913f59..e1b65246a 100644
--- a/e2fsprogs/blkid/probe.h
+++ b/e2fsprogs/blkid/probe.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * probe.h - constants and on-disk structures for extracting device data
 *
diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c
index a2a8bb59e..e954c6d94 100644
--- a/e2fsprogs/blkid/read.c
+++ b/e2fsprogs/blkid/read.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * read.c - read the blkid cache from disk, to avoid scanning all devices
 *
diff --git a/e2fsprogs/blkid/resolve.c b/e2fsprogs/blkid/resolve.c
index 40d999a1b..4c4383001 100644
--- a/e2fsprogs/blkid/resolve.c
+++ b/e2fsprogs/blkid/resolve.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * resolve.c - resolve names and tags into specific devices
 *
diff --git a/e2fsprogs/blkid/save.c b/e2fsprogs/blkid/save.c
index 98d8d0260..cdbaabcb1 100644
--- a/e2fsprogs/blkid/save.c
+++ b/e2fsprogs/blkid/save.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * save.c - write the cache struct to disk
 *
diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c
index 61642464d..ff10b28e2 100644
--- a/e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/blkid/tag.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * tag.c - allocation/initialization/free routines for tag structs
 *
diff --git a/e2fsprogs/blkid/version.c b/e2fsprogs/blkid/version.c
index ea30d0c9f..d076de04d 100644
--- a/e2fsprogs/blkid/version.c
+++ b/e2fsprogs/blkid/version.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * version.c --- Return the version of the blkid library
 *
diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index c39003821..2cb75e86f 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * chattr.c             - Change file attributes on an ext2 file system
 *
diff --git a/e2fsprogs/e2fsbb.h b/e2fsprogs/e2fsbb.h
index 975e5676c..78e7cbd04 100644
--- a/e2fsprogs/e2fsbb.h
+++ b/e2fsprogs/e2fsbb.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * File: e2fsbb.h
 *
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index 0d151ef80..0282d328f 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * e2fsck
 *
diff --git a/e2fsprogs/e2fsck.h b/e2fsprogs/e2fsck.h
index 4bfe7600e..52db828a9 100644
--- a/e2fsprogs/e2fsck.h
+++ b/e2fsprogs/e2fsck.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/e2fsprogs/e2p/e2p.h b/e2fsprogs/e2p/e2p.h
index d4a8c0eda..2a2367b9f 100644
--- a/e2fsprogs/e2p/e2p.h
+++ b/e2fsprogs/e2p/e2p.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include "busybox.h"
 #include <sys/types.h>          /* Needed by dirent.h on netbsd */
 #include <stdio.h>
diff --git a/e2fsprogs/e2p/feature.c b/e2fsprogs/e2p/feature.c
index 0a9058384..602c2ff02 100644
--- a/e2fsprogs/e2p/feature.c
+++ b/e2fsprogs/e2p/feature.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * feature.c --- convert between features and strings
 *
diff --git a/e2fsprogs/e2p/fgetsetflags.c b/e2fsprogs/e2p/fgetsetflags.c
index 0a9f5359a..86bf65d50 100644
--- a/e2fsprogs/e2p/fgetsetflags.c
+++ b/e2fsprogs/e2p/fgetsetflags.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * fgetflags.c          - Get a file flags on an ext2 file system
 * fsetflags.c          - Set a file flags on an ext2 file system
diff --git a/e2fsprogs/e2p/fgetsetversion.c b/e2fsprogs/e2p/fgetsetversion.c
index 8227ab3be..48cea9df4 100644
--- a/e2fsprogs/e2p/fgetsetversion.c
+++ b/e2fsprogs/e2p/fgetsetversion.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * fgetversion.c        - Get a file version on an ext2 file system
 * fsetversion.c        - Set a file version on an ext2 file system
diff --git a/e2fsprogs/e2p/hashstr.c b/e2fsprogs/e2p/hashstr.c
index 705f63ae0..697ffadc3 100644
--- a/e2fsprogs/e2p/hashstr.c
+++ b/e2fsprogs/e2p/hashstr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * feature.c --- convert between features and strings
 *
diff --git a/e2fsprogs/e2p/iod.c b/e2fsprogs/e2p/iod.c
index 5321f2da1..8d4c5cdcb 100644
--- a/e2fsprogs/e2p/iod.c
+++ b/e2fsprogs/e2p/iod.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * iod.c                - Iterate a function on each entry of a directory
 *
diff --git a/e2fsprogs/e2p/ls.c b/e2fsprogs/e2p/ls.c
index ee83ab64c..e2a1ccb3d 100644
--- a/e2fsprogs/e2p/ls.c
+++ b/e2fsprogs/e2p/ls.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ls.c                 - List the contents of an ext2fs superblock
 *
diff --git a/e2fsprogs/e2p/mntopts.c b/e2fsprogs/e2p/mntopts.c
index b27f78ed9..1ec3402f7 100644
--- a/e2fsprogs/e2p/mntopts.c
+++ b/e2fsprogs/e2p/mntopts.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * mountopts.c --- convert between default mount options and strings
 *
diff --git a/e2fsprogs/e2p/ostype.c b/e2fsprogs/e2p/ostype.c
index 2ea59cbe1..d55f98bb2 100644
--- a/e2fsprogs/e2p/ostype.c
+++ b/e2fsprogs/e2p/ostype.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * getostype.c          - Get the Filesystem OS type
 *
diff --git a/e2fsprogs/e2p/parse_num.c b/e2fsprogs/e2p/parse_num.c
index 81c160544..6db076f9c 100644
--- a/e2fsprogs/e2p/parse_num.c
+++ b/e2fsprogs/e2p/parse_num.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * parse_num.c          - Parse the number of blocks
 *
diff --git a/e2fsprogs/e2p/pe.c b/e2fsprogs/e2p/pe.c
index 07fb88694..835274b54 100644
--- a/e2fsprogs/e2p/pe.c
+++ b/e2fsprogs/e2p/pe.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * pe.c                 - Print a second extended filesystem errors behavior
 *
diff --git a/e2fsprogs/e2p/pf.c b/e2fsprogs/e2p/pf.c
index da8357a46..55d4bc487 100644
--- a/e2fsprogs/e2p/pf.c
+++ b/e2fsprogs/e2p/pf.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * pf.c                 - Print file attributes on an ext2 file system
 *
diff --git a/e2fsprogs/e2p/ps.c b/e2fsprogs/e2p/ps.c
index b7c0ee2f1..d1067388a 100644
--- a/e2fsprogs/e2p/ps.c
+++ b/e2fsprogs/e2p/ps.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ps.c                 - Print filesystem state
 *
diff --git a/e2fsprogs/e2p/uuid.c b/e2fsprogs/e2p/uuid.c
index cb4ec8072..474d64a5a 100644
--- a/e2fsprogs/e2p/uuid.c
+++ b/e2fsprogs/e2p/uuid.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * uuid.c -- utility routines for manipulating UUID's.
 */
diff --git a/e2fsprogs/ext2fs/alloc.c b/e2fsprogs/ext2fs/alloc.c
index d56ef2566..590f23a7e 100644
--- a/e2fsprogs/ext2fs/alloc.c
+++ b/e2fsprogs/ext2fs/alloc.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * alloc.c --- allocate new inodes, blocks for ext2fs
 *
diff --git a/e2fsprogs/ext2fs/alloc_sb.c b/e2fsprogs/ext2fs/alloc_sb.c
index aa2cd0568..a7437c96f 100644
--- a/e2fsprogs/ext2fs/alloc_sb.c
+++ b/e2fsprogs/ext2fs/alloc_sb.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * alloc_sb.c --- Allocate the superblock and block group descriptors for a
 * newly initialized filesystem.  Used by mke2fs when initializing a filesystem
diff --git a/e2fsprogs/ext2fs/alloc_stats.c b/e2fsprogs/ext2fs/alloc_stats.c
index 32aa0b6bc..f3ab06a23 100644
--- a/e2fsprogs/ext2fs/alloc_stats.c
+++ b/e2fsprogs/ext2fs/alloc_stats.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * alloc_stats.c --- Update allocation statistics for ext2fs
 *
diff --git a/e2fsprogs/ext2fs/alloc_tables.c b/e2fsprogs/ext2fs/alloc_tables.c
index 10f1f95a4..b2d786ed8 100644
--- a/e2fsprogs/ext2fs/alloc_tables.c
+++ b/e2fsprogs/ext2fs/alloc_tables.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * alloc_tables.c --- Allocate tables for a newly initialized
 * filesystem.  Used by mke2fs when initializing a filesystem
diff --git a/e2fsprogs/ext2fs/badblocks.c b/e2fsprogs/ext2fs/badblocks.c
index d82041126..7804396d7 100644
--- a/e2fsprogs/ext2fs/badblocks.c
+++ b/e2fsprogs/ext2fs/badblocks.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * badblocks.c --- routines to manipulate the bad block structure
 *
diff --git a/e2fsprogs/ext2fs/bb_compat.c b/e2fsprogs/ext2fs/bb_compat.c
index 5a158b34c..419ac7785 100644
--- a/e2fsprogs/ext2fs/bb_compat.c
+++ b/e2fsprogs/ext2fs/bb_compat.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * bb_compat.c --- compatibility badblocks routines
 *
diff --git a/e2fsprogs/ext2fs/bb_inode.c b/e2fsprogs/ext2fs/bb_inode.c
index 8a840d9d7..855f86eac 100644
--- a/e2fsprogs/ext2fs/bb_inode.c
+++ b/e2fsprogs/ext2fs/bb_inode.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * bb_inode.c --- routines to update the bad block inode.
 *
diff --git a/e2fsprogs/ext2fs/bitmaps.c b/e2fsprogs/ext2fs/bitmaps.c
index 932c345fa..712a4a9b1 100644
--- a/e2fsprogs/ext2fs/bitmaps.c
+++ b/e2fsprogs/ext2fs/bitmaps.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * bitmaps.c --- routines to read, write, and manipulate the inode and
 * block bitmaps.
diff --git a/e2fsprogs/ext2fs/bitops.c b/e2fsprogs/ext2fs/bitops.c
index 44c08ad9f..987061130 100644
--- a/e2fsprogs/ext2fs/bitops.c
+++ b/e2fsprogs/ext2fs/bitops.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * bitops.c --- Bitmap frobbing code.  See bitops.h for the inlined
 *      routines.
diff --git a/e2fsprogs/ext2fs/bitops.h b/e2fsprogs/ext2fs/bitops.h
index 922c31c85..6dd30862b 100644
--- a/e2fsprogs/ext2fs/bitops.h
+++ b/e2fsprogs/ext2fs/bitops.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * bitops.h --- Bitmap frobbing code.  The byte swapping routines are
 *      also included here.
diff --git a/e2fsprogs/ext2fs/block.c b/e2fsprogs/ext2fs/block.c
index 94e96c5c4..0a757b201 100644
--- a/e2fsprogs/ext2fs/block.c
+++ b/e2fsprogs/ext2fs/block.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * block.c --- iterate over all blocks in an inode
 *
diff --git a/e2fsprogs/ext2fs/bmap.c b/e2fsprogs/ext2fs/bmap.c
index 0015ba288..b22fe3dbf 100644
--- a/e2fsprogs/ext2fs/bmap.c
+++ b/e2fsprogs/ext2fs/bmap.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * bmap.c --- logical to physical block mapping
 *
diff --git a/e2fsprogs/ext2fs/bmove.c b/e2fsprogs/ext2fs/bmove.c
index 8db905164..635410da5 100644
--- a/e2fsprogs/ext2fs/bmove.c
+++ b/e2fsprogs/ext2fs/bmove.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * bmove.c --- Move blocks around to make way for a particular
 *      filesystem structure.
diff --git a/e2fsprogs/ext2fs/brel.h b/e2fsprogs/ext2fs/brel.h
index a7f977658..216fd132c 100644
--- a/e2fsprogs/ext2fs/brel.h
+++ b/e2fsprogs/ext2fs/brel.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * brel.h
 *
diff --git a/e2fsprogs/ext2fs/brel_ma.c b/e2fsprogs/ext2fs/brel_ma.c
index 557143d51..652a3509c 100644
--- a/e2fsprogs/ext2fs/brel_ma.c
+++ b/e2fsprogs/ext2fs/brel_ma.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * brel_ma.c
 *
diff --git a/e2fsprogs/ext2fs/check_desc.c b/e2fsprogs/ext2fs/check_desc.c
index eab8c7bc8..dd4b0e9cf 100644
--- a/e2fsprogs/ext2fs/check_desc.c
+++ b/e2fsprogs/ext2fs/check_desc.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * check_desc.c --- Check the group descriptors of an ext2 filesystem
 *
diff --git a/e2fsprogs/ext2fs/closefs.c b/e2fsprogs/ext2fs/closefs.c
index 40a697496..3531cdce7 100644
--- a/e2fsprogs/ext2fs/closefs.c
+++ b/e2fsprogs/ext2fs/closefs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * closefs.c --- close an ext2 filesystem
 *
diff --git a/e2fsprogs/ext2fs/cmp_bitmaps.c b/e2fsprogs/ext2fs/cmp_bitmaps.c
index fa45a4331..05b8eb8d7 100644
--- a/e2fsprogs/ext2fs/cmp_bitmaps.c
+++ b/e2fsprogs/ext2fs/cmp_bitmaps.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * cmp_bitmaps.c --- routines to compare inode and block bitmaps.
 *
diff --git a/e2fsprogs/ext2fs/dblist.c b/e2fsprogs/ext2fs/dblist.c
index aaac3b394..06ff6d807 100644
--- a/e2fsprogs/ext2fs/dblist.c
+++ b/e2fsprogs/ext2fs/dblist.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * dblist.c -- directory block list functions
 *
diff --git a/e2fsprogs/ext2fs/dblist_dir.c b/e2fsprogs/ext2fs/dblist_dir.c
index 20b1cde46..b23920466 100644
--- a/e2fsprogs/ext2fs/dblist_dir.c
+++ b/e2fsprogs/ext2fs/dblist_dir.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * dblist_dir.c --- iterate by directory entry
 *
diff --git a/e2fsprogs/ext2fs/dir_iterate.c b/e2fsprogs/ext2fs/dir_iterate.c
index df820feaa..b7d873595 100644
--- a/e2fsprogs/ext2fs/dir_iterate.c
+++ b/e2fsprogs/ext2fs/dir_iterate.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * dir_iterate.c --- ext2fs directory iteration operations
 *
diff --git a/e2fsprogs/ext2fs/dirblock.c b/e2fsprogs/ext2fs/dirblock.c
index 4f2bbc11f..43e8e6eb0 100644
--- a/e2fsprogs/ext2fs/dirblock.c
+++ b/e2fsprogs/ext2fs/dirblock.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * dirblock.c --- directory block routines.
 *
diff --git a/e2fsprogs/ext2fs/dirhash.c b/e2fsprogs/ext2fs/dirhash.c
index 39678a628..ab3243fd7 100644
--- a/e2fsprogs/ext2fs/dirhash.c
+++ b/e2fsprogs/ext2fs/dirhash.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * dirhash.c -- Calculate the hash of a directory entry
 *
diff --git a/e2fsprogs/ext2fs/dupfs.c b/e2fsprogs/ext2fs/dupfs.c
index 2009ef701..203c29fe3 100644
--- a/e2fsprogs/ext2fs/dupfs.c
+++ b/e2fsprogs/ext2fs/dupfs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * dupfs.c --- duplicate a ext2 filesystem handle
 *
diff --git a/e2fsprogs/ext2fs/e2image.h b/e2fsprogs/ext2fs/e2image.h
index c05d43e22..8d38ecc13 100644
--- a/e2fsprogs/ext2fs/e2image.h
+++ b/e2fsprogs/ext2fs/e2image.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * e2image.h --- header file describing the ext2 image format
 *
diff --git a/e2fsprogs/ext2fs/expanddir.c b/e2fsprogs/ext2fs/expanddir.c
index c148b93aa..8a29ae584 100644
--- a/e2fsprogs/ext2fs/expanddir.c
+++ b/e2fsprogs/ext2fs/expanddir.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * expand.c --- expand an ext2fs directory
 *
diff --git a/e2fsprogs/ext2fs/ext2_err.h b/e2fsprogs/ext2fs/ext2_err.h
index a2a506f9a..ead352810 100644
--- a/e2fsprogs/ext2fs/ext2_err.h
+++ b/e2fsprogs/ext2fs/ext2_err.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ext2_err.h:
 * This file is automatically generated; please do not edit it.
diff --git a/e2fsprogs/ext2fs/ext2_ext_attr.h b/e2fsprogs/ext2fs/ext2_ext_attr.h
index 79f23ee9a..cc91bb8d6 100644
--- a/e2fsprogs/ext2fs/ext2_ext_attr.h
+++ b/e2fsprogs/ext2fs/ext2_ext_attr.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  File: linux/ext2_ext_attr.h
diff --git a/e2fsprogs/ext2fs/ext2_fs.h b/e2fsprogs/ext2fs/ext2_fs.h
index 44b04beb7..cb49d7a60 100644
--- a/e2fsprogs/ext2fs/ext2_fs.h
+++ b/e2fsprogs/ext2fs/ext2_fs.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  linux/include/linux/ext2_fs.h
 *
diff --git a/e2fsprogs/ext2fs/ext2_io.h b/e2fsprogs/ext2fs/ext2_io.h
index 190f6c132..e6c9630e2 100644
--- a/e2fsprogs/ext2fs/ext2_io.h
+++ b/e2fsprogs/ext2fs/ext2_io.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * io.h --- the I/O manager abstraction
 *
diff --git a/e2fsprogs/ext2fs/ext2_types.h b/e2fsprogs/ext2fs/ext2_types.h
index ee9b980a2..2c1196b8b 100644
--- a/e2fsprogs/ext2fs/ext2_types.h
+++ b/e2fsprogs/ext2fs/ext2_types.h
@@ -1 +1,2 @@
+/* vi: set sw=4 ts=4: */
 #include <linux/types.h>
diff --git a/e2fsprogs/ext2fs/ext2fs.h b/e2fsprogs/ext2fs/ext2fs.h
index d5a0791eb..133fb1f1b 100644
--- a/e2fsprogs/ext2fs/ext2fs.h
+++ b/e2fsprogs/ext2fs/ext2fs.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ext2fs.h --- ext2fs
 *
diff --git a/e2fsprogs/ext2fs/ext2fsP.h b/e2fsprogs/ext2fs/ext2fsP.h
index 90b081232..908b5d9a4 100644
--- a/e2fsprogs/ext2fs/ext2fsP.h
+++ b/e2fsprogs/ext2fs/ext2fsP.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ext2fsP.h --- private header file for ext2 library
 *
diff --git a/e2fsprogs/ext2fs/ext2fs_inline.c b/e2fsprogs/ext2fs/ext2fs_inline.c
index 07805b10d..da1cf5be5 100644
--- a/e2fsprogs/ext2fs/ext2fs_inline.c
+++ b/e2fsprogs/ext2fs/ext2fs_inline.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ext2fs.h --- ext2fs
 *
diff --git a/e2fsprogs/ext2fs/ext_attr.c b/e2fsprogs/ext2fs/ext_attr.c
index ca9f9e20c..7ee41f234 100644
--- a/e2fsprogs/ext2fs/ext_attr.c
+++ b/e2fsprogs/ext2fs/ext_attr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ext_attr.c --- extended attribute blocks
 *
diff --git a/e2fsprogs/ext2fs/fileio.c b/e2fsprogs/ext2fs/fileio.c
index da349fea2..c56a21aa8 100644
--- a/e2fsprogs/ext2fs/fileio.c
+++ b/e2fsprogs/ext2fs/fileio.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * fileio.c --- Simple file I/O routines
 *
diff --git a/e2fsprogs/ext2fs/finddev.c b/e2fsprogs/ext2fs/finddev.c
index 552aa79c3..1261d1576 100644
--- a/e2fsprogs/ext2fs/finddev.c
+++ b/e2fsprogs/ext2fs/finddev.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * finddev.c -- this routine attempts to find a particular device in
 *      /dev
diff --git a/e2fsprogs/ext2fs/flushb.c b/e2fsprogs/ext2fs/flushb.c
index af7216a91..e42982653 100644
--- a/e2fsprogs/ext2fs/flushb.c
+++ b/e2fsprogs/ext2fs/flushb.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * flushb.c --- Hides system-dependent information for both syncing a
 *      device to disk and to flush any buffers from disk cache.
diff --git a/e2fsprogs/ext2fs/freefs.c b/e2fsprogs/ext2fs/freefs.c
index f0f7b3eec..65c4ee794 100644
--- a/e2fsprogs/ext2fs/freefs.c
+++ b/e2fsprogs/ext2fs/freefs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * freefs.c --- free an ext2 filesystem
 *
diff --git a/e2fsprogs/ext2fs/gen_bitmap.c b/e2fsprogs/ext2fs/gen_bitmap.c
index 3f15ce6a7..d0869c919 100644
--- a/e2fsprogs/ext2fs/gen_bitmap.c
+++ b/e2fsprogs/ext2fs/gen_bitmap.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * gen_bitmap.c --- Generic bitmap routines that used to be inlined.
 *
diff --git a/e2fsprogs/ext2fs/get_pathname.c b/e2fsprogs/ext2fs/get_pathname.c
index 18bb6d271..a98b2b9e5 100644
--- a/e2fsprogs/ext2fs/get_pathname.c
+++ b/e2fsprogs/ext2fs/get_pathname.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * get_pathname.c --- do directry/inode -> name translation
 *
diff --git a/e2fsprogs/ext2fs/getsectsize.c b/e2fsprogs/ext2fs/getsectsize.c
index 36871f236..163ec65e5 100644
--- a/e2fsprogs/ext2fs/getsectsize.c
+++ b/e2fsprogs/ext2fs/getsectsize.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * getsectsize.c --- get the sector size of a device.
 *
diff --git a/e2fsprogs/ext2fs/getsize.c b/e2fsprogs/ext2fs/getsize.c
index 552e542a6..516886c1f 100644
--- a/e2fsprogs/ext2fs/getsize.c
+++ b/e2fsprogs/ext2fs/getsize.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * getsize.c --- get the size of a partition.
 *
diff --git a/e2fsprogs/ext2fs/icount.c b/e2fsprogs/ext2fs/icount.c
index 7d0d63c91..521e00bb7 100644
--- a/e2fsprogs/ext2fs/icount.c
+++ b/e2fsprogs/ext2fs/icount.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * icount.c --- an efficient inode count abstraction
 *
diff --git a/e2fsprogs/ext2fs/imager.c b/e2fsprogs/ext2fs/imager.c
index ece66fc30..2f93cb417 100644
--- a/e2fsprogs/ext2fs/imager.c
+++ b/e2fsprogs/ext2fs/imager.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * image.c --- writes out the critical parts of the filesystem as a
 *      flat file.
diff --git a/e2fsprogs/ext2fs/ind_block.c b/e2fsprogs/ext2fs/ind_block.c
index 4728fe7b5..c86a1c59a 100644
--- a/e2fsprogs/ext2fs/ind_block.c
+++ b/e2fsprogs/ext2fs/ind_block.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ind_block.c --- indirect block I/O routines
 *
diff --git a/e2fsprogs/ext2fs/initialize.c b/e2fsprogs/ext2fs/initialize.c
index 3d326b577..ef1d34379 100644
--- a/e2fsprogs/ext2fs/initialize.c
+++ b/e2fsprogs/ext2fs/initialize.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * initialize.c --- initialize a filesystem handle given superblock
 *      parameters.  Used by mke2fs when initializing a filesystem.
diff --git a/e2fsprogs/ext2fs/inline.c b/e2fsprogs/ext2fs/inline.c
index 9c3a6c0d3..9b620a772 100644
--- a/e2fsprogs/ext2fs/inline.c
+++ b/e2fsprogs/ext2fs/inline.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * inline.c --- Includes the inlined functions defined in the header
 *      files as standalone functions, in case the application program
diff --git a/e2fsprogs/ext2fs/inode.c b/e2fsprogs/ext2fs/inode.c
index 88da4e02e..2ff9fe6ca 100644
--- a/e2fsprogs/ext2fs/inode.c
+++ b/e2fsprogs/ext2fs/inode.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * inode.c --- utility routines to read and write inodes
 *
diff --git a/e2fsprogs/ext2fs/inode_io.c b/e2fsprogs/ext2fs/inode_io.c
index deaa95562..4bfa93aef 100644
--- a/e2fsprogs/ext2fs/inode_io.c
+++ b/e2fsprogs/ext2fs/inode_io.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * inode_io.c --- This is allows an inode in an ext2 filesystem image
 *      to be accessed via the I/O manager interface.
diff --git a/e2fsprogs/ext2fs/io_manager.c b/e2fsprogs/ext2fs/io_manager.c
index 3d0987bc1..b47038602 100644
--- a/e2fsprogs/ext2fs/io_manager.c
+++ b/e2fsprogs/ext2fs/io_manager.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * io_manager.c --- the I/O manager abstraction
 */
diff --git a/e2fsprogs/ext2fs/irel.h b/e2fsprogs/ext2fs/irel.h
index 45e031beb..91d1d89d5 100644
--- a/e2fsprogs/ext2fs/irel.h
+++ b/e2fsprogs/ext2fs/irel.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * irel.h
 *
diff --git a/e2fsprogs/ext2fs/irel_ma.c b/e2fsprogs/ext2fs/irel_ma.c
index f4fe1e0f3..c871b1891 100644
--- a/e2fsprogs/ext2fs/irel_ma.c
+++ b/e2fsprogs/ext2fs/irel_ma.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * irel_ma.c
 *
diff --git a/e2fsprogs/ext2fs/ismounted.c b/e2fsprogs/ext2fs/ismounted.c
index 381194320..cace7715c 100644
--- a/e2fsprogs/ext2fs/ismounted.c
+++ b/e2fsprogs/ext2fs/ismounted.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ismounted.c --- Check to see if the filesystem was mounted
 *
diff --git a/e2fsprogs/ext2fs/jfs_dat.h b/e2fsprogs/ext2fs/jfs_dat.h
index 8ec5d3841..136635de0 100644
--- a/e2fsprogs/ext2fs/jfs_dat.h
+++ b/e2fsprogs/ext2fs/jfs_dat.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * jfs_dat.h --- stripped down header file which only contains the JFS
 *      on-disk data structures
diff --git a/e2fsprogs/ext2fs/kernel-jbd.h b/e2fsprogs/ext2fs/kernel-jbd.h
index 9074f3c78..4c6c7dedd 100644
--- a/e2fsprogs/ext2fs/kernel-jbd.h
+++ b/e2fsprogs/ext2fs/kernel-jbd.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * linux/include/linux/jbd.h
 *
diff --git a/e2fsprogs/ext2fs/kernel-list.h b/e2fsprogs/ext2fs/kernel-list.h
index fa62ff138..3392596ca 100644
--- a/e2fsprogs/ext2fs/kernel-list.h
+++ b/e2fsprogs/ext2fs/kernel-list.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef _LINUX_LIST_H
 #define _LINUX_LIST_H
diff --git a/e2fsprogs/ext2fs/link.c b/e2fsprogs/ext2fs/link.c
index 6fb307638..08b2e9673 100644
--- a/e2fsprogs/ext2fs/link.c
+++ b/e2fsprogs/ext2fs/link.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * link.c --- create links in a ext2fs directory
 *
diff --git a/e2fsprogs/ext2fs/lookup.c b/e2fsprogs/ext2fs/lookup.c
index 76c5ac871..31b30a182 100644
--- a/e2fsprogs/ext2fs/lookup.c
+++ b/e2fsprogs/ext2fs/lookup.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * lookup.c --- ext2fs directory lookup operations
 *
diff --git a/e2fsprogs/ext2fs/mkdir.c b/e2fsprogs/ext2fs/mkdir.c
index c3c03711c..b63c5d7a6 100644
--- a/e2fsprogs/ext2fs/mkdir.c
+++ b/e2fsprogs/ext2fs/mkdir.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * mkdir.c --- make a directory in the filesystem
 *
diff --git a/e2fsprogs/ext2fs/mkjournal.c b/e2fsprogs/ext2fs/mkjournal.c
index 47a459055..c23ed9021 100644
--- a/e2fsprogs/ext2fs/mkjournal.c
+++ b/e2fsprogs/ext2fs/mkjournal.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * mkjournal.c --- make a journal for a filesystem
 *
diff --git a/e2fsprogs/ext2fs/namei.c b/e2fsprogs/ext2fs/namei.c
index 2c372f4e2..988967009 100644
--- a/e2fsprogs/ext2fs/namei.c
+++ b/e2fsprogs/ext2fs/namei.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * namei.c --- ext2fs directory lookup operations
 *
diff --git a/e2fsprogs/ext2fs/newdir.c b/e2fsprogs/ext2fs/newdir.c
index 27c718ea5..9470e7f56 100644
--- a/e2fsprogs/ext2fs/newdir.c
+++ b/e2fsprogs/ext2fs/newdir.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * newdir.c --- create a new directory block
 *
diff --git a/e2fsprogs/ext2fs/openfs.c b/e2fsprogs/ext2fs/openfs.c
index 646ec4d30..716be060f 100644
--- a/e2fsprogs/ext2fs/openfs.c
+++ b/e2fsprogs/ext2fs/openfs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * openfs.c --- open an ext2 filesystem
 *
diff --git a/e2fsprogs/ext2fs/read_bb.c b/e2fsprogs/ext2fs/read_bb.c
index 7612e674f..4766157c2 100644
--- a/e2fsprogs/ext2fs/read_bb.c
+++ b/e2fsprogs/ext2fs/read_bb.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * read_bb --- read the bad blocks inode
 *
diff --git a/e2fsprogs/ext2fs/read_bb_file.c b/e2fsprogs/ext2fs/read_bb_file.c
index f7851f143..831adcc3a 100644
--- a/e2fsprogs/ext2fs/read_bb_file.c
+++ b/e2fsprogs/ext2fs/read_bb_file.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * read_bb_file.c --- read a list of bad blocks from a FILE *
 *
diff --git a/e2fsprogs/ext2fs/res_gdt.c b/e2fsprogs/ext2fs/res_gdt.c
index 6a416b6df..f7ee8b1fb 100644
--- a/e2fsprogs/ext2fs/res_gdt.c
+++ b/e2fsprogs/ext2fs/res_gdt.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * res_gdt.c --- reserve blocks for growing the group descriptor table
 *               during online resizing.
diff --git a/e2fsprogs/ext2fs/rs_bitmap.c b/e2fsprogs/ext2fs/rs_bitmap.c
index c2e51e021..e932b3c9d 100644
--- a/e2fsprogs/ext2fs/rs_bitmap.c
+++ b/e2fsprogs/ext2fs/rs_bitmap.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * rs_bitmap.c --- routine for changing the size of a bitmap
 *
diff --git a/e2fsprogs/ext2fs/rw_bitmaps.c b/e2fsprogs/ext2fs/rw_bitmaps.c
index 50f2a9447..a5782db95 100644
--- a/e2fsprogs/ext2fs/rw_bitmaps.c
+++ b/e2fsprogs/ext2fs/rw_bitmaps.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * rw_bitmaps.c --- routines to read and write the  inode and block bitmaps.
 *
diff --git a/e2fsprogs/ext2fs/sparse.c b/e2fsprogs/ext2fs/sparse.c
index 90b028f09..b3d3071e9 100644
--- a/e2fsprogs/ext2fs/sparse.c
+++ b/e2fsprogs/ext2fs/sparse.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * sparse.c --- find the groups in an ext2 filesystem with metadata backups
 *
diff --git a/e2fsprogs/ext2fs/swapfs.c b/e2fsprogs/ext2fs/swapfs.c
index 0c0180613..2fca3cfbb 100644
--- a/e2fsprogs/ext2fs/swapfs.c
+++ b/e2fsprogs/ext2fs/swapfs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * swapfs.c --- swap ext2 filesystem data structures
 *
diff --git a/e2fsprogs/ext2fs/test_io.c b/e2fsprogs/ext2fs/test_io.c
index 45f9090cb..fb029e2f1 100644
--- a/e2fsprogs/ext2fs/test_io.c
+++ b/e2fsprogs/ext2fs/test_io.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * test_io.c --- This is the Test I/O interface.
 *
diff --git a/e2fsprogs/ext2fs/unix_io.c b/e2fsprogs/ext2fs/unix_io.c
index 69d01f49b..474f07340 100644
--- a/e2fsprogs/ext2fs/unix_io.c
+++ b/e2fsprogs/ext2fs/unix_io.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * unix_io.c --- This is the Unix (well, really POSIX) implementation
 *      of the I/O manager.
diff --git a/e2fsprogs/ext2fs/unlink.c b/e2fsprogs/ext2fs/unlink.c
index 6ad3c4e3a..83ac2713e 100644
--- a/e2fsprogs/ext2fs/unlink.c
+++ b/e2fsprogs/ext2fs/unlink.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * unlink.c --- delete links in a ext2fs directory
 *
diff --git a/e2fsprogs/ext2fs/valid_blk.c b/e2fsprogs/ext2fs/valid_blk.c
index d0367e71c..8ed77ae2a 100644
--- a/e2fsprogs/ext2fs/valid_blk.c
+++ b/e2fsprogs/ext2fs/valid_blk.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * valid_blk.c --- does the inode have valid blocks?
 *
diff --git a/e2fsprogs/ext2fs/version.c b/e2fsprogs/ext2fs/version.c
index f7026af32..882e121d4 100644
--- a/e2fsprogs/ext2fs/version.c
+++ b/e2fsprogs/ext2fs/version.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * version.c --- Return the version of the ext2 library
 *
diff --git a/e2fsprogs/ext2fs/write_bb_file.c b/e2fsprogs/ext2fs/write_bb_file.c
index 269b576b2..5b19eefa0 100644
--- a/e2fsprogs/ext2fs/write_bb_file.c
+++ b/e2fsprogs/ext2fs/write_bb_file.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * write_bb_file.c --- write a list of bad blocks to a FILE *
 *
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index 54e8597d4..3290d00ef 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * pfsck --- A generic, parallelizing front-end for the fsck program.
 * It will automatically try to run fsck programs in parallel if the
diff --git a/e2fsprogs/fsck.h b/e2fsprogs/fsck.h
index 12748a121..2ca2af7da 100644
--- a/e2fsprogs/fsck.h
+++ b/e2fsprogs/fsck.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * fsck.h
 */
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index 1f2176600..5c20d25f3 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * lsattr.c             - List file attributes on an ext2 file system
 *
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c
index 22e4d2578..f1e40832d 100644
--- a/e2fsprogs/mke2fs.c
+++ b/e2fsprogs/mke2fs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * mke2fs.c - Make a ext2fs filesystem.
 *
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 521e49874..8ec346108 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * tune2fs.c - Change the file system parameters on an ext2 file system
 *
diff --git a/e2fsprogs/util.c b/e2fsprogs/util.c
index 151af3211..6b72d0e0c 100644
--- a/e2fsprogs/util.c
+++ b/e2fsprogs/util.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * util.c --- helper functions used by tune2fs and mke2fs
 *
diff --git a/e2fsprogs/util.h b/e2fsprogs/util.h
index 5041046c7..80d241718 100644
--- a/e2fsprogs/util.h
+++ b/e2fsprogs/util.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * util.h --- header file defining prototypes for helper functions
 * used by tune2fs and mke2fs
diff --git a/e2fsprogs/uuid/compare.c b/e2fsprogs/uuid/compare.c
index 94c32b1d3..2be9e90a3 100644
--- a/e2fsprogs/uuid/compare.c
+++ b/e2fsprogs/uuid/compare.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * compare.c --- compare whether or not two UUID's are the same
 *
diff --git a/e2fsprogs/uuid/gen_uuid.c b/e2fsprogs/uuid/gen_uuid.c
index 24eb852ef..e5c0f0d53 100644
--- a/e2fsprogs/uuid/gen_uuid.c
+++ b/e2fsprogs/uuid/gen_uuid.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * gen_uuid.c --- generate a DCE-compatible uuid
 *
diff --git a/e2fsprogs/uuid/pack.c b/e2fsprogs/uuid/pack.c
index 9d733f000..217cfce5d 100644
--- a/e2fsprogs/uuid/pack.c
+++ b/e2fsprogs/uuid/pack.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Internal routine for packing UUID's
 *
diff --git a/e2fsprogs/uuid/parse.c b/e2fsprogs/uuid/parse.c
index 21b29498e..9a3f9cb92 100644
--- a/e2fsprogs/uuid/parse.c
+++ b/e2fsprogs/uuid/parse.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * parse.c --- UUID parsing
 *
diff --git a/e2fsprogs/uuid/unpack.c b/e2fsprogs/uuid/unpack.c
index 8f9c520c1..95d3aab4a 100644
--- a/e2fsprogs/uuid/unpack.c
+++ b/e2fsprogs/uuid/unpack.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Internal routine for unpacking UUID
 *
diff --git a/e2fsprogs/uuid/unparse.c b/e2fsprogs/uuid/unparse.c
index a95bbb042..d2948fe6d 100644
--- a/e2fsprogs/uuid/unparse.c
+++ b/e2fsprogs/uuid/unparse.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * unparse.c -- convert a UUID to string
 *
diff --git a/e2fsprogs/uuid/uuid.h b/e2fsprogs/uuid/uuid.h
index 95602c9db..bd53b15d0 100644
--- a/e2fsprogs/uuid/uuid.h
+++ b/e2fsprogs/uuid/uuid.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Public include file for the UUID library
 *
diff --git a/e2fsprogs/uuid/uuidP.h b/e2fsprogs/uuid/uuidP.h
index 9d30ce2f8..87041ef0a 100644
--- a/e2fsprogs/uuid/uuidP.h
+++ b/e2fsprogs/uuid/uuidP.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * uuid.h -- private header file for uuids
 *
diff --git a/e2fsprogs/uuid/uuid_time.c b/e2fsprogs/uuid/uuid_time.c
index 51f87de22..df91ec376 100644
--- a/e2fsprogs/uuid/uuid_time.c
+++ b/e2fsprogs/uuid/uuid_time.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * uuid_time.c --- Interpret the time field from a uuid.  This program
 *      violates the UUID abstraction barrier by reaching into the guts
diff --git a/editors/vi.c b/editors/vi.c
index a890ad9d3..e0047e49e 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -13,7 +13,6 @@
 *      add magic to search     /foo.*bar
 *      add :help command
 *      :map macros
- *      how about mode lines:   vi: set sw=8 ts=8:
 *      if mark[] values were line numbers rather than pointers
 *         it would be easier to change the mark when add/delete lines
 *      More intelligence in refresh()
diff --git a/examples/depmod.pl b/examples/depmod.pl
index f6d4df85c..93c0b3dab 100755
--- a/examples/depmod.pl
+++ b/examples/depmod.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# vi: set ts=4:
+# vi: set sw=4 ts=4:
 # Copyright (c) 2001 David Schleef <ds@schleef.org>
 # Copyright (c) 2001 Erik Andersen <andersen@codepoet.org>
 # Copyright (c) 2001 Stuart Hughes <seh@zee2.com>
diff --git a/include/applets.h b/include/applets.h
index f07d005cb..07f9aabf2 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * applets.h - a listing of all busybox applets.
 *
diff --git a/include/dump.h b/include/dump.h
index 3f4b480b2..e8a96ef87 100644
--- a/include/dump.h
+++ b/include/dump.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #define F_IGNORE        0x01            /* %_A */
 #define F_SETREP        0x02            /* rep count set, not default */
 #define F_ADDRESS       0x001           /* print offset */
diff --git a/include/grp_.h b/include/grp_.h
index b212b0b4a..3ac5c8461 100644
--- a/include/grp_.h
+++ b/include/grp_.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* Copyright (C) 1991,92,95,96,97,98,99,2000,01 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
diff --git a/include/inet_common.h b/include/inet_common.h
index aa883ed3e..680d441d2 100644
--- a/include/inet_common.h
+++ b/include/inet_common.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * stolen from net-tools-1.59 and stripped down for busybox by
 *                      Erik Andersen <andersen@codepoet.org>
diff --git a/include/pwd_.h b/include/pwd_.h
index 72151203e..d161c0e8f 100644
--- a/include/pwd_.h
+++ b/include/pwd_.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* Copyright (C) 1991,92,95,96,97,98,99,2001 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
diff --git a/include/shadow_.h b/include/shadow_.h
index 29c99f8e2..177ee5f93 100644
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
diff --git a/include/usage.h b/include/usage.h
index 3e957092a..3c1fb18e9 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __BB_USAGE_H__
 #define __BB_USAGE_H__
diff --git a/libbb/bb_asprintf.c b/libbb/bb_asprintf.c
index 191417a2d..51896ddd6 100644
--- a/libbb/bb_asprintf.c
+++ b/libbb/bb_asprintf.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
   Copyright (C) 2002,2005 Vladimir Oleynik <dzo@simtreas.ru>
 */
diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index d379feea4..cac93d995 100644
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -1,4 +1,4 @@
-/* vi:set ts=4:*/
+/* vi: set sw=4 ts=4: */
 /*
 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
diff --git a/libbb/dump.c b/libbb/dump.c
index 283cba19a..f1d5df2d6 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Support code for the hexdump and od applets,
 * based on code from util-linux v 2.11l
diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index cf029c0a2..115fde744 100644
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * June 30, 2001                 Manuel Novoa III
 *
diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index d9e545148..feb0c42f3 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * stolen from net-tools-1.59 and stripped down for busybox by
 *                      Erik Andersen <andersen@codepoet.org>
diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index 9bd70996c..9bf0bee5f 100644
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * busybox library eXtended function
 *
diff --git a/libbb/login.c b/libbb/login.c
index 0abc9dced..7c1cad3f2 100644
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * issue.c: issue printing code
 *
diff --git a/libbb/md5.c b/libbb/md5.c
index 58be40b6a..5ad65804a 100644
--- a/libbb/md5.c
+++ b/libbb/md5.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  md5.c - Compute MD5 checksum of strings according to the
 *          definition of MD5 in RFC 1321 from April 1992.
diff --git a/libbb/qmodule.c b/libbb/qmodule.c
index fd14d10fa..4e4e79d38 100644
--- a/libbb/qmodule.c
+++ b/libbb/qmodule.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
   Copyright (C) 2002 Tim Riker <Tim@Rikers.org>
   everyone seems to claim it someplace. ;-)
diff --git a/libbb/sha1.c b/libbb/sha1.c
index dd4009834..31b55b1da 100644
--- a/libbb/sha1.c
+++ b/libbb/sha1.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  Based on shasum from http://www.netsw.org/crypto/hash/
 *  Majorly hacked up to use Dr Brian Gladman's sha1 code
diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c
index 1fcdba198..f6cfb34a7 100644
--- a/libbb/xgetcwd.c
+++ b/libbb/xgetcwd.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * xgetcwd.c -- return current directory with unlimited length
 * Copyright (C) 1992, 1996 Free Software Foundation, Inc.
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index c7227d1dd..14863d9d5 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  xreadlink.c - safe implementation of readlink.
 *  Returns a NULL on failure...
diff --git a/libbb/xstat.c b/libbb/xstat.c
index ca6686403..2a6cc3ed7 100644
--- a/libbb/xstat.c
+++ b/libbb/xstat.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * xstat.c - a stat() which dies on failure with meaningful error message
 */
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index a09b5a6c0..132ec60be 100644
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*  Copyright (C) 2003     Manuel Novoa III
 *
 *  Licensed under GPL v2, or later.  See file LICENSE in this tarball.
diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c
index 9cb1d306a..39c11f677 100644
--- a/libpwdgrp/pwd_grp_internal.c
+++ b/libpwdgrp/pwd_grp_internal.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*  Copyright (C) 2003     Manuel Novoa III
 *
 *  Licensed under GPL v2, or later.  See file LICENSE in this tarball.
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 9853067ee..c8af688a4 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
        devfsd implementation for busybox
diff --git a/networking/inetd.c b/networking/inetd.c
index b9ff4de4d..d50bbd39a 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*      $Slackware: inetd.c 1.79s 2001/02/06 13:18:00 volkerdi Exp $    */
 /*      $OpenBSD: inetd.c,v 1.79 2001/01/30 08:30:57 deraadt Exp $      */
 /*      $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $       */
@@ -1801,4 +1802,3 @@ daytime_dg (int s, servtab_t *sep ATTRIBUTE_UNUSED)
  (void) sendto (s, buffer, strlen (buffer), 0, &sa, sizeof (sa));
 }
 #endif /* CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME */
-/* vi: set sw=4 ts=4: */
diff --git a/networking/interface.c b/networking/interface.c
index a666c2ef4..c3cc7c0bc 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * stolen from net-tools-1.59 and stripped down for busybox by
 *                      Erik Andersen <andersen@codepoet.org>
diff --git a/networking/ip.c b/networking/ip.c
index d44cc0d60..fe5714f16 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ip.c         "ip" utility frontend.
 *
diff --git a/networking/ipaddr.c b/networking/ipaddr.c
index 431755770..c90780879 100644
--- a/networking/ipaddr.c
+++ b/networking/ipaddr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ip.c         "ip" utility frontend.
 *
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 8c61e3a71..9838fcfda 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -1,4 +1,4 @@
-/* vi: set sw=4 ts=4 ai: */
+/* vi: set sw=4 ts=4: */
 /*
 * Mini ipcalc implementation for busybox
 *
diff --git a/networking/iplink.c b/networking/iplink.c
index 2f13aff68..4a28c74a9 100644
--- a/networking/iplink.c
+++ b/networking/iplink.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ip.c         "ip" utility frontend.
 *
diff --git a/networking/iproute.c b/networking/iproute.c
index ce58d62e2..62335a8b3 100644
--- a/networking/iproute.c
+++ b/networking/iproute.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ip.c         "ip" utility frontend.
 *
diff --git a/networking/iptunnel.c b/networking/iptunnel.c
index feff1fc9c..9ae734a21 100644
--- a/networking/iptunnel.c
+++ b/networking/iptunnel.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ip.c         "ip" utility frontend.
 *
diff --git a/networking/libiproute/ip_common.h b/networking/libiproute/ip_common.h
index d594778e8..cc4b3aa01 100644
--- a/networking/libiproute/ip_common.h
+++ b/networking/libiproute/ip_common.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef _IP_COMMON_H
 #define _IP_COMMON_H 1
diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c
index 6d4915775..e7084fbc6 100644
--- a/networking/libiproute/ip_parse_common_args.c
+++ b/networking/libiproute/ip_parse_common_args.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ip.c         "ip" utility frontend.
 *
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index ee9825ba2..262d3e356 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ipaddress.c          "ip address".
 *
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 9e30122c3..1948efe37 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * iplink.c             "ip link".
 *
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 9b96920dc..4524d4954 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * iptunnel.c          "ip tunnel"
 *
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index 93d6d67f0..de11d9dac 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * libnetlink.c RTnetlink service routines.
 *
diff --git a/networking/libiproute/libnetlink.h b/networking/libiproute/libnetlink.h
index c8a8b783c..c2ef984c4 100644
--- a/networking/libiproute/libnetlink.h
+++ b/networking/libiproute/libnetlink.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __LIBNETLINK_H__
 #define __LIBNETLINK_H__ 1
diff --git a/networking/libiproute/linux/pkt_sched.h b/networking/libiproute/linux/pkt_sched.h
index ec5b3fddd..d6cf1fc06 100644
--- a/networking/libiproute/linux/pkt_sched.h
+++ b/networking/libiproute/linux/pkt_sched.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __LINUX_PKT_SCHED_H
 #define __LINUX_PKT_SCHED_H
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index bb89a45a8..6c147deca 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ll_addr.c
 *
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index 0ac5ea956..48775122c 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ll_map.c
 *
diff --git a/networking/libiproute/ll_map.h b/networking/libiproute/ll_map.h
index 739f157e7..226d48fc2 100644
--- a/networking/libiproute/ll_map.h
+++ b/networking/libiproute/ll_map.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __LL_MAP_H__
 #define __LL_MAP_H__ 1
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 2319530ad..f026ab7e6 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ll_proto.c
 *
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c
index a38ecc7c0..a53c89432 100644
--- a/networking/libiproute/ll_types.c
+++ b/networking/libiproute/ll_types.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ll_types.c
 *
diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c
index 9d47491bc..5181ba4b7 100644
--- a/networking/libiproute/rt_names.c
+++ b/networking/libiproute/rt_names.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * rt_names.c           rtnetlink names DB.
 *
diff --git a/networking/libiproute/rt_names.h b/networking/libiproute/rt_names.h
index deb5aa6f4..41afeed63 100644
--- a/networking/libiproute/rt_names.h
+++ b/networking/libiproute/rt_names.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef RT_NAMES_H_
 #define RT_NAMES_H_ 1
diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c
index 5f6a9e69c..8aaee4bd7 100644
--- a/networking/libiproute/rtm_map.c
+++ b/networking/libiproute/rtm_map.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * rtm_map.c
 *
diff --git a/networking/libiproute/rtm_map.h b/networking/libiproute/rtm_map.h
index 70bda7d05..1ffb940b9 100644
--- a/networking/libiproute/rtm_map.h
+++ b/networking/libiproute/rtm_map.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __RTM_MAP_H__
 #define __RTM_MAP_H__ 1
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index 16ac30070..094a3b0ac 100644
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * utils.c
 *
diff --git a/networking/libiproute/utils.h b/networking/libiproute/utils.h
index 67631234e..0b0d7545a 100644
--- a/networking/libiproute/utils.h
+++ b/networking/libiproute/utils.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef __UTILS_H__
 #define __UTILS_H__ 1
diff --git a/networking/nameif.c b/networking/nameif.c
index 3d53d6f15..f13ef1b8b 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * nameif.c - Naming Interfaces based on MAC address for busybox.
 *
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index b029af9bf..97dfcc185 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * arpping.c
 *
diff --git a/networking/udhcp/arpping.h b/networking/udhcp/arpping.h
index 30959ca99..2990e30f6 100644
--- a/networking/udhcp/arpping.h
+++ b/networking/udhcp/arpping.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * arpping .h
 */
diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c
index 14e6c6678..82975700c 100644
--- a/networking/udhcp/clientpacket.c
+++ b/networking/udhcp/clientpacket.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* clientpacket.c
 *
 * Packet generation and dispatching functions for the DHCP client.
diff --git a/networking/udhcp/clientpacket.h b/networking/udhcp/clientpacket.h
index 8e5441bc7..b9b9a668f 100644
--- a/networking/udhcp/clientpacket.h
+++ b/networking/udhcp/clientpacket.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef _CLIENTPACKET_H
 #define _CLIENTPACKET_H
diff --git a/networking/udhcp/clientsocket.c b/networking/udhcp/clientsocket.c
index 5d08421b3..a1c4eadab 100644
--- a/networking/udhcp/clientsocket.c
+++ b/networking/udhcp/clientsocket.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * clientsocket.c -- DHCP client socket creation
 *
diff --git a/networking/udhcp/clientsocket.h b/networking/udhcp/clientsocket.h
index 17a55c154..ea6078397 100644
--- a/networking/udhcp/clientsocket.h
+++ b/networking/udhcp/clientsocket.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* clientsocket.h */
 #ifndef _CLIENTSOCKET_H
 #define _CLIENTSOCKET_H
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 77e689446..eb73c2162 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* common.h
 *
 * Russ Dill <Russ.Dill@asu.edu> September 2001
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 8c795bc62..989759ab8 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* dhcpc.c
 *
 * udhcp DHCP client
diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h
index 7c93f4232..42af0a367 100644
--- a/networking/udhcp/dhcpc.h
+++ b/networking/udhcp/dhcpc.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* dhcpc.h */
 #ifndef _DHCPC_H
 #define _DHCPC_H
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 29ca06a68..b481e6ef2 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* dhcpd.c
 *
 * udhcp Server
diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h
index 37ebbe326..dc8f3c427 100644
--- a/networking/udhcp/dhcpd.h
+++ b/networking/udhcp/dhcpd.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* dhcpd.h */
 #ifndef _DHCPD_H
 #define _DHCPD_H
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index d2ca2363f..a0a3bfcd8 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * files.c -- DHCP server file manipulation *
 * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
diff --git a/networking/udhcp/files.h b/networking/udhcp/files.h
index 03acee2fc..884693117 100644
--- a/networking/udhcp/files.h
+++ b/networking/udhcp/files.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* files.h */
 #ifndef _FILES_H
 #define _FILES_H
diff --git a/networking/udhcp/frontend.c b/networking/udhcp/frontend.c
index fa77ab977..0f072b9f5 100644
--- a/networking/udhcp/frontend.c
+++ b/networking/udhcp/frontend.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include <string.h>
 extern int udhcpd_main(int argc, char *argv[]);
diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index bb08c3adb..4c69c1f93 100644
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * leases.c -- tools to manage DHCP leases
 * Russ Dill <Russ.Dill@asu.edu> July 2001
diff --git a/networking/udhcp/leases.h b/networking/udhcp/leases.h
index b13fa72d3..8dba65e29 100644
--- a/networking/udhcp/leases.h
+++ b/networking/udhcp/leases.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* leases.h */
 #ifndef _LEASES_H
 #define _LEASES_H
diff --git a/networking/udhcp/libbb_udhcp.h b/networking/udhcp/libbb_udhcp.h
index c47af2d0a..3cf2d1401 100644
--- a/networking/udhcp/libbb_udhcp.h
+++ b/networking/udhcp/libbb_udhcp.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* libbb_udhcp.h - busybox compatibility wrapper */
 /* bit of a hack, do this no matter what the order of the includes.
diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c
index 0657b3239..02c251083 100644
--- a/networking/udhcp/options.c
+++ b/networking/udhcp/options.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * options.c -- DHCP server option packet tools
 * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
diff --git a/networking/udhcp/options.h b/networking/udhcp/options.h
index 4948bac00..b0a649fef 100644
--- a/networking/udhcp/options.h
+++ b/networking/udhcp/options.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* options.h */
 #ifndef _OPTIONS_H
 #define _OPTIONS_H
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 1bdade7e5..67a452dbc 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include <unistd.h>
 #include <string.h>
 #include <netinet/in.h>
diff --git a/networking/udhcp/packet.h b/networking/udhcp/packet.h
index f595422e4..0257a2ca9 100644
--- a/networking/udhcp/packet.h
+++ b/networking/udhcp/packet.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef _PACKET_H
 #define _PACKET_H
diff --git a/networking/udhcp/pidfile.c b/networking/udhcp/pidfile.c
index 7a956fb47..b837270fb 100644
--- a/networking/udhcp/pidfile.c
+++ b/networking/udhcp/pidfile.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* pidfile.c
 *
 * Functions to assist in the writing and removing of pidfiles.
diff --git a/networking/udhcp/pidfile.h b/networking/udhcp/pidfile.h
index ea97d1de5..38c849305 100644
--- a/networking/udhcp/pidfile.h
+++ b/networking/udhcp/pidfile.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* pidfile.h
 *
 * Functions to assist in the writing and removing of pidfiles.
diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c
index d1b272de6..8c4933455 100644
--- a/networking/udhcp/script.c
+++ b/networking/udhcp/script.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* script.c
 *
 * Functions to call the DHCP client notification scripts
diff --git a/networking/udhcp/serverpacket.c b/networking/udhcp/serverpacket.c
index e40432ebe..8c7b1642a 100644
--- a/networking/udhcp/serverpacket.c
+++ b/networking/udhcp/serverpacket.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* serverpacket.c
 *
 * Construct and send DHCP server packets
diff --git a/networking/udhcp/serverpacket.h b/networking/udhcp/serverpacket.h
index 902492895..20e1d5d2b 100644
--- a/networking/udhcp/serverpacket.h
+++ b/networking/udhcp/serverpacket.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef _SERVERPACKET_H
 #define _SERVERPACKET_H
diff --git a/networking/udhcp/signalpipe.c b/networking/udhcp/signalpipe.c
index e973ff6b2..9951eb57d 100644
--- a/networking/udhcp/signalpipe.c
+++ b/networking/udhcp/signalpipe.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* signalpipe.c
 *
 * Signal pipe infrastructure. A reliable way of delivering signals.
diff --git a/networking/udhcp/signalpipe.h b/networking/udhcp/signalpipe.h
index 70c1e5715..1621d5772 100644
--- a/networking/udhcp/signalpipe.h
+++ b/networking/udhcp/signalpipe.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* signalpipe.h
 *
 * Russ Dill <Russ.Dill@asu.edu> December 2003
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 6417267ec..2d253c1f2 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * socket.c -- DHCP server client/server socket creation
 *
diff --git a/networking/udhcp/socket.h b/networking/udhcp/socket.h
index 66179d4f5..23bffa16d 100644
--- a/networking/udhcp/socket.h
+++ b/networking/udhcp/socket.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* socket.h */
 #ifndef _SOCKET_H
 #define _SOCKET_H
diff --git a/networking/udhcp/static_leases.c b/networking/udhcp/static_leases.c
index 524798316..0d962c56e 100644
--- a/networking/udhcp/static_leases.c
+++ b/networking/udhcp/static_leases.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * static_leases.c -- Couple of functions to assist with storing and
 * retrieving data for static leases
diff --git a/networking/udhcp/static_leases.h b/networking/udhcp/static_leases.h
index 81708ffea..b23bbcfff 100644
--- a/networking/udhcp/static_leases.h
+++ b/networking/udhcp/static_leases.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* static_leases.h */
 #ifndef _STATIC_LEASES_H
 #define _STATIC_LEASES_H
diff --git a/networking/zcip.c b/networking/zcip.c
index 836cb78b2..5e1067377 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * RFC3927 ZeroConf IPv4 Link-Local addressing
 * (see <http://www.zeroconf.org/>)
diff --git a/scripts/bb_mkdep.c b/scripts/bb_mkdep.c
index 0c0b09dac..39d4605af 100644
--- a/scripts/bb_mkdep.c
+++ b/scripts/bb_mkdep.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Another fast dependencies generator for Makefiles, Version 4.2
 *
diff --git a/scripts/config/conf.c b/scripts/config/conf.c
index 4d804cfa3..2da5ff7a7 100644
--- a/scripts/config/conf.c
+++ b/scripts/config/conf.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index 30517020d..db3fdcd56 100644
--- a/scripts/config/confdata.c
+++ b/scripts/config/confdata.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
diff --git a/scripts/config/expr.c b/scripts/config/expr.c
index 6f39e7a25..125573e77 100644
--- a/scripts/config/expr.c
+++ b/scripts/config/expr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
diff --git a/scripts/config/expr.h b/scripts/config/expr.h
index 7d39ff43e..de7332f64 100644
--- a/scripts/config/expr.h
+++ b/scripts/config/expr.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
diff --git a/scripts/config/lkc.h b/scripts/config/lkc.h
index b8a67fc9d..8c38f1f87 100644
--- a/scripts/config/lkc.h
+++ b/scripts/config/lkc.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
diff --git a/scripts/config/lkc_proto.h b/scripts/config/lkc_proto.h
index 6dc6d0c48..c416357df 100644
--- a/scripts/config/lkc_proto.h
+++ b/scripts/config/lkc_proto.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* confdata.c */
 P(conf_parse,void,(const char *name));
diff --git a/scripts/config/lxdialog/checklist.c b/scripts/config/lxdialog/checklist.c
index 7565b5db1..1513a8966 100644
--- a/scripts/config/lxdialog/checklist.c
+++ b/scripts/config/lxdialog/checklist.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  checklist.c -- implements the checklist box
 *
diff --git a/scripts/config/lxdialog/colors.h b/scripts/config/lxdialog/colors.h
index d34dd37c6..4a2d06421 100644
--- a/scripts/config/lxdialog/colors.h
+++ b/scripts/config/lxdialog/colors.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  colors.h -- color attribute definitions
 *
diff --git a/scripts/config/lxdialog/dialog.h b/scripts/config/lxdialog/dialog.h
index c103ecd23..236a68dce 100644
--- a/scripts/config/lxdialog/dialog.h
+++ b/scripts/config/lxdialog/dialog.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  dialog.h -- common declarations for all dialog modules
diff --git a/scripts/config/lxdialog/inputbox.c b/scripts/config/lxdialog/inputbox.c
index 074d2d68b..a42f8127d 100644
--- a/scripts/config/lxdialog/inputbox.c
+++ b/scripts/config/lxdialog/inputbox.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  inputbox.c -- implements the input box
 *
diff --git a/scripts/config/lxdialog/menubox.c b/scripts/config/lxdialog/menubox.c
index d0990c34e..23a38e0fb 100644
--- a/scripts/config/lxdialog/menubox.c
+++ b/scripts/config/lxdialog/menubox.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  menubox.c -- implements the menu box
 *
diff --git a/scripts/config/lxdialog/msgbox.c b/scripts/config/lxdialog/msgbox.c
index de0f32bf0..a13bcbafb 100644
--- a/scripts/config/lxdialog/msgbox.c
+++ b/scripts/config/lxdialog/msgbox.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  msgbox.c -- implements the message box and info box
 *
diff --git a/scripts/config/lxdialog/textbox.c b/scripts/config/lxdialog/textbox.c
index b75e12a3e..aa7f5afe2 100644
--- a/scripts/config/lxdialog/textbox.c
+++ b/scripts/config/lxdialog/textbox.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  textbox.c -- implements the text box
 *
diff --git a/scripts/config/lxdialog/util.c b/scripts/config/lxdialog/util.c
index 1e4b662c0..bb43c836e 100644
--- a/scripts/config/lxdialog/util.c
+++ b/scripts/config/lxdialog/util.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  util.c
 *
diff --git a/scripts/config/lxdialog/yesno.c b/scripts/config/lxdialog/yesno.c
index 11fcc25f5..98562d8a9 100644
--- a/scripts/config/lxdialog/yesno.c
+++ b/scripts/config/lxdialog/yesno.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  yesno.c -- implements the yes/no box
 *
diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c
index 74afb65a0..b2fb112f5 100644
--- a/scripts/config/mconf.c
+++ b/scripts/config/mconf.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
diff --git a/scripts/config/menu.c b/scripts/config/menu.c
index 0c13156f3..57292cf1d 100644
--- a/scripts/config/menu.c
+++ b/scripts/config/menu.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
diff --git a/scripts/config/symbol.c b/scripts/config/symbol.c
index ea629728a..aeea4cc9f 100644
--- a/scripts/config/symbol.c
+++ b/scripts/config/symbol.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
diff --git a/scripts/config/util.c b/scripts/config/util.c
index a72f5ea66..dbf23edef 100644
--- a/scripts/config/util.c
+++ b/scripts/config/util.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Copyright (C) 2002-2005 Roman Zippel <zippel@linux-m68k.org>
 * Copyright (C) 2002-2005 Sam Ravnborg <sam@ravnborg.org>
diff --git a/scripts/usage.c b/scripts/usage.c
index 06f059acd..373642cd6 100644
--- a/scripts/usage.c
+++ b/scripts/usage.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #include <unistd.h>
 #include "busybox.h"
diff --git a/shell/cmdedit.h b/shell/cmdedit.h
index f8482f4a7..c4ce2ac8c 100644
--- a/shell/cmdedit.h
+++ b/shell/cmdedit.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 #ifndef CMDEDIT_H
 #define CMDEDIT_H
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 6adba159a..cf3ed6523 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,4 +1,5 @@
-/* vi: set ts=4:
+/* vi: set sw=4 ts=4: */
+/*
 * 
 * dmesg - display/control kernel ring buffer.
 *
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 691280833..f94d455c9 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger */
 /* 1999-02-22 Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL>
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 872581ca2..1c935463e 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* fdisk.c -- Partition table manipulator for Linux.
 *
 * Copyright (C) 1992  A. V. Le Blanc (LeBlanc@mcc.ac.uk)
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 005af8fa8..fab8f8398 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * getopt.c - Enhanced implementation of BSD getopt(1)
 *   Copyright (c) 1997, 1998, 1999, 2000  Frodo Looijaard <frodol@dds.nl>
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 2181b846d..12f540a53 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * hexdump implementation for busybox
 * Based on code from util-linux v 2.11l
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index f4abf6839..2e164b8b3 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ipcrm.c -- utility to allow removal of IPC objects and data structures.
 *
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index 6efe3d2b6..fbc75cbee 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * ipcs.c -- provides information on allocated ipc resources.
 *
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index c2d3339e0..3c979840f 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 * Mini losetup implementation for busybox
 *
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 3c7cf7bd1..c77c122b5 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -1,4 +1,5 @@
-/* vi:set ts=4:
+/* vi: set sw=4 ts=4: */
+/*
 *
 * mdev - Mini udev for busybox
 *
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 1612d7147..8fe8787ba 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
 *  readprofile.c - used to read /proc/profile
 *
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 8e564f0bf..411b738f0 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -1,4 +1,4 @@
-/* vi:set ts=4:*/
+/* vi: set sw=4 ts=4: */
 /* Copyright 2005 Rob Landley <rob@landley.net>
 *
 * Switch from rootfs to another filesystem as the root of the mount tree.