From 206212ca161b23aece16795f0b4e61a133ba7a6a Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 1 Apr 2008 19:06:28 +0100 Subject: [PATCH] Fix whitespace throughout. --- Makefile.am | 6 +++--- acl.c | 8 ++++---- acl.h | 8 ++++---- addr.h | 10 +++++----- blast.c | 2 +- chan.c | 6 +++--- chan.h | 6 +++--- conf.c | 6 +++--- conf.h | 6 +++--- configure.in | 4 ++-- debian/control | 2 +- debian/rules | 2 +- endpt.c | 8 ++++---- endpt.h | 6 +++--- exec.c | 8 ++++---- exec.h | 8 ++++---- fattr.c | 6 +++--- fattr.h | 6 +++--- file.c | 14 +++++++------- file.h | 6 +++--- fw.1.in | 18 +++++++++--------- fw.c | 16 ++++++++-------- fw.h | 6 +++--- identify.c | 6 +++--- identify.h | 6 +++--- inet.c | 8 ++++---- inet.h | 6 +++--- make-manpage | 2 +- mantext.h | 8 ++++---- privconn.c | 6 +++--- privconn.h | 6 +++--- reffd.c | 6 +++--- reffd.h | 6 +++--- rlimits.h | 6 +++--- scan.c | 6 +++--- scan.h | 8 ++++---- socket.c | 6 +++--- socket.h | 6 +++--- source.c | 6 +++--- source.h | 6 +++--- target.h | 6 +++--- un.c | 8 ++++---- un.h | 6 +++--- 43 files changed, 146 insertions(+), 146 deletions(-) diff --git a/Makefile.am b/Makefile.am index c90449b..e9d4aa4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,12 +13,12 @@ ## 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. -## +## ## `fw' 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 `fw'; if not, write to the Free Software Foundation, ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -45,7 +45,7 @@ fw.1: fw.1.in make-manpage mantext.c: fw.1.in make-manpage perl $(srcdir)/make-manpage c <$(srcdir)/fw.1.in >$@.new - mv $@.new $@ + mv $@.new $@ fw_SOURCES = \ chan.c conf.c endpt.c fw.c mantext.c reffd.c scan.c \ diff --git a/acl.c b/acl.c index bedd735..f3140f5 100644 --- a/acl.c +++ b/acl.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -68,7 +68,7 @@ static int acl_checkhost(void *aa, struct in_addr addr, unsigned port) static void acl_dumphost(void *aa, FILE *fp) { acl_host *a = aa; - + fputs("from ", fp); fputs(inet_ntoa(a->addr), fp); fputc('/', fp); diff --git a/acl.h b/acl.h index 93a5694..acc92d2 100644 --- a/acl.h +++ b/acl.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -131,7 +131,7 @@ extern void acl_addhost(acl_entry ***/*a*/, unsigned /*act*/, * * Returns: --- * - * Use: Adds a privileged-port check to the end of an access control + * Use: Adds a privileged-port check to the end of an access control * list. */ diff --git a/addr.h b/addr.h index 89ace85..7da1fef 100644 --- a/addr.h +++ b/addr.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -52,7 +52,7 @@ #endif /*----- Data structures ---------------------------------------------------*/ - + /* --- A generic socket address --- * * * Not all systems understand @sa_len@ fields. (In particular, Linux @@ -270,7 +270,7 @@ typedef struct addr_ops { int (*connect)(addr */*a*/, addr_opts */*ao*/, conn */*c*/, endpt */*e*/); } addr_ops; - + /*----- That's all, folks -------------------------------------------------*/ #ifdef __cplusplus diff --git a/blast.c b/blast.c index d032646..597263e 100644 --- a/blast.c +++ b/blast.c @@ -103,7 +103,7 @@ static void timers(void) } puts(""); } - + static void newconn(blast *b) { int fd = socket(PF_INET, SOCK_STREAM, 0); diff --git a/chan.c b/chan.c index ac4cf3e..1729af3 100644 --- a/chan.c +++ b/chan.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/chan.h b/chan.h index ac1f0c2..e416feb 100644 --- a/chan.h +++ b/chan.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/conf.c b/conf.c index 04b0ac5..7212e71 100644 --- a/conf.c +++ b/conf.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/conf.h b/conf.h index adf80c2..99cce31 100644 --- a/conf.h +++ b/conf.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/configure.in b/configure.in index 391648f..0952eb7 100644 --- a/configure.in +++ b/configure.in @@ -13,12 +13,12 @@ dnl `fw' is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 2 of the License, or dnl (at your option) any later version. -dnl +dnl dnl `fw' is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with `fw'; if not, write to the Free Software Foundation, dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/debian/control b/debian/control index 9652b97..5300dfd 100644 --- a/debian/control +++ b/debian/control @@ -13,5 +13,5 @@ Description: Excessive port forwarder locally-executed programs, and file descriptors. It can do host-based access control. It will log incoming TCP connections by hostname and username (as reported by identd on the connecting host). It subsumes the - basic functionality of inetd, cat, netcat and others. It runs as a + basic functionality of inetd, cat, netcat and others. It runs as a single nonblocking process. diff --git a/debian/rules b/debian/rules index 21b6cee..b149ebf 100755 --- a/debian/rules +++ b/debian/rules @@ -42,4 +42,4 @@ source: d=`pwd`; cd ..; dpkg-source -i -b $$d/deb-build/=deb=/* rm -rf deb-build/=deb= -.PHONY: binary binary-arch binary-indep clean install source +.PHONY: binary binary-arch binary-indep clean install source diff --git a/endpt.c b/endpt.c index 8e5d0e6..9401aa4 100644 --- a/endpt.c +++ b/endpt.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -364,6 +364,6 @@ void endpt_join(endpt *a, endpt *b) chan_open(&t->c->ab, a->in->fd, b->out->fd, doneab, t); chan_open(&t->c->ba, b->in->fd, a->out->fd, doneba, t); return; -} +} /*----- That's all, folks -------------------------------------------------*/ diff --git a/endpt.h b/endpt.h index d88784d..b2a5e14 100644 --- a/endpt.h +++ b/endpt.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/exec.c b/exec.c index 16883ec..0ea283f 100644 --- a/exec.c +++ b/exec.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -812,7 +812,7 @@ static int exec_option(xdata *x, scanner *sc) /* --- Set a chroot prison --- */ if (strcmp(sc->d.buf, "root") == 0 || - strcmp(sc->d.buf, "chroot") == 0) { + strcmp(sc->d.buf, "chroot") == 0) { dstr d = DSTR_INIT; token(sc); if (sc->t == '=') diff --git a/exec.h b/exec.h index 8a0dbe7..9d4fb0c 100644 --- a/exec.h +++ b/exec.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -57,7 +57,7 @@ extern target_ops xtarget_ops; * Use: Initializes the executable problem source and target. */ -extern void exec_init(void); +extern void exec_init(void); /*----- That's all, folks -------------------------------------------------*/ diff --git a/fattr.c b/fattr.c index f9e56d3..f27511c 100644 --- a/fattr.c +++ b/fattr.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/fattr.h b/fattr.h index ac3518a..d08be26 100644 --- a/fattr.h +++ b/fattr.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/file.c b/file.c index 2e342cb..914edd8 100644 --- a/file.c +++ b/file.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -90,7 +90,7 @@ typedef struct fdata { typedef struct fsource { source s; fdata f; -} fsource; +} fsource; /* --- File target block --- */ @@ -176,7 +176,7 @@ static reffd *file_nullref(void) reffd_handler(rnull, file_null, 0); } return (rnull); -} +} /* --- @file_fspec@ --- * * @@ -250,7 +250,7 @@ static void file_fspec(fspec *f, scanner *sc) else if (fd) { f->type = FTYPE_FD; f->u.fd = fd; - token(sc); + token(sc); } else if (type == FTYPE_FD) { if (sc->t == CTOK_WORD) error(sc, "bad file descriptor `%s'", sc->d.buf); @@ -306,7 +306,7 @@ static void file_pfspec(fspec *f, dstr *d) case FTYPE_NULL: dstr_puts(d, "null"); break; - } + } } static void file_desc(fdata *f, dstr *d) diff --git a/file.h b/file.h index 57b627a..cb558f7 100644 --- a/file.h +++ b/file.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/fw.1.in b/fw.1.in index 8674d57..5dc51f7 100644 --- a/fw.1.in +++ b/fw.1.in @@ -6,19 +6,19 @@ .\" . .\"----- Licensing notice --------------------------------------------------- -.\" +.\" .\" This file is part of the `fw' port forwarder. -.\" +.\" .\" `fw' 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. -.\" +.\" .\" `fw' 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 `fw'; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -261,7 +261,7 @@ Whitespace characters separate words but are otherwise ignored. All considered to be whitespace for these purposes. .TP .I "special characters" -There are three special characters. The +There are three special characters. The .RB ` # ' character, if it appears at the start of a word, introduces a .I comment @@ -676,7 +676,7 @@ the file is created if it doesn't exist. Controls the behaviour if the output file already exists. If .BR no , an error is reported. If -.B truncate +.B truncate (the default), the existing file is replaced by the new data. If .BR append , the new data is appended to the file. @@ -755,7 +755,7 @@ is used. Note that the shell command or program name string must, if present, have any delimiter characters (including .RB ` / ' -and +and .RB ` . ') quoted; this is not required in the .RB ` [ '-enclosed @@ -987,7 +987,7 @@ system call. The default is 5. .RB [ = ] .BR yes | no .OD -Whether to log incoming connections. If +Whether to log incoming connections. If .B yes (the default) incoming connections are logged, together with information about the client (where available) and whether the connection was @@ -1106,7 +1106,7 @@ has .I dropped privileges after initialization (the .B \-s -option). Before dropping privileges, +option). Before dropping privileges, .B fw forks off a separate process which continues to run with root privileges, and on demand passes sockets bound to privileged ports and diff --git a/fw.c b/fw.c index c6af663..d09302b 100644 --- a/fw.c +++ b/fw.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -114,7 +114,7 @@ void parse(scanner *sc) if (strcmp(sc->d.buf, "forward") == 0 || strcmp(sc->d.buf, "fw") == 0 || - strcmp(sc->d.buf, "from") == 0) { + strcmp(sc->d.buf, "from") == 0) { source *s; target *t; @@ -606,7 +606,7 @@ int main(int argc, char *argv[]) flags |= FW_QUIET; break; case 's': - if (isdigit((unsigned char )optarg[0])) { + if (isdigit((unsigned char )optarg[0])) { char *q; drop = strtol(optarg, &q, 0); if (*q) @@ -619,7 +619,7 @@ int main(int argc, char *argv[]) } break; case 'g': - if (isdigit((unsigned char )optarg[0])) { + if (isdigit((unsigned char )optarg[0])) { char *q; dropg = strtol(optarg, &q, 0); if (*q) @@ -738,7 +738,7 @@ int main(int argc, char *argv[]) int selerr = 0; while (active) { if (!sel_select(sel)) - selerr = 0; + selerr = 0; else if (errno != EINTR && errno != EAGAIN) { fw_log(-1, "error from select: %s", strerror(errno)); selerr++; @@ -749,7 +749,7 @@ int main(int argc, char *argv[]) } } } - + return (0); } diff --git a/fw.h b/fw.h index c3230e2..afd313e 100644 --- a/fw.h +++ b/fw.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/identify.c b/identify.c index 13c81bd..281c974 100644 --- a/identify.c +++ b/identify.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/identify.h b/identify.h index bbac1fd..66dc1c7 100644 --- a/identify.h +++ b/identify.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/inet.c b/inet.c index bf86323..cd66719 100644 --- a/inet.c +++ b/inet.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -473,7 +473,7 @@ addr_ops inet_ops = { inet_initsrcopts, inet_option, inet_confirm, inet_freesrcopts, inet_bind, 0, inet_accept, inet_inittargopts, inet_freetargopts, - inet_connect + inet_connect }; /*----- That's all, folks -------------------------------------------------*/ diff --git a/inet.h b/inet.h index d80a018..2804bde 100644 --- a/inet.h +++ b/inet.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/make-manpage b/make-manpage index b82f4d2..d5088d4 100755 --- a/make-manpage +++ b/make-manpage @@ -115,7 +115,7 @@ sub deroff { # foo } elsif (/^[^.]/) { $out .= $sep . $_; - $sep = " "; + $sep = " "; } elsif (/^\.br$/ || /^\.PP$/) { $out .= "\n"; $sep = "\t"; diff --git a/mantext.h b/mantext.h index 557151d..ccd0ae7 100644 --- a/mantext.h +++ b/mantext.h @@ -5,7 +5,7 @@ * (c) 2006 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -35,7 +35,7 @@ extern const char grammar_text[]; extern const char option_text[]; - + /*----- That's all, folks -------------------------------------------------*/ #ifdef __cplusplus diff --git a/privconn.c b/privconn.c index 7b2c329..bb282d0 100644 --- a/privconn.c +++ b/privconn.c @@ -5,7 +5,7 @@ * (c) 2003 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/privconn.h b/privconn.h index 5a17500..78e0ba4 100644 --- a/privconn.h +++ b/privconn.h @@ -5,7 +5,7 @@ * (c) 2003 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/reffd.c b/reffd.c index 6f4e106..44d7e39 100644 --- a/reffd.c +++ b/reffd.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/reffd.h b/reffd.h index 89e5883..5e03f1b 100644 --- a/reffd.h +++ b/reffd.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/rlimits.h b/rlimits.h index 28f94ac..d983fd7 100644 --- a/rlimits.h +++ b/rlimits.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/scan.c b/scan.c index fb7c2c3..0f0f81c 100644 --- a/scan.c +++ b/scan.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/scan.h b/scan.h index 83dfc91..966b939 100644 --- a/scan.h +++ b/scan.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -108,7 +108,7 @@ extern scansrc *scan_argv(char **/*av*/); * Use: Scans a character from a source of characters. */ -extern int scan(scanner */*sc*/); +extern int scan(scanner */*sc*/); /* --- @unscan@ --- * * diff --git a/socket.c b/socket.c index 5bfef37..5a7dbfa 100644 --- a/socket.c +++ b/socket.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/socket.h b/socket.h index 23f0bf9..4726abf 100644 --- a/socket.h +++ b/socket.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/source.c b/source.c index 6823576..5256e87 100644 --- a/source.c +++ b/source.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/source.h b/source.h index 8a0bcbc..4ec5d65 100644 --- a/source.h +++ b/source.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/target.h b/target.h index a34405e..1f65688 100644 --- a/target.h +++ b/target.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/un.c b/un.c index c18b1c4..223dfc0 100644 --- a/un.c +++ b/un.c @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -152,7 +152,7 @@ static reffd *un_accept(int fd, addr_opts *ao, const char *desc) char buf[PATH_MAX + sizeof(struct sockaddr)]; struct sockaddr_un *sun = (struct sockaddr_un *)buf; size_t sunsz = sizeof(buf); - + if ((nfd = accept(fd, (struct sockaddr *)sun, &sunsz)) < 0) return (0); } diff --git a/un.h b/un.h index 7131d71..f83cca5 100644 --- a/un.h +++ b/un.h @@ -5,7 +5,7 @@ * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -13,12 +13,12 @@ * 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. - * + * * `fw' 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 `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- 2.11.0