diff -up xpilot-ng-4.7.2/src/client/textinterface.c~ xpilot-ng-4.7.2/src/client/textinterface.c --- xpilot-ng-4.7.2/src/client/textinterface.c~ 2005-09-02 19:06:20.000000000 +0200 +++ xpilot-ng-4.7.2/src/client/textinterface.c 2010-01-15 12:34:07.000000000 +0100 @@ -37,7 +37,7 @@ extern int dgram_one_socket; /* from da /* * just like fgets() but strips newlines like gets(). */ -static char* getline(char* buf, int len, FILE* stream) +static char* xp_getline(char* buf, int len, FILE* stream) { char *nl; @@ -251,7 +251,7 @@ static bool Process_commands(sockbuf_t * else if (!auto_connect) { printf("*** Server on %s. Enter command> ", conpar->server_name); - getline(linebuf, MAX_LINE, stdin); + xp_getline(linebuf, MAX_LINE, stdin); if (feof(stdin)) { puts(""); c = 'Q'; @@ -338,7 +338,7 @@ static bool Process_commands(sockbuf_t * case 'K': printf("Enter name of victim: "); fflush(stdout); - if (!getline(linebuf, MAX_LINE, stdin)) { + if (!xp_getline(linebuf, MAX_LINE, stdin)) { printf("Nothing changed.\n"); continue; } @@ -349,7 +349,7 @@ static bool Process_commands(sockbuf_t * case 'M': /* Send a message to server. */ printf("Enter message: "); fflush(stdout); - if (!getline(linebuf, MAX_LINE, stdin) || !linebuf[0]) { + if (!xp_getline(linebuf, MAX_LINE, stdin) || !linebuf[0]) { printf("No message sent.\n"); continue; } @@ -364,7 +364,7 @@ static bool Process_commands(sockbuf_t * case 'D': /* Shutdown */ if (!auto_shutdown) { printf("Enter delay in seconds or return for cancel: "); - getline(linebuf, MAX_LINE, stdin); + xp_getline(linebuf, MAX_LINE, stdin); /* * No argument = cancel shutdown = arg_int=0 */ @@ -375,7 +375,7 @@ static bool Process_commands(sockbuf_t * delay = 1; printf("Enter reason: "); - getline(linebuf, MAX_LINE, stdin); + xp_getline(linebuf, MAX_LINE, stdin); } else { strlcpy(linebuf, shutdown_reason, sizeof(linebuf)); delay = 60; @@ -388,7 +388,7 @@ static bool Process_commands(sockbuf_t * case 'O': /* Tune an option. */ printf("Enter option: "); fflush(stdout); - if (!getline(linebuf, MAX_LINE, stdin) + if (!xp_getline(linebuf, MAX_LINE, stdin) || (len=strlen(linebuf)) == 0) { printf("Nothing changed.\n"); continue; @@ -396,7 +396,7 @@ static bool Process_commands(sockbuf_t * printf("Enter new value for %s: ", linebuf); fflush(stdout); strcat(linebuf, ":"); len++; - if (!getline(&linebuf[len], MAX_LINE-len, stdin) + if (!xp_getline(&linebuf[len], MAX_LINE-len, stdin) || linebuf[len] == '\0') { printf("Nothing changed.\n"); continue; @@ -450,7 +450,7 @@ static bool Process_commands(sockbuf_t * case 'T': /* Set team. */ printf("Enter team: "); fflush(stdout); - if (!getline(linebuf, MAX_LINE, stdin) + if (!xp_getline(linebuf, MAX_LINE, stdin) || (len = strlen(linebuf)) == 0) printf("Nothing changed.\n"); else {