diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-03-15 11:29:22 +0300 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-03-15 11:29:22 +0300 |
commit | c7bda1ce659294d6e22c06e087f6f265983c7578 (patch) | |
tree | 4c6d2217f4d8306c59cf1096f8664e1cfd167213 /libbb | |
parent | 8854004b41065b3d081af7f3df13a100b0c8bfbe (diff) |
Remove trailing whitespace. Update copyright to include 2004.
Diffstat (limited to 'libbb')
70 files changed, 135 insertions, 135 deletions
diff --git a/libbb/Makefile b/libbb/Makefile index 774cc75ed..fbcb12330 100644 --- a/libbb/Makefile +++ b/libbb/Makefile @@ -1,6 +1,6 @@ # Makefile for busybox # -# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> +# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> # # 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/libbb/README b/libbb/README index b92910055..4f28f7e34 100644 --- a/libbb/README +++ b/libbb/README @@ -1,11 +1,11 @@ Please see the LICENSE file for copyright information (GPLv2) - + libbb is BusyBox's utility library. All of this stuff used to be stuffed into a single file named utility.c. When I split utility.c to create libbb, some of the very oldest stuff ended up without their original copyright and licensing information (which is now lost in the mists of time). If you see something that you wrote that is mis-attributed, do let me know so we can fix that up. - Erik Andersen + Erik Andersen <andersen@codepoet.org> diff --git a/libbb/bb_asprintf.c b/libbb/bb_asprintf.c index 7075b46de..a3ba42454 100644 --- a/libbb/bb_asprintf.c +++ b/libbb/bb_asprintf.c @@ -11,7 +11,7 @@ void bb_xasprintf(char **string_ptr, const char *format, ...) { va_list p; int r; - + va_start(p, format); r = vasprintf(string_ptr, format, p); va_end(p); diff --git a/libbb/chomp.c b/libbb/chomp.c index 4fcbb263d..774e533d4 100644 --- a/libbb/chomp.c +++ b/libbb/chomp.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) many different people. + * Copyright (C) many different people. * If you wrote this, please acknowledge your work. * * This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ void chomp(char *s) { char *lc = last_char_is(s, '\n'); - + if(lc) *lc = 0; } diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c index f0ce3d91c..77c054530 100644 --- a/libbb/concat_path_file.c +++ b/libbb/concat_path_file.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) many different people. + * Copyright (C) many different people. * If you wrote this, please acknowledge your work. * * This program is free software; you can redistribute it and/or modify diff --git a/libbb/copyfd.c b/libbb/copyfd.c index 00115e2c9..bf0a390a3 100644 --- a/libbb/copyfd.c +++ b/libbb/copyfd.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/correct_password.c b/libbb/correct_password.c index 396253614..1da83c441 100644 --- a/libbb/correct_password.c +++ b/libbb/correct_password.c @@ -49,14 +49,14 @@ int correct_password ( const struct passwd *pw ) { char *unencrypted, *encrypted, *correct; - + #ifdef CONFIG_FEATURE_SHADOWPASSWDS if (( strcmp ( pw-> pw_passwd, "x" ) == 0 ) || ( strcmp ( pw-> pw_passwd, "*" ) == 0 )) { struct spwd *sp = getspnam ( pw-> pw_name ); - + if ( !sp ) bb_error_msg_and_die ( "no valid shadow password" ); - + correct = sp-> sp_pwdp; } else diff --git a/libbb/device_open.c b/libbb/device_open.c index abfe2318a..61f954f46 100644 --- a/libbb/device_open.c +++ b/libbb/device_open.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/dump.c b/libbb/dump.c index 5046b926b..f169da677 100644 --- a/libbb/dump.c +++ b/libbb/dump.c @@ -248,8 +248,8 @@ static void rewrite(FS * fs) pr->cchar = pr->fmt + (p1 - fmtp); /* DBU:[dave@cray.com] w/o this, trailing fmt text, space is lost. - * Skip subsequent text and up to the next % sign and tack the - * additional text onto fmt: eg. if fmt is "%x is a HEX number", + * Skip subsequent text and up to the next % sign and tack the + * additional text onto fmt: eg. if fmt is "%x is a HEX number", * we lose the " is a HEX number" part of fmt. */ for (p3 = p2; *p3 && *p3 != '%'; p3++); diff --git a/libbb/error_msg.c b/libbb/error_msg.c index dbb25b7c9..18811b8d1 100644 --- a/libbb/error_msg.c +++ b/libbb/error_msg.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c index 433f29d0f..0937658a3 100644 --- a/libbb/error_msg_and_die.c +++ b/libbb/error_msg_and_die.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/fgets_str.c b/libbb/fgets_str.c index 72fde58d1..bf828be95 100644 --- a/libbb/fgets_str.c +++ b/libbb/fgets_str.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) many different people. + * Copyright (C) many different people. * If you wrote this, please acknowledge your work. * * This program is free software; you can redistribute it and/or modify diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c index b63203852..83824de9e 100644 --- a/libbb/find_mount_point.c +++ b/libbb/find_mount_point.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c index 77fa0179e..930710f32 100644 --- a/libbb/find_pid_by_name.c +++ b/libbb/find_pid_by_name.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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 @@ -25,15 +25,15 @@ #include <stdlib.h> #include "libbb.h" -#define COMM_LEN 16 /* synchronize with size of comm in struct task_struct +#define COMM_LEN 16 /* synchronize with size of comm in struct task_struct in /usr/include/linux/sched.h */ /* find_pid_by_name() - * + * * Modified by Vladimir Oleynik for use with libbb/procps.c * This finds the pid of the specified process. - * Currently, it's implemented by rummaging through + * Currently, it's implemented by rummaging through * the proc filesystem. * * Returns a list of all matching PIDs diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c index 836ce44d5..81824a216 100644 --- a/libbb/find_root_device.c +++ b/libbb/find_root_device.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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 @@ -35,7 +35,7 @@ extern char *find_real_root_device_name(const char* name) char *fileName = NULL; dev_t dev; - if (stat("/", &rootStat) != 0) + if (stat("/", &rootStat) != 0) bb_perror_msg("could not stat '/'"); else { /* This check is here in case they pass in /dev name */ @@ -45,7 +45,7 @@ extern char *find_real_root_device_name(const char* name) dev = rootStat.st_dev; dir = opendir("/dev"); - if (!dir) + if (!dir) bb_perror_msg("could not open '/dev'"); else { while((entry = readdir(dir)) != NULL) { @@ -59,9 +59,9 @@ extern char *find_real_root_device_name(const char* name) /* Some char devices have the same dev_t as block * devices, so make sure this is a block device */ - if (stat(fileName, &statBuf) == 0 && + if (stat(fileName, &statBuf) == 0 && S_ISBLK(statBuf.st_mode)!=0 && - statBuf.st_rdev == dev) + statBuf.st_rdev == dev) break; free(fileName); fileName=NULL; diff --git a/libbb/full_read.c b/libbb/full_read.c index f4b332dca..221fc947b 100644 --- a/libbb/full_read.c +++ b/libbb/full_read.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/full_write.c b/libbb/full_write.c index 30c7a5079..30de4078a 100644 --- a/libbb/full_write.c +++ b/libbb/full_write.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/get_console.c b/libbb/get_console.c index 0dc24cb78..bfb7468a8 100644 --- a/libbb/get_console.c +++ b/libbb/get_console.c @@ -29,7 +29,7 @@ -/* From <linux/kd.h> */ +/* From <linux/kd.h> */ static const int KDGKBTYPE = 0x4B33; /* get keyboard type */ diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c index 9a831f184..6d12b21c4 100644 --- a/libbb/get_line_from_file.c +++ b/libbb/get_line_from_file.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) many different people. + * Copyright (C) many different people. * If you wrote this, please acknowledge your work. * * This program is free software; you can redistribute it and/or modify diff --git a/libbb/get_terminal_width_height.c b/libbb/get_terminal_width_height.c index 69f6a17e5..ef90463fb 100644 --- a/libbb/get_terminal_width_height.c +++ b/libbb/get_terminal_width_height.c @@ -2,7 +2,7 @@ /* * Determine the width and height of the terminal. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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 @@ -30,7 +30,7 @@ /* It is perfectly ok to pass in a NULL for either width or for * height, in which case that value will not be set. It is also - * perfectly ok to have CONFIG_FEATURE_AUTOWIDTH disabled, in + * perfectly ok to have CONFIG_FEATURE_AUTOWIDTH disabled, in * which case you will always get 80x24 */ void get_terminal_width_height(int fd, int *width, int *height) { diff --git a/libbb/hash_fd.c b/libbb/hash_fd.c index e79d6d6f6..e37ac549a 100644 --- a/libbb/hash_fd.c +++ b/libbb/hash_fd.c @@ -4,7 +4,7 @@ * * Copyright (C) 2003 Glenn L. McGrath * Copyright (C) 2003 Erik Andersen - * + * * 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 * the Free Software Foundation; either version 2 of the License, or @@ -47,27 +47,27 @@ LICENSE TERMS - The free distribution and use of this software in both source and binary + The free distribution and use of this software in both source and binary form is allowed (with or without changes) provided that: - 1. distributions of this source code include the above copyright + 1. distributions of this source code include the above copyright notice, this list of conditions and the following disclaimer; 2. distributions in binary form include the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other associated materials; - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. + 3. the copyright holder's name is not used to endorse products + built using this software without specific written permission. ALTERNATIVELY, provided that this notice is retained in full, this product may be distributed under the terms of the GNU General Public License (GPL), in which case the provisions of the GPL apply INSTEAD OF those given above. - + DISCLAIMER This software is provided 'as is' with no explicit or implied warranties - in respect of its properties, including, but not limited to, correctness + in respect of its properties, including, but not limited to, correctness and/or fitness for purpose. --------------------------------------------------------------------------- Issue Date: 10/11/2002 @@ -805,7 +805,7 @@ extern int hash_fd(int src_fd, const size_t size, const uint8_t hash_algo, cx = &md5_cx; } #endif - + /* Initialize the computation context. */ #ifdef CONFIG_SHA1SUM if (hash_algo == HASH_SHA1) { diff --git a/libbb/herror_msg.c b/libbb/herror_msg.c index fb2a17b73..87ec15acc 100644 --- a/libbb/herror_msg.c +++ b/libbb/herror_msg.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/herror_msg_and_die.c b/libbb/herror_msg_and_die.c index b53a56de8..5c765f1be 100644 --- a/libbb/herror_msg_and_die.c +++ b/libbb/herror_msg_and_die.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/human_readable.c b/libbb/human_readable.c index 656889150..ad9025c08 100644 --- a/libbb/human_readable.c +++ b/libbb/human_readable.c @@ -13,8 +13,8 @@ * representations (say, powers of 1024) and manipulating coefficients. * The base ten "bytes" output could be handled similarly. * - * 2) This routine always outputs a decimal point and a tenths digit when - * display_unit != 0. Hence, it isn't uncommon for the returned string + * 2) This routine always outputs a decimal point and a tenths digit when + * display_unit != 0. Hence, it isn't uncommon for the returned string * to have a length of 5 or 6. * * It might be nice to add a flag to indicate no decimal digits in @@ -28,7 +28,7 @@ #include <stdio.h> #include "libbb.h" -const char *make_human_readable_str(unsigned long long size, +const char *make_human_readable_str(unsigned long long size, unsigned long block_size, unsigned long display_unit) { /* The code will adjust for additional (appended) units. */ @@ -37,7 +37,7 @@ const char *make_human_readable_str(unsigned long long size, static const char fmt_tenths[] = "%Lu.%d%c"; static char str[21]; /* Sufficient for 64 bit unsigned integers. */ - + unsigned long long val; int frac; const char *u; diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c index ea82e8ce6..fbcd81327 100644 --- a/libbb/inode_hash.c +++ b/libbb/inode_hash.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) many different people. + * Copyright (C) many different people. * If you wrote this, please acknowledge your work. * * This program is free software; you can redistribute it and/or modify @@ -69,7 +69,7 @@ void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name) int i; size_t s; ino_dev_hashtable_bucket_t *bucket; - + i = hash_inode(statbuf->st_ino); s = name ? strlen(name) : 0; bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s); diff --git a/libbb/interface.c b/libbb/interface.c index 28007f443..f44e866df 100644 --- a/libbb/interface.c +++ b/libbb/interface.c @@ -1,5 +1,5 @@ /* - * stolen from net-tools-1.59 and stripped down for busybox by + * stolen from net-tools-1.59 and stripped down for busybox by * Erik Andersen <andersen@codepoet.org> * * Heavily modified by Manuel Novoa III Mar 12, 2001 @@ -15,7 +15,7 @@ * that either displays or sets the characteristics of * one or more of the system's networking interfaces. * - * Version: $Id: interface.c,v 1.20 2003/08/29 11:34:08 bug1 Exp $ + * Version: $Id: interface.c,v 1.21 2004/03/15 08:28:42 andersen Exp $ * * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> * and others. Copyright 1993 MicroWalt Corporation @@ -31,17 +31,17 @@ * * {1.34} - 19980630 - Arnaldo Carvalho de Melo <acme@conectiva.com.br> * - gettext instead of catgets for i18n - * 10/1998 - Andi Kleen. Use interface list primitives. - * 20001008 - Bernd Eckenfels, Patch from RH for setting mtu + * 10/1998 - Andi Kleen. Use interface list primitives. + * 20001008 - Bernd Eckenfels, Patch from RH for setting mtu * (default AF was wrong) */ /* #define KEEP_UNUSED */ -/* - * +/* + * * Protocol Families. - * + * */ #define HAVE_AFINET 1 #undef HAVE_AFIPX @@ -51,10 +51,10 @@ #undef HAVE_AFECONET #undef HAVE_AFASH -/* - * +/* + * * Device Hardware types. - * + * */ #define HAVE_HWETHER 1 #define HAVE_HWPPP 1 @@ -1822,7 +1822,7 @@ static void ife_print(struct interface *ptr) hw = get_hwntype(-1); printf(_("%-9.9s Link encap:%s "), ptr->name, _(hw->title)); - /* For some hardware types (eg Ash, ATM) we don't print the + /* For some hardware types (eg Ash, ATM) we don't print the hardware address if it's null. */ if (hw->print != NULL && (!(hw_null_address(hw, ptr->hwaddr) && hw->suppress_null_addr))) @@ -2011,7 +2011,7 @@ static void ife_print(struct interface *ptr) printf(" "); if (ptr->map.irq) printf(_("Interrupt:%d "), ptr->map.irq); - if (ptr->map.base_addr >= 0x100) /* Only print devices using it for + if (ptr->map.base_addr >= 0x100) /* Only print devices using it for I/O maps */ printf(_("Base address:0x%lx "), (unsigned long) ptr->map.base_addr); diff --git a/libbb/isdirectory.c b/libbb/isdirectory.c index e9b106aa3..f3caaf178 100644 --- a/libbb/isdirectory.c +++ b/libbb/isdirectory.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Based in part on code from sash, Copyright (c) 1999 by David I. Bell + * Based in part on code from sash, Copyright (c) 1999 by David I. Bell * Permission has been granted to redistribute this code under the GPL. * * This program is free software; you can redistribute it and/or modify diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c index 740ac523c..e01aafa25 100644 --- a/libbb/kernel_version.c +++ b/libbb/kernel_version.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/loop.c b/libbb/loop.c index 4d73dc4cc..81d1f0ab6 100644 --- a/libbb/loop.c +++ b/libbb/loop.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/messages.c b/libbb/messages.c index adfd1ffcc..671c452d2 100644 --- a/libbb/messages.c +++ b/libbb/messages.c @@ -1,6 +1,6 @@ /* vi: set sw=4 ts=4: */ /* - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/module_syscalls.c b/libbb/module_syscalls.c index 81fb8f255..a2ff5284a 100644 --- a/libbb/module_syscalls.c +++ b/libbb/module_syscalls.c @@ -2,7 +2,7 @@ /* * some system calls possibly missing from libc * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/mtab.c b/libbb/mtab.c index a62169a26..528422567 100644 --- a/libbb/mtab.c +++ b/libbb/mtab.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/mtab_file.c b/libbb/mtab_file.c index 58b0f66e2..42504e81f 100644 --- a/libbb/mtab_file.c +++ b/libbb/mtab_file.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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 @@ -23,8 +23,8 @@ #include "libbb.h" -/* Busybox mount uses either /proc/mounts or /etc/mtab to - * get the list of currently mounted filesystems */ +/* Busybox mount uses either /proc/mounts or /etc/mtab to + * get the list of currently mounted filesystems */ #if defined CONFIG_FEATURE_MTAB_SUPPORT const char bb_path_mtab_file[] = CONFIG_FEATURE_MTAB_FILENAME; #else diff --git a/libbb/my_getgrgid.c b/libbb/my_getgrgid.c index 5a36c890d..907a47486 100644 --- a/libbb/my_getgrgid.c +++ b/libbb/my_getgrgid.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/my_getgrnam.c b/libbb/my_getgrnam.c index 906727b76..22a617cc8 100644 --- a/libbb/my_getgrnam.c +++ b/libbb/my_getgrnam.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/my_getpwnam.c b/libbb/my_getpwnam.c index 57c2a01ec..a9fd0cd09 100644 --- a/libbb/my_getpwnam.c +++ b/libbb/my_getpwnam.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/my_getpwnamegid.c b/libbb/my_getpwnamegid.c index 1dd5674ec..d1457900e 100644 --- a/libbb/my_getpwnamegid.c +++ b/libbb/my_getpwnamegid.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/my_getpwuid.c b/libbb/my_getpwuid.c index ec2fcce74..21a037f75 100644 --- a/libbb/my_getpwuid.c +++ b/libbb/my_getpwuid.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/parse_mode.c b/libbb/parse_mode.c index 7132c76ef..185957bc3 100644 --- a/libbb/parse_mode.c +++ b/libbb/parse_mode.c @@ -31,7 +31,7 @@ extern int bb_parse_mode(const char *s, mode_t *current_mode) { - static const mode_t who_mask[] = { + static const mode_t who_mask[] = { S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO, /* a */ S_ISUID | S_IRWXU, /* u */ S_ISGID | S_IRWXG, /* g */ diff --git a/libbb/parse_number.c b/libbb/parse_number.c index 92ad6a216..5262239ff 100644 --- a/libbb/parse_number.c +++ b/libbb/parse_number.c @@ -34,7 +34,7 @@ unsigned long bb_xparse_number(const char *numstr, unsigned long int r; char *e; int old_errno; - + /* Since this is a lib function, we're not allowed to reset errno to 0. * Doing so could break an app that is deferring checking of errno. * So, save the old value so that we can restore it if successful. */ diff --git a/libbb/perror_msg.c b/libbb/perror_msg.c index 0928e4371..8ba053188 100644 --- a/libbb/perror_msg.c +++ b/libbb/perror_msg.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/perror_msg_and_die.c b/libbb/perror_msg_and_die.c index 122f3972b..15bf0421e 100644 --- a/libbb/perror_msg_and_die.c +++ b/libbb/perror_msg_and_die.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/print_file.c b/libbb/print_file.c index 161b398fa..bd7108d2f 100644 --- a/libbb/print_file.c +++ b/libbb/print_file.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/printf.c b/libbb/printf.c index 3e69331c5..3c438b2c9 100644 --- a/libbb/printf.c +++ b/libbb/printf.c @@ -46,7 +46,7 @@ #include <stdarg.h> #include "libbb.h" -#if defined(__UCLIBC__) +#if defined(__UCLIBC__) # if defined(__FLAG_ERROR) /* Using my newer stdio implementation. Unlocked macros are: diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c index ef2717bdd..f5ac500fa 100644 --- a/libbb/process_escape_sequence.c +++ b/libbb/process_escape_sequence.c @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * + * */ #include <stdio.h> @@ -37,7 +37,7 @@ char bb_process_escape_sequence(const char **ptr) unsigned int num_digits; unsigned int r; unsigned int n; - + n = 0; q = *ptr; diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c index ce6078539..727149d0c 100644 --- a/libbb/pw_encrypt.c +++ b/libbb/pw_encrypt.c @@ -2,7 +2,7 @@ /* * Utility routine. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/read_package_field.c b/libbb/read_package_field.c index abe8e06fd..4292689ca 100644 --- a/libbb/read_package_field.c +++ b/libbb/read_package_field.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) many different people. + * Copyright (C) many different people. * If you wrote this, please acknowledge your work. * * This program is free software; you can redistribute it and/or modify diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index 6ee59e8f1..d27629829 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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 @@ -30,12 +30,12 @@ /* - * Walk down all the directories under the specified + * Walk down all the directories under the specified * location, and do something (something specified * by the fileAction and dirAction function pointers). * - * Unfortunately, while nftw(3) could replace this and reduce - * code size a bit, nftw() wasn't supported before GNU libc 2.1, + * Unfortunately, while nftw(3) could replace this and reduce + * code size a bit, nftw() wasn't supported before GNU libc 2.1, * and so isn't sufficiently portable to take over since glibc2.1 * is so stinking huge. */ diff --git a/libbb/run_parts.c b/libbb/run_parts.c index 0eb766086..607b84190 100644 --- a/libbb/run_parts.c +++ b/libbb/run_parts.c @@ -111,7 +111,7 @@ extern int run_parts(char **args, const unsigned char test_mode, char **env) exitstatus = 1; } } - } + } else if (!S_ISDIR(st.st_mode)) { bb_error_msg("component %s is not an executable plain file", filename); exitstatus = 1; @@ -121,6 +121,6 @@ extern int run_parts(char **args, const unsigned char test_mode, char **env) free(filename); } free(namelist); - + return(exitstatus); } diff --git a/libbb/run_shell.c b/libbb/run_shell.c index 4855d763e..993b4e711 100644 --- a/libbb/run_shell.c +++ b/libbb/run_shell.c @@ -54,20 +54,20 @@ void run_shell ( const char *shell, int loginshell, const char *command, const c const char **args; int argno = 1; int additional_args_cnt = 0; - + for ( args = additional_args; args && *args; args++ ) additional_args_cnt++; args = (const char **) xmalloc (sizeof (char *) * ( 4 + additional_args_cnt )); - + args [0] = bb_get_last_path_component ( bb_xstrdup ( shell )); - + if ( loginshell ) { char *args0; bb_xasprintf ( &args0, "-%s", args [0] ); args [0] = args0; } - + if ( command ) { args [argno++] = "-c"; args [argno++] = command; diff --git a/libbb/safe_read.c b/libbb/safe_read.c index 67f3268c5..92e1d8a4b 100644 --- a/libbb/safe_read.c +++ b/libbb/safe_read.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/safe_strncpy.c b/libbb/safe_strncpy.c index 08a2a0d9c..2016e6b52 100644 --- a/libbb/safe_strncpy.c +++ b/libbb/safe_strncpy.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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 @@ -24,11 +24,11 @@ -/* Like strncpy but make sure the resulting string is always 0 terminated. */ +/* Like strncpy but make sure the resulting string is always 0 terminated. */ extern char * safe_strncpy(char *dst, const char *src, size_t size) -{ +{ dst[size-1] = '\0'; - return strncpy(dst, src, size-1); + return strncpy(dst, src, size-1); } diff --git a/libbb/safe_write.c b/libbb/safe_write.c index 0ac6c2d96..201ea1cd3 100644 --- a/libbb/safe_write.c +++ b/libbb/safe_write.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/setup_environment.c b/libbb/setup_environment.c index b18f8967e..aeb285a53 100644 --- a/libbb/setup_environment.c +++ b/libbb/setup_environment.c @@ -52,13 +52,13 @@ void setup_environment ( const char *shell, int loginshell, int changeenv, const { if ( loginshell ) { const char *term; - + /* Change the current working directory to be the home directory * of the user. It is a fatal error for this process to be unable * to change to that directory. There is no "default" home * directory. * Some systems default to HOME=/ - */ + */ if ( chdir ( pw-> pw_dir )) { if ( chdir ( "/" )) { syslog ( LOG_WARNING, "unable to cd to %s' for user %s'\n", pw-> pw_dir, pw-> pw_name ); diff --git a/libbb/syscalls.c b/libbb/syscalls.c index 8ceb35695..9e89dbd39 100644 --- a/libbb/syscalls.c +++ b/libbb/syscalls.c @@ -2,7 +2,7 @@ /* * some system calls possibly missing from libc * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/syslog_msg_with_name.c b/libbb/syslog_msg_with_name.c index 4b530416a..ac472dbda 100644 --- a/libbb/syslog_msg_with_name.c +++ b/libbb/syslog_msg_with_name.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/trim.c b/libbb/trim.c index 75e7c2d43..38aa28231 100644 --- a/libbb/trim.c +++ b/libbb/trim.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) many different people. + * Copyright (C) many different people. * If you wrote this, please acknowledge your work. * * This program is free software; you can redistribute it and/or modify diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c index 681358414..be444a97b 100644 --- a/libbb/u_signal_names.c +++ b/libbb/u_signal_names.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) many different people. + * Copyright (C) many different people. * If you wrote this, please acknowledge your work. * * This program is free software; you can redistribute it and/or modify diff --git a/libbb/vdprintf.c b/libbb/vdprintf.c index 2a19dd182..53fdbd37a 100644 --- a/libbb/vdprintf.c +++ b/libbb/vdprintf.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/verror_msg.c b/libbb/verror_msg.c index 9270290cd..07b37e4ad 100644 --- a/libbb/verror_msg.c +++ b/libbb/verror_msg.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c index 2fd70ba1a..0601121ad 100644 --- a/libbb/vfork_daemon_rexec.c +++ b/libbb/vfork_daemon_rexec.c @@ -40,9 +40,9 @@ void vfork_daemon_rexec(int nochdir, int noclose, int fd; char **vfork_args; int a = 0; - + setsid(); - + if (!nochdir) chdir("/"); @@ -73,6 +73,6 @@ void vfork_daemon_rexec(int nochdir, int noclose, bb_perror_msg_and_die("vfork"); default: /* parent */ exit(0); - } + } } #endif /* uClinux */ diff --git a/libbb/vherror_msg.c b/libbb/vherror_msg.c index ffdfd5283..1560eb595 100644 --- a/libbb/vherror_msg.c +++ b/libbb/vherror_msg.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/vperror_msg.c b/libbb/vperror_msg.c index cd48af259..5c446967a 100644 --- a/libbb/vperror_msg.c +++ b/libbb/vperror_msg.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/wfopen.c b/libbb/wfopen.c index 368451c52..ab77cb19e 100644 --- a/libbb/wfopen.c +++ b/libbb/wfopen.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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/libbb/xconnect.c b/libbb/xconnect.c index 2443bb299..4cd22c74f 100644 --- a/libbb/xconnect.c +++ b/libbb/xconnect.c @@ -64,7 +64,7 @@ int xconnect(struct sockaddr_in *s_addr) int s = socket(AF_INET, SOCK_STREAM, 0); if (connect(s, (struct sockaddr_in *)s_addr, sizeof(struct sockaddr_in)) < 0) { - bb_perror_msg_and_die("Unable to connect to remote host (%s)", + bb_perror_msg_and_die("Unable to connect to remote host (%s)", inet_ntoa(s_addr->sin_addr)); } return s; diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index da3775a59..01b2f87bc 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * * 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 @@ -85,7 +85,7 @@ extern char * bb_xstrndup (const char *s, int n) { bb_error_msg_and_die("bb_xstrndup bug"); t = xmalloc(++n); - + return safe_strncpy(t,s,n); } #endif @@ -104,7 +104,7 @@ FILE *bb_xfopen(const char *path, const char *mode) extern int bb_xopen(const char *pathname, int flags) { int ret; - + ret = open(pathname, flags, 0777); if (ret == -1) { bb_perror_msg_and_die("%s", pathname); @@ -146,10 +146,10 @@ extern void bb_xread_all(int fd, void *buf, size_t count) extern unsigned char bb_xread_char(int fd) { char tmp; - + bb_xread_all(fd, &tmp, 1); - return(tmp); + return(tmp); } #endif diff --git a/libbb/xgetlarg.c b/libbb/xgetlarg.c index ed5d3eb4f..56fb60e82 100644 --- a/libbb/xgetlarg.c +++ b/libbb/xgetlarg.c @@ -1,6 +1,6 @@ /* vi: set sw=4 ts=4: */ /* - * Copyright (C) 2003 Erik Andersen <andersen@codepoet.org> + * Copyright (C) 2003-2004 Erik Andersen <andersen@codepoet.org> */ diff --git a/libbb/xgetularg.c b/libbb/xgetularg.c index d743520c3..e90085446 100644 --- a/libbb/xgetularg.c +++ b/libbb/xgetularg.c @@ -29,7 +29,7 @@ #include "libbb.h" #ifdef L_xgetularg_bnd_sfx -extern +extern unsigned long bb_xgetularg_bnd_sfx(const char *arg, int base, unsigned long lower, unsigned long upper, @@ -61,7 +61,7 @@ unsigned long bb_xgetularg_bnd_sfx(const char *arg, int base, bb_show_usage(); } errno = old_errno; /* Ok. So restore errno. */ - + /* Do optional suffix parsing. Allow 'empty' suffix tables. * Note that we also all nul suffixes with associated multipliers, * to allow for scaling of the arg by some default multiplier. */ @@ -78,7 +78,7 @@ unsigned long bb_xgetularg_bnd_sfx(const char *arg, int base, } ++suffixes; } - } + } /* Finally, check for illegal trailing chars and range limits. */ /* Note: although we allow leading space (via stroul), trailing space @@ -92,7 +92,7 @@ unsigned long bb_xgetularg_bnd_sfx(const char *arg, int base, #endif #ifdef L_xgetlarg_bnd_sfx -extern +extern long bb_xgetlarg_bnd_sfx(const char *arg, int base, long lower, long upper, @@ -124,7 +124,7 @@ long bb_xgetlarg_bnd_sfx(const char *arg, int base, #endif #ifdef L_getlarg10_sfx -extern +extern long bb_xgetlarg10_sfx(const char *arg, const struct suffix_mult *suffixes) { return bb_xgetlarg_bnd_sfx(arg, 10, LONG_MIN, LONG_MAX, suffixes); @@ -132,7 +132,7 @@ long bb_xgetlarg10_sfx(const char *arg, const struct suffix_mult *suffixes) #endif #ifdef L_xgetularg_bnd -extern +extern unsigned long bb_xgetularg_bnd(const char *arg, int base, unsigned long lower, unsigned long upper) @@ -142,7 +142,7 @@ unsigned long bb_xgetularg_bnd(const char *arg, int base, #endif #ifdef L_xgetularg10_bnd -extern +extern unsigned long bb_xgetularg10_bnd(const char *arg, unsigned long lower, unsigned long upper) @@ -152,7 +152,7 @@ unsigned long bb_xgetularg10_bnd(const char *arg, #endif #ifdef L_xgetularg10 -extern +extern unsigned long bb_xgetularg10(const char *arg) { return bb_xgetularg10_bnd(arg, 0, ULONG_MAX); diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c index b8cfe617a..21a657dfc 100644 --- a/libbb/xreadlink.c +++ b/libbb/xreadlink.c @@ -14,10 +14,10 @@ #include "libbb.h" extern char *xreadlink(const char *path) -{ +{ static const int GROWBY = 80; /* how large we will grow strings by */ - char *buf = NULL; + char *buf = NULL; int bufsize = 0, readsize = 0; do { @@ -27,10 +27,10 @@ extern char *xreadlink(const char *path) bb_perror_msg("%s", path); return NULL; } - } + } while (bufsize < readsize + 1); buf[readsize] = '\0'; return buf; -} +} diff --git a/libbb/xregcomp.c b/libbb/xregcomp.c index bfccfec69..fa6c0fa2b 100644 --- a/libbb/xregcomp.c +++ b/libbb/xregcomp.c @@ -2,7 +2,7 @@ /* * Utility routines. * - * Copyright (C) many different people. + * Copyright (C) many different people. * If you wrote this, please acknowledge your work. * * This program is free software; you can redistribute it and/or modify |