bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main: remove the "-l" switch to display the license and authors

Browse Source 
Signed-off-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Michael Adam 2018-09-01 02:03:09 +02:00
parent 89b2c68b2b
commit 56f30a4386
2 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/man8/tinyproxy.txt.in
View File

@ -40,9 +40,6 @@ OPTIONS
*-h*:: *-h*::
Display a short help screen of command line arguments and exit. Display a short help screen of command line arguments and exit.
*-l*::
Display the licensing agreement.
*-v*:: *-v*::
Display version information and exit. Display version information and exit.

57
src/main.c
View File

@ -32,7 +32,6 @@
#include "main.h" #include "main.h"
#include "anonymous.h" #include "anonymous.h"
#include "authors.h"
#include "buffer.h" #include "buffer.h"
#include "conf.h" #include "conf.h"
#include "daemon.h" #include "daemon.h"
@ -87,55 +86,6 @@ display_version (void)
printf ("%s %s\n", PACKAGE, VERSION); printf ("%s %s\n", PACKAGE, VERSION);
} }
/*
* Display the copyright and license for this program.
*/
static void
display_license (void)
{
const char * const *authors;
const char * const *documenters;
display_version ();
printf ("\
\n\
Copyright 1998 Steven Young (sdyoung@well.com)\n\
Copyright 1998-2002 Robert James Kaes (rjkaes@users.sourceforge.net)\n\
Copyright 1999 George Talusan (gstalusan@uwaterloo.ca)\n\
Copyright 2000 Chris Lightfoot (chris@ex-parrot.com)\n\
Copyright 2009-2010 Mukund Sivaraman (muks@banu.com)\n\
Copyright 2009-2010 Michael Adam (obnox@samba.org)\n\
\n\
This program is free software; you can redistribute it and/or modify\n\
it under the terms of the GNU General Public License as published by\n\
the Free Software Foundation; either version 2, or (at your option)\n\
any later version.\n\
\n\
This program is distributed in the hope that it will be useful,\n\
but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
GNU General Public License for more details.\n\
\n\
You should have received a copy of the GNU General Public License\n\
along with this program; if not, write to the Free Software\n\
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n\
\n");
printf ("\nAUTHORS:\n");
for (authors = authors_get_authors (); *authors; authors++) {
printf (" %s\n", *authors);
}
printf ("\nDOCUMENTERS:\n");
for (documenters = authors_get_documenters ();
*documenters; documenters++) {
printf (" %s\n", *documenters);
}
printf ("\n");
}
/* /*
* Display usage to the user. * Display usage to the user.
*/ */
@ -150,7 +100,6 @@ display_usage (void)
" -d Do not daemonize (run in foreground).\n" " -d Do not daemonize (run in foreground).\n"
" -c FILE Use an alternate configuration file.\n" " -c FILE Use an alternate configuration file.\n"
" -h Display this usage information.\n" " -h Display this usage information.\n"
" -l Display the license.\n"
" -v Display version information.\n"); " -v Display version information.\n");
/* Display the modes compiled into tinyproxy */ /* Display the modes compiled into tinyproxy */
@ -224,16 +173,12 @@ process_cmdline (int argc, char **argv, struct config_s *conf)
{ {
int opt; int opt;
while ((opt = getopt (argc, argv, "c:vldh")) != EOF) { while ((opt = getopt (argc, argv, "c:vdh")) != EOF) {
switch (opt) { switch (opt) {
case 'v': case 'v':
display_version (); display_version ();
exit (EX_OK); exit (EX_OK);
case 'l':
display_license ();
exit (EX_OK);
case 'd': case 'd':
conf->godaemon = FALSE; conf->godaemon = FALSE;
break; break;