From b1629b1b2abc17a6430e4173d64d7956784118e0 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 19 May 2006 19:29:19 +0000 Subject: [PATCH] - remove emacs layout block as suggested by Robert P.J. Day - use shorter boilerplate while at it --- applets/busybox.c | 11 +++-------- archival/unzip.c | 9 --------- console-tools/chvt.c | 25 +------------------------ console-tools/openvt.c | 22 +--------------------- console-tools/setconsole.c | 22 +--------------------- coreutils/chgrp.c | 23 +---------------------- coreutils/chmod.c | 8 -------- coreutils/chown.c | 8 -------- coreutils/df.c | 23 +---------------------- coreutils/id.c | 25 +------------------------ debianutils/which.c | 8 -------- include/platform.h | 3 +++ init/init.c | 8 -------- libbb/bb_do_delay.c | 8 -------- libbb/bb_pwd.c | 10 ---------- libbb/chomp.c | 25 +------------------------ libbb/device_open.c | 23 +---------------------- libbb/error_msg.c | 24 +----------------------- libbb/error_msg_and_die.c | 24 +----------------------- libbb/find_mount_point.c | 24 +----------------------- libbb/find_pid_by_name.c | 9 --------- libbb/full_read.c | 23 +---------------------- libbb/full_write.c | 24 +----------------------- libbb/get_console.c | 24 +----------------------- libbb/get_terminal_width_height.c | 10 ---------- libbb/herror_msg.c | 24 +----------------------- libbb/herror_msg_and_die.c | 24 +----------------------- libbb/inode_hash.c | 25 +------------------------ libbb/isdirectory.c | 23 +---------------------- libbb/kernel_version.c | 23 +---------------------- libbb/mtab_file.c | 24 +----------------------- libbb/perror_msg.c | 24 +----------------------- libbb/perror_msg_and_die.c | 24 +----------------------- libbb/print_file.c | 23 +---------------------- libbb/process_escape_sequence.c | 25 +------------------------ libbb/procps.c | 11 +---------- libbb/recursive_action.c | 10 ---------- libbb/safe_read.c | 24 +----------------------- libbb/safe_strncpy.c | 24 +----------------------- libbb/safe_write.c | 24 +----------------------- libbb/trim.c | 24 +----------------------- libbb/vdprintf.c | 24 +----------------------- libbb/verror_msg.c | 24 +----------------------- libbb/vperror_msg.c | 24 +----------------------- libbb/wfopen.c | 24 +----------------------- libbb/xfuncs.c | 9 --------- libbb/xregcomp.c | 25 +------------------------ loginutils/vlock.c | 23 +---------------------- miscutils/rx.c | 8 -------- networking/ftpgetput.c | 8 -------- networking/ipcalc.c | 11 ++--------- networking/telnet.c | 8 -------- networking/wget.c | 10 ---------- sysklogd/klogd.c | 8 -------- sysklogd/syslogd.c | 8 -------- util-linux/getopt.c | 22 +--------------------- util-linux/pivot_root.c | 11 ++--------- 57 files changed, 46 insertions(+), 980 deletions(-) diff --git a/applets/busybox.c b/applets/busybox.c index 344edc64c..25bb36d9c 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -1,4 +1,7 @@ /* vi: set sw=4 ts=4: */ +/* + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + */ #include #include #include @@ -147,11 +150,3 @@ int busybox_main(int argc, char **argv) bb_error_msg_and_die("applet not found"); } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/archival/unzip.c b/archival/unzip.c index b9dff1985..2cb256c76 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -417,12 +417,3 @@ int unzip_main(int argc, char **argv) return failed; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/console-tools/chvt.c b/console-tools/chvt.c index cba5b4014..aff66e007 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c @@ -4,23 +4,9 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -/* no options, no getopt */ - #include #include #include @@ -50,12 +36,3 @@ int chvt_main(int argc, char **argv) } return EXIT_SUCCESS; } - - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/console-tools/openvt.c b/console-tools/openvt.c index de6a19fbc..948dba767 100644 --- a/console-tools/openvt.c +++ b/console-tools/openvt.c @@ -5,19 +5,7 @@ * busyboxed by Quy Tonthat * hacked by Tito * - * 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* getopt not needed */ @@ -63,11 +51,3 @@ int openvt_main(int argc, char **argv) } return EXIT_SUCCESS; } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c index 6b4989d77..bf06cc530 100644 --- a/console-tools/setconsole.c +++ b/console-tools/setconsole.c @@ -4,19 +4,7 @@ * * Copyright (C) 2004,2005 Enrik Berkhan * - * 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -60,11 +48,3 @@ int setconsole_main(int argc, char **argv) } return EXIT_SUCCESS; } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c index 70ac672c2..46db4081a 100644 --- a/coreutils/chgrp.c +++ b/coreutils/chgrp.c @@ -4,20 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 defects - unsupported options -h, -H, -L, and -P. */ @@ -71,11 +58,3 @@ int chgrp_main(int argc, char **argv) return retval; } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/coreutils/chmod.c b/coreutils/chmod.c index b69cccdf1..c871ad10e 100644 --- a/coreutils/chmod.c +++ b/coreutils/chmod.c @@ -89,11 +89,3 @@ int chmod_main(int ATTRIBUTE_UNUSED argc, char **argv) return retval; } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/coreutils/chown.c b/coreutils/chown.c index 66add48ed..bb379ac20 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c @@ -76,11 +76,3 @@ int chown_main(int argc, char **argv) return retval; } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/coreutils/df.c b/coreutils/df.c index bd487ee95..17ce634a7 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -5,20 +5,7 @@ * Copyright (C) 1999-2004 by Erik Andersen * based on original code by (I think) Bruce Perens . * - * 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 _NOT_ compliant -- options -P and -t missing. Also blocksize. */ @@ -160,11 +147,3 @@ int df_main(int argc, char **argv) bb_fflush_stdout_and_exit(status); } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/coreutils/id.c b/coreutils/id.c index 73c3c2e3b..1bedff37a 100644 --- a/coreutils/id.c +++ b/coreutils/id.c @@ -4,20 +4,7 @@ * * Copyright (C) 2000 by Randolph Chung * - * 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 _NOT_ compliant -- option -G is not currently supported. */ @@ -123,13 +110,3 @@ int id_main(int argc, char **argv) putchar('\n'); bb_fflush_stdout_and_exit(status); } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ - diff --git a/debianutils/which.c b/debianutils/which.c index f2991c561..03b3c30f9 100644 --- a/debianutils/which.c +++ b/debianutils/which.c @@ -99,11 +99,3 @@ int which_main(int argc, char **argv) } bb_fflush_stdout_and_exit(status); } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/include/platform.h b/include/platform.h index 6b3b3f78e..c399b8e16 100644 --- a/include/platform.h +++ b/include/platform.h @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* Copyright 2006, Bernhard Fischer @@ -99,9 +100,11 @@ #endif /* ---- miscellaneous --------------------------------------- */ +#if ENABLE_DEBUG_KEEP_NLS_CRAP /* NLS stuff */ /* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */ #define _(Text) Text #define N_(Text) (Text) +#endif #endif /* platform.h */ diff --git a/init/init.c b/init/init.c index 9dbbb7d2d..b0443d095 100644 --- a/init/init.c +++ b/init/init.c @@ -1170,11 +1170,3 @@ int init_main(int argc, char **argv) } } } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/bb_do_delay.c b/libbb/bb_do_delay.c index 1fbdc9ae8..e14b67a19 100644 --- a/libbb/bb_do_delay.c +++ b/libbb/bb_do_delay.c @@ -22,11 +22,3 @@ void bb_do_delay(int seconds) time(&now); } } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c index 68721ddf7..07876f0e2 100644 --- a/libbb/bb_pwd.c +++ b/libbb/bb_pwd.c @@ -168,13 +168,3 @@ unsigned long get_ug_id(const char *s, return r; } #endif /* L_get_ug_id */ - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ - diff --git a/libbb/chomp.c b/libbb/chomp.c index 774e533d4..6165b83bc 100644 --- a/libbb/chomp.c +++ b/libbb/chomp.c @@ -5,20 +5,7 @@ * 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 - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -33,13 +20,3 @@ void chomp(char *s) if(lc) *lc = 0; } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/device_open.c b/libbb/device_open.c index df5eae9e4..d34557b5a 100644 --- a/libbb/device_open.c +++ b/libbb/device_open.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -42,12 +30,3 @@ int device_open(const char *device, int mode) fcntl(fd, F_SETFL, mode); return fd; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/error_msg.c b/libbb/error_msg.c index 2a90ba438..a8ed4bf8e 100644 --- a/libbb/error_msg.c +++ b/libbb/error_msg.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -34,13 +22,3 @@ void bb_error_msg(const char *s, ...) va_end(p); putc('\n', stderr); } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c index 92043a535..842260b0f 100644 --- a/libbb/error_msg_and_die.c +++ b/libbb/error_msg_and_die.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -35,13 +23,3 @@ void bb_error_msg_and_die(const char *s, ...) putc('\n', stderr); exit(bb_default_error_retval); } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c index 83527a8c8..8341612d4 100644 --- a/libbb/find_mount_point.c +++ b/libbb/find_mount_point.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -64,13 +52,3 @@ struct mntent *find_mount_point(const char *name, const char *table) endmntent(mountTable); return mountEntry; } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c index 833c96f51..73467446f 100644 --- a/libbb/find_pid_by_name.c +++ b/libbb/find_pid_by_name.c @@ -57,12 +57,3 @@ long *pidlist_reverse(long *pidList) } return pidList; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/full_read.c b/libbb/full_read.c index 221fc947b..8d64bfb90 100644 --- a/libbb/full_read.c +++ b/libbb/full_read.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -52,12 +40,3 @@ ssize_t bb_full_read(int fd, void *buf, size_t len) return total; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/full_write.c b/libbb/full_write.c index 30de4078a..3d6d40184 100644 --- a/libbb/full_write.c +++ b/libbb/full_write.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -48,13 +36,3 @@ ssize_t bb_full_write(int fd, const void *buf, size_t len) return total; } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/get_console.c b/libbb/get_console.c index a5903d0c3..afe60c268 100644 --- a/libbb/get_console.c +++ b/libbb/get_console.c @@ -5,19 +5,7 @@ * 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 - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -87,13 +75,3 @@ int get_console_fd(void) bb_error_msg("Couldn't get a file descriptor referring to the console"); return fd; /* total failure */ } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/get_terminal_width_height.c b/libbb/get_terminal_width_height.c index df5aa907f..941f04c3a 100644 --- a/libbb/get_terminal_width_height.c +++ b/libbb/get_terminal_width_height.c @@ -29,13 +29,3 @@ int get_terminal_width_height(int fd, int *width, int *height) return ret; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ - diff --git a/libbb/herror_msg.c b/libbb/herror_msg.c index d0d0a15d2..1e6908d82 100644 --- a/libbb/herror_msg.c +++ b/libbb/herror_msg.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -32,13 +20,3 @@ void bb_herror_msg(const char *s, ...) bb_vherror_msg(s, p); va_end(p); } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/herror_msg_and_die.c b/libbb/herror_msg_and_die.c index 9a76ef7e1..285b195ef 100644 --- a/libbb/herror_msg_and_die.c +++ b/libbb/herror_msg_and_die.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -33,13 +21,3 @@ void bb_herror_msg_and_die(const char *s, ...) va_end(p); exit(bb_default_error_retval); } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c index fbcd81327..2ac1623f4 100644 --- a/libbb/inode_hash.c +++ b/libbb/inode_hash.c @@ -5,20 +5,7 @@ * 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 - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -99,13 +86,3 @@ void reset_ino_dev_hashtable(void) } } #endif - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/isdirectory.c b/libbb/isdirectory.c index 7f8f7e415..b35919869 100644 --- a/libbb/isdirectory.c +++ b/libbb/isdirectory.c @@ -5,19 +5,7 @@ * 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 - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -49,12 +37,3 @@ int is_directory(const char *fileName, const int followLinks, struct stat *statB return status; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c index 310da2fa0..e784a049a 100644 --- a/libbb/kernel_version.c +++ b/libbb/kernel_version.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -50,12 +38,3 @@ int get_linux_version_code(void) } return r; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/mtab_file.c b/libbb/mtab_file.c index abb9b9322..3821a6806 100644 --- a/libbb/mtab_file.c +++ b/libbb/mtab_file.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -30,13 +18,3 @@ const char bb_path_mtab_file[] = "/etc/mtab"; #else const char bb_path_mtab_file[] = "/proc/mounts"; #endif - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/perror_msg.c b/libbb/perror_msg.c index a0fdabc1d..7fb0830be 100644 --- a/libbb/perror_msg.c +++ b/libbb/perror_msg.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -33,13 +21,3 @@ void bb_perror_msg(const char *s, ...) bb_vperror_msg(s, p); va_end(p); } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/perror_msg_and_die.c b/libbb/perror_msg_and_die.c index 4a26dcce8..5b0464077 100644 --- a/libbb/perror_msg_and_die.c +++ b/libbb/perror_msg_and_die.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -34,13 +22,3 @@ void bb_perror_msg_and_die(const char *s, ...) va_end(p); exit(bb_default_error_retval); } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/print_file.c b/libbb/print_file.c index 26bd0d458..ea5d1d222 100644 --- a/libbb/print_file.c +++ b/libbb/print_file.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -65,12 +53,3 @@ int bb_xprint_file_by_name(const char *filename) return -1; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c index 1b7b6d190..138e751f5 100644 --- a/libbb/process_escape_sequence.c +++ b/libbb/process_escape_sequence.c @@ -5,21 +5,7 @@ * Copyright (C) Manuel Novoa III * and Vladimir Oleynik * - * 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -101,12 +87,3 @@ char bb_process_escape_sequence(const char **ptr) return (char) n; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/procps.c b/libbb/procps.c index 305a71723..436905c46 100644 --- a/libbb/procps.c +++ b/libbb/procps.c @@ -4,8 +4,8 @@ * * Copyright 1998 by Albert Cahalan; all rights reserved. * Copyright (C) 2002 by Vladimir Oleynik - * GNU Library General Public License Version 2, or any later version * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -146,12 +146,3 @@ procps_status_t * procps_scan(int save_user_arg0) return memcpy(&ret_status, &curstatus, sizeof(procps_status_t)); } } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index 6b005e22d..a30addc4f 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c @@ -116,13 +116,3 @@ int recursive_action(const char *fileName, } return TRUE; } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/safe_read.c b/libbb/safe_read.c index 92e1d8a4b..a59934a4d 100644 --- a/libbb/safe_read.c +++ b/libbb/safe_read.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -36,13 +24,3 @@ ssize_t safe_read(int fd, void *buf, size_t count) return n; } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/safe_strncpy.c b/libbb/safe_strncpy.c index d4275698c..add92ac9f 100644 --- a/libbb/safe_strncpy.c +++ b/libbb/safe_strncpy.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -30,13 +18,3 @@ char * safe_strncpy(char *dst, const char *src, size_t size) dst[size-1] = '\0'; return strncpy(dst, src, size-1); } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/safe_write.c b/libbb/safe_write.c index 201ea1cd3..c81f1247f 100644 --- a/libbb/safe_write.c +++ b/libbb/safe_write.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -36,13 +24,3 @@ ssize_t safe_write(int fd, const void *buf, size_t count) return n; } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/trim.c b/libbb/trim.c index 0dca6678e..d36391540 100644 --- a/libbb/trim.c +++ b/libbb/trim.c @@ -5,20 +5,7 @@ * 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 - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -42,12 +29,3 @@ void trim(char *s) } s[len] = 0; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/vdprintf.c b/libbb/vdprintf.c index 96c71ea63..ffcb7a444 100644 --- a/libbb/vdprintf.c +++ b/libbb/vdprintf.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -35,13 +23,3 @@ int vdprintf(int d, const char *format, va_list ap) return write(d, buf, len); } #endif - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c index d0fbb05c6..d458a7b2c 100644 --- a/libbb/verror_msg.c +++ b/libbb/verror_msg.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -31,13 +19,3 @@ void bb_verror_msg(const char *s, va_list p) fprintf(stderr, "%s: ", bb_applet_name); vfprintf(stderr, s, p); } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/vperror_msg.c b/libbb/vperror_msg.c index ed4ac83cd..5a854ec4a 100644 --- a/libbb/vperror_msg.c +++ b/libbb/vperror_msg.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -33,13 +21,3 @@ void bb_vperror_msg(const char *s, va_list p) if (*s) s = ": "; fprintf(stderr, "%s%s\n", s, strerror(err)); } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/wfopen.c b/libbb/wfopen.c index ab77cb19e..9d663281e 100644 --- a/libbb/wfopen.c +++ b/libbb/wfopen.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -32,13 +20,3 @@ FILE *bb_wfopen(const char *path, const char *mode) } return fp; } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 9b9081e26..fa6aa0f9f 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -173,12 +173,3 @@ void bb_xfflush_stdout(void) } } #endif - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/xregcomp.c b/libbb/xregcomp.c index c28ca659d..4bcb9aedf 100644 --- a/libbb/xregcomp.c +++ b/libbb/xregcomp.c @@ -5,20 +5,7 @@ * 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 - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -37,13 +24,3 @@ void xregcomp(regex_t *preg, const char *regex, int cflags) bb_error_msg_and_die("xregcomp: %s", errmsg); } } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/loginutils/vlock.c b/loginutils/vlock.c index 6f391075b..cec1d0ab0 100644 --- a/loginutils/vlock.c +++ b/loginutils/vlock.c @@ -5,20 +5,7 @@ * Copyright (C) 2000 by spoon * Written by spoon * - * 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* Shoutz to Michael K. Johnson , author of the @@ -141,11 +128,3 @@ int vlock_main(int argc, char **argv) restore_terminal(); return 0; } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/miscutils/rx.c b/miscutils/rx.c index 3df461349..ef372d383 100644 --- a/miscutils/rx.c +++ b/miscutils/rx.c @@ -317,11 +317,3 @@ int rx_main(int argc, char **argv) bb_fflush_stdout_and_exit(EXIT_SUCCESS); } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index f285e8b31..40e1328a9 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c @@ -350,11 +350,3 @@ int ftpgetput_main(int argc, char **argv) return(ftp_action(server, control_stream, argv[optind + 1], argv[optind + 2])); } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/networking/ipcalc.c b/networking/ipcalc.c index c5f2ba121..a24629a9d 100644 --- a/networking/ipcalc.c +++ b/networking/ipcalc.c @@ -8,6 +8,8 @@ * This is a complete reimplementation of the ipcalc program * from Red Hat. I didn't look at their source code, but there * is no denying that this is a loving reimplementation + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include @@ -214,12 +216,3 @@ int ipcalc_main(int argc, char **argv) return EXIT_SUCCESS; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/networking/telnet.c b/networking/telnet.c index 2ad44d429..b3045f878 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -734,11 +734,3 @@ int telnet_main(int argc, char** argv) } } } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/networking/wget.c b/networking/wget.c index 6efa3bf21..d55f4b007 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -854,13 +854,3 @@ progressmeter(int flag) * * $Id: wget.c,v 1.75 2004/10/08 08:27:40 andersen Exp $ */ - - - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index 6dc5457af..95a35c25e 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c @@ -128,11 +128,3 @@ int klogd_main(int argc, char **argv) return EXIT_SUCCESS; } - -/* -Local Variables -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 74c407142..deaee49c2 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -680,11 +680,3 @@ int syslogd_main(int argc, char **argv) return EXIT_SUCCESS; } - -/* -Local Variables -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 9e33b79bf..005af8fa8 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -2,19 +2,7 @@ * getopt.c - Enhanced implementation of BSD getopt(1) * Copyright (c) 1997, 1998, 1999, 2000 Frodo Looijaard * - * 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* @@ -380,11 +368,3 @@ int getopt_main(int argc, char *argv[]) argv[optind-1]=argv[0]; return (generate_output(argv+optind-1,argc-optind+1,optstr,long_options)); } - -/* - Local Variables: - c-file-style: "linux" - c-basic-offset: 4 - tab-width: 4 - End: -*/ diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c index c86e73cc1..4e67043cd 100644 --- a/util-linux/pivot_root.c +++ b/util-linux/pivot_root.c @@ -5,6 +5,8 @@ * busyboxed by Evin Robertson * pivot_root syscall stubbed by Erik Andersen, so it will compile * regardless of the kernel being used. + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include #include @@ -24,12 +26,3 @@ int pivot_root_main(int argc, char **argv) return EXIT_SUCCESS; } - - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ -- 2.25.1