philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only show version once with -v command line option

Browse Source 
Reported by cpet.
This commit is contained in:
Kevin Easton
2016-02-24 17:23:38 +11:00
parent 6dc89247e2
commit c2a2d68d8d
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2.2] [Changes 1.2.2]
* Only show version once with -v option (reported by cpet). (caf)
* Drop group privileges before droppping user privileges when execing. (caf) * Drop group privileges before droppping user privileges when execing. (caf)
* Apply patch from cpet to make autogen.sh prompt to run configure. (caf) * Apply patch from cpet to make autogen.sh prompt to run configure. (caf)

19
source/irc.c
View File

@@ -201,7 +201,6 @@ struct in_addr nat_address;
static void quit_response (char *, char *); static void quit_response (char *, char *);
static void versionreply (void);
static char *parse_args (char **, int, char **); static char *parse_args (char **, int, char **);
static void remove_pid(void); static void remove_pid(void);
void do_ansi_logo(int); void do_ansi_logo(int);
@@ -552,13 +551,6 @@ void set_detach_on_hup(Window *dummy, char *unused, int value)
my_signal(SIGHUP, irc_exit_old, 0); my_signal(SIGHUP, irc_exit_old, 0);
} }
/* shows the version of irc */
static void versionreply(void)
{
printf("BitchX version %s (%s)\n\r", irc_version, internal_version);
exit (0);
}
#ifndef RAND_MAX #ifndef RAND_MAX
#define RAND_MAX 2147483647 #define RAND_MAX 2147483647
#endif #endif
@@ -676,12 +668,8 @@ static char *parse_args (char *argv[], int argc, char **envp)
case 'A': /* turn off startup ansi */ case 'A': /* turn off startup ansi */
startup_ansi = 0; startup_ansi = 0;
break; break;
case 'v': /* Output ircII version */ case 'v': /* Output client version (already done) and exit */
{ exit(0);
versionreply();
/* NOTREACHED */
}
case 'c': /* Default channel to join */ case 'c': /* Default channel to join */
{ {
char *what = empty_string; char *what = empty_string;
@@ -1491,11 +1479,10 @@ int main(int argc, char *argv[], char *envp[])
*cx_function = 0; *cx_function = 0;
#endif #endif
#if !defined(GUI)
printf("BitchX - Based on EPIC Software Labs epic ircII (1998).\r\n"); printf("BitchX - Based on EPIC Software Labs epic ircII (1998).\r\n");
printf("Version (%s) -- Date (%s).\r\n", irc_version, internal_version); printf("Version (%s) -- Date (%s).\r\n", irc_version, internal_version);
printf("Process [%d]", getpid()); printf("Process [%d]", getpid());
#if !defined(GUI)
if ((isatty(0) && !background) || (!isatty(0) && background)) if ((isatty(0) && !background) || (!isatty(0) && background))
{ {
char s[90]; char s[90];