aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-10-05 15:33:28 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-10-05 15:33:28 +0200
commit2ab9403119399ffda26f6ff83ec60ac257c29898 (patch)
tree0359adfe0ba8c0d50801a36e67f8ef39aa885c1a
parenta02a4e98306194dc12bca46d099647bcce602bb9 (diff)
downloadbusybox-w32-2ab9403119399ffda26f6ff83ec60ac257c29898.tar.gz
busybox-w32-2ab9403119399ffda26f6ff83ec60ac257c29898.tar.bz2
busybox-w32-2ab9403119399ffda26f6ff83ec60ac257c29898.zip
whitespace and comment format fixes, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/libarchive/decompress_bunzip2.c3
-rw-r--r--archival/libarchive/decompress_uncompress.c6
-rw-r--r--archival/libarchive/get_header_ar.c3
-rw-r--r--archival/libarchive/get_header_cpio.c3
-rw-r--r--archival/libarchive/get_header_tar.c3
-rw-r--r--libbb/print_flags.c3
-rw-r--r--libpwdgrp/pwd_grp.c3
-rw-r--r--miscutils/bbconfig.c3
-rw-r--r--miscutils/flash_eraseall.c3
-rw-r--r--miscutils/flash_lock_unlock.c3
-rw-r--r--miscutils/ubi_tools.c3
-rw-r--r--util-linux/fdformat.c3
-rw-r--r--util-linux/fdisk.c3
-rw-r--r--util-linux/mkswap.c3
-rw-r--r--util-linux/switch_root.c3
15 files changed, 30 insertions, 18 deletions
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index af879648d..7cd18f5ed 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* Small bzip2 deflate implementation, by Rob Landley (rob@landley.net). 2/*
3 * Small bzip2 deflate implementation, by Rob Landley (rob@landley.net).
3 * 4 *
4 * Based on bzip2 decompression code by Julian R Seward (jseward@acm.org), 5 * Based on bzip2 decompression code by Julian R Seward (jseward@acm.org),
5 * which also acknowledges contributions by Mike Burrows, David Wheeler, 6 * which also acknowledges contributions by Mike Burrows, David Wheeler,
diff --git a/archival/libarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c
index 034ed502d..1517559c6 100644
--- a/archival/libarchive/decompress_uncompress.c
+++ b/archival/libarchive/decompress_uncompress.c
@@ -1,10 +1,10 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* uncompress for busybox -- (c) 2002 Robert Griebl 2/*
3 * uncompress for busybox -- (c) 2002 Robert Griebl
3 * 4 *
4 * based on the original compress42.c source 5 * based on the original compress42.c source
5 * (see disclaimer below) 6 * (see disclaimer below)
6 */ 7 */
7
8/* (N)compress42.c - File compression ala IEEE Computer, Mar 1992. 8/* (N)compress42.c - File compression ala IEEE Computer, Mar 1992.
9 * 9 *
10 * Authors: 10 * Authors:
@@ -21,9 +21,7 @@
21 * marc@suse.de : a small security fix for a buffer overflow 21 * marc@suse.de : a small security fix for a buffer overflow
22 * 22 *
23 * [... History snipped ...] 23 * [... History snipped ...]
24 *
25 */ 24 */
26
27#include "libbb.h" 25#include "libbb.h"
28#include "bb_archive.h" 26#include "bb_archive.h"
29 27
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index 79725e535..1809ec396 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* Copyright 2001 Glenn McGrath. 2/*
3 * Copyright 2001 Glenn McGrath.
3 * 4 *
4 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 5 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
5 */ 6 */
diff --git a/archival/libarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index ba07622fd..75fc6a406 100644
--- a/archival/libarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* Copyright 2002 Laurence Anderson 2/*
3 * Copyright 2002 Laurence Anderson
3 * 4 *
4 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 5 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
5 */ 6 */
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 443a478a1..aeb54190f 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* Licensed under GPLv2 or later, see file LICENSE in this source tree. 2/*
3 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
3 * 4 *
4 * FIXME: 5 * FIXME:
5 * In privileged mode if uname and gname map to a uid and gid then use the 6 * In privileged mode if uname and gname map to a uid and gid then use the
diff --git a/libbb/print_flags.c b/libbb/print_flags.c
index eaec731e5..0ebe842be 100644
--- a/libbb/print_flags.c
+++ b/libbb/print_flags.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* Print string that matches bit masked flags 2/*
3 * Print string that matches bit masked flags
3 * 4 *
4 * Copyright (C) 2008 Natanael Copa <natanael.copa@gmail.com> 5 * Copyright (C) 2008 Natanael Copa <natanael.copa@gmail.com>
5 * 6 *
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index 7e3568f80..b44ada432 100644
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* Copyright (C) 2014 Tito Ragusa <farmatito@tiscali.it> 2/*
3 * Copyright (C) 2014 Tito Ragusa <farmatito@tiscali.it>
3 * 4 *
4 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 5 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
5 */ 6 */
diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index 045aca211..9ab57876e 100644
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* This file was released into the public domain by Paul Fox. 2/*
3 * This file was released into the public domain by Paul Fox.
3 */ 4 */
4//config:config BBCONFIG 5//config:config BBCONFIG
5//config: bool "bbconfig (9.7 kb)" 6//config: bool "bbconfig (9.7 kb)"
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index a6ce41f27..fab21291c 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* eraseall.c -- erase the whole of a MTD device 2/*
3 * eraseall.c -- erase the whole of a MTD device
3 * 4 *
4 * Ported to busybox from mtd-utils. 5 * Ported to busybox from mtd-utils.
5 * 6 *
diff --git a/miscutils/flash_lock_unlock.c b/miscutils/flash_lock_unlock.c
index 6f2c049f4..12f72efaf 100644
--- a/miscutils/flash_lock_unlock.c
+++ b/miscutils/flash_lock_unlock.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* Ported to busybox from mtd-utils. 2/*
3 * Ported to busybox from mtd-utils.
3 * 4 *
4 * Licensed under GPLv2, see file LICENSE in this source tree. 5 * Licensed under GPLv2, see file LICENSE in this source tree.
5 */ 6 */
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 1ef8fd90e..a947abab5 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -1,4 +1,5 @@
1/* Ported to busybox from mtd-utils. 1/*
2 * Ported to busybox from mtd-utils.
2 * 3 *
3 * Licensed under GPLv2, see file LICENSE in this source tree. 4 * Licensed under GPLv2, see file LICENSE in this source tree.
4 */ 5 */
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 855269c30..c72da8b89 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* fdformat.c - Low-level formats a floppy disk - Werner Almesberger 2/*
3 * fdformat.c - Low-level formats a floppy disk - Werner Almesberger
3 * 5 July 2003 -- modified for Busybox by Erik Andersen 4 * 5 July 2003 -- modified for Busybox by Erik Andersen
4 * 5 *
5 * Licensed under GPLv2, see file LICENSE in this source tree. 6 * Licensed under GPLv2, see file LICENSE in this source tree.
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index c4318b6c4..7275535e6 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* fdisk.c -- Partition table manipulator for Linux. 2/*
3 * fdisk.c -- Partition table manipulator for Linux.
3 * 4 *
4 * Copyright (C) 1992 A. V. Le Blanc (LeBlanc@mcc.ac.uk) 5 * Copyright (C) 1992 A. V. Le Blanc (LeBlanc@mcc.ac.uk)
5 * Copyright (C) 2001,2002 Vladimir Oleynik <dzo@simtreas.ru> (initial bb port) 6 * Copyright (C) 2001,2002 Vladimir Oleynik <dzo@simtreas.ru> (initial bb port)
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 71449882d..2eb16bd84 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* mkswap.c - format swap device (Linux v1 only) 2/*
3 * mkswap.c - format swap device (Linux v1 only)
3 * 4 *
4 * Copyright 2006 Rob Landley <rob@landley.net> 5 * Copyright 2006 Rob Landley <rob@landley.net>
5 * 6 *
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 080b05e45..2d1802b79 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -1,5 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* Copyright 2005 Rob Landley <rob@landley.net> 2/*
3 * Copyright 2005 Rob Landley <rob@landley.net>
3 * 4 *
4 * Switch from rootfs to another filesystem as the root of the mount tree. 5 * Switch from rootfs to another filesystem as the root of the mount tree.
5 * 6 *