empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(handleintr): Move to main.c. Internal linkage. Remove empty

Browse source 
handle.c
(interrupt): Internal linkage.

(interrupt): Use proper type for access from signal handler.
(intr): Don't increment to set, it's unobvious and it could overflow.
This commit is contained in:
Markus Armbruster 2005-12-28 16:16:41 +00:00
parent 5c02a0aefc
commit 87ace6afe4
3 changed files with 18 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/client/handle.c
View file

@ -1,58 +0,0 @@
/*
* Empire - A multi-player, client/server Internet based war game.
* Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* 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
*
* ---
*
* See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
* related information and legal notices. It is expected that any future
* projects/authors will amend these files as needed.
*
* ---
*
* handle.c: Interrupt handler
*
* Known contributors to this file:
* Dave Pare, 1989
* Steve McClure, 1998
*/
#include <config.h>
#if !defined(_WIN32)
#include <unistd.h>
#else
#include <winsock.h>
#endif
#include "misc.h"
int
handleintr(int s)
{
if (interrupt) {
/* tacky, but it works */
#if !defined(_WIN32)
if (write(s, "\naborted\n", 1 + 7 + 1) <= 0)
#else
if (send(s, "\naborted\n", 1 + 7 + 1, 0) <= 0)
#endif
return 0;
interrupt = 0;
}
return 1;
}

20
src/client/main.c
View file

@ -69,9 +69,9 @@ HANDLE hStdIn;
#define RETRY 3
int eight_bit_clean;
int interrupt;
int sock;
static volatile sig_atomic_t interrupt;
static void intr(int sig);
@ -332,7 +332,7 @@ main(int ac, char **av)
static void
intr(int sig)
{
interrupt++;
interrupt = 1;
#ifdef _WIN32
signal(SIGINT, intr);
#endif
@ -340,3 +340,19 @@ intr(int sig)
signal(SIGINT, intr);
#endif
}
static int
handleintr(int s)
{
if (interrupt) {
/* tacky, but it works */
#if !defined(_WIN32)
if (write(s, "\naborted\n", 1 + 7 + 1) <= 0)
#else
if (send(s, "\naborted\n", 1 + 7 + 1, 0) <= 0)
#endif
return 0;
interrupt = 0;
}
return 1;
}

2
src/client/misc.h
View file

@ -51,7 +51,6 @@ struct ioqueue;
extern char empirehost[];
extern char empireport[];
extern int eight_bit_clean;
extern int interrupt;
extern char num_teles[];
extern int sock;
extern char *SO;
@ -74,7 +73,6 @@ void putse(void);
#endif
int recvline(int s, char *buf);
int expect(int s, int match, char *buf);
int handleintr(int);
int hostaddr(char *name, struct sockaddr_in *addr);
int hostconnect(struct sockaddr_in *addr);
int hostport(char *name, struct sockaddr_in *addr);