X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=console.c;h=fb75ba209b6af6cb1c3a7da0eff667880552fe41;hb=4eb6393c19467e2a1e45913397aaf11380d1cd83;hp=a3d7bb5c19a93f1abe30360c4fd8f2ed255a44eb;hpb=98a8de78b00646eb1674620e22becd243412d17c;p=xonotic%2Fdarkplaces.git diff --git a/console.c b/console.c index a3d7bb5c..fb75ba20 100644 --- a/console.c +++ b/console.c @@ -96,13 +96,18 @@ cvar_t con_nickcompletion_flags = {CVAR_SAVE, "con_nickcompletion_flags", "11", #define NICKS_ALPHANUMERICS_ONLY 8 #define NICKS_NO_SPACES 16 +cvar_t con_completion_playdemo = {CVAR_SAVE, "con_completion_playdemo", "*.dem"}; +cvar_t con_completion_timedemo = {CVAR_SAVE, "con_completion_timedemo", "*.dem"}; +cvar_t con_completion_exec = {CVAR_SAVE, "con_completion_exec", "*.cfg"}; + int con_linewidth; int con_vislines; qboolean con_initialized; // used for server replies to rcon command -qboolean rcon_redirect = false; +lhnetsocket_t *rcon_redirect_sock = NULL; +lhnetaddress_t *rcon_redirect_dest = NULL; int rcon_redirect_bufferpos = 0; char rcon_redirect_buffer[1400]; @@ -188,13 +193,22 @@ const char* Log_Timestamp (const char *desc) { static char timestamp [128]; time_t crt_time; - const struct tm *crt_tm; +#if _MSC_VER >= 1400 + struct tm crt_tm; +#else + struct tm *crt_tm; +#endif char timestring [64]; // Build the time stamp (ex: "Wed Jun 30 21:49:08 1993"); time (&crt_time); +#if _MSC_VER >= 1400 + localtime_s (&crt_tm, &crt_time); + strftime (timestring, sizeof (timestring), "%a %b %d %H:%M:%S %Y", &crt_tm); +#else crt_tm = localtime (&crt_time); strftime (timestring, sizeof (timestring), "%a %b %d %H:%M:%S %Y", crt_tm); +#endif if (desc != NULL) dpsnprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring); @@ -215,7 +229,7 @@ void Log_Open (void) if (logfile != NULL || log_file.string[0] == '\0') return; - logfile = FS_Open (log_file.string, "ab", false, false); + logfile = FS_OpenRealFile(log_file.string, "a", false); if (logfile != NULL) { strlcpy (crt_log_file, log_file.string, sizeof (crt_log_file)); @@ -349,7 +363,7 @@ void Log_Printf (const char *logfilename, const char *fmt, ...) { qfile_t *file; - file = FS_Open (logfilename, "ab", true, false); + file = FS_OpenRealFile(logfilename, "a", true); if (file != NULL) { va_list argptr; @@ -417,7 +431,7 @@ Con_MessageMode_f void Con_MessageMode_f (void) { key_dest = key_message; - chat_team = false; + chat_mode = 0; // "say" } @@ -429,9 +443,24 @@ Con_MessageMode2_f void Con_MessageMode2_f (void) { key_dest = key_message; - chat_team = true; + chat_mode = 1; // "say_team" } +/* +================ +Con_CommandMode_f +================ +*/ +void Con_CommandMode_f (void) +{ + key_dest = key_message; + if(Cmd_Argc() > 1) + { + dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args()); + chat_bufferlen = strlen(chat_buffer); + } + chat_mode = -1; // command +} /* ================ @@ -487,7 +516,7 @@ void Con_ConDump_f (void) Con_Printf("usage: condump \n"); return; } - file = FS_Open(Cmd_Argv(1), "wb", false, false); + file = FS_OpenRealFile(Cmd_Argv(1), "w", false); if (!file) { Con_Printf("condump: unable to write file \"%s\"\n", Cmd_Argv(1)); @@ -544,16 +573,21 @@ void Con_Init (void) Cvar_RegisterVariable (&con_nickcompletion); Cvar_RegisterVariable (&con_nickcompletion_flags); + Cvar_RegisterVariable (&con_completion_playdemo); // *.dem + Cvar_RegisterVariable (&con_completion_timedemo); // *.dem + Cvar_RegisterVariable (&con_completion_exec); // *.cfg + // register our commands Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f, "opens or closes the console"); Cmd_AddCommand ("messagemode", Con_MessageMode_f, "input a chat message to say to everyone"); Cmd_AddCommand ("messagemode2", Con_MessageMode2_f, "input a chat message to say to only your team"); + Cmd_AddCommand ("commandmode", Con_CommandMode_f, "input a console command"); Cmd_AddCommand ("clear", Con_Clear_f, "clear console history"); Cmd_AddCommand ("maps", Con_Maps_f, "list information about available maps"); Cmd_AddCommand ("condump", Con_ConDump_f, "output console history to a file (see also log_file)"); con_initialized = true; - Con_Print("Console initialized.\n"); + Con_DPrint("Console initialized.\n"); } @@ -774,6 +808,35 @@ static char qfont_table[256] = { 'x', 'y', 'z', '{', '|', '}', '~', '<' }; +void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest) +{ + rcon_redirect_sock = sock; + rcon_redirect_dest = dest; + memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print + rcon_redirect_bufferpos = 5; +} + +void Con_Rcon_Redirect_Flush() +{ + rcon_redirect_buffer[rcon_redirect_bufferpos] = 0; + NetConn_WriteString(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_dest); + memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print + rcon_redirect_bufferpos = 5; +} + +void Con_Rcon_Redirect_End() +{ + Con_Rcon_Redirect_Flush(); + rcon_redirect_dest = NULL; + rcon_redirect_sock = NULL; +} + +void Con_Rcon_Redirect_Abort() +{ + rcon_redirect_dest = NULL; + rcon_redirect_sock = NULL; +} + /* ================ Con_Rcon_AddChar @@ -790,8 +853,12 @@ void Con_Rcon_AddChar(char c) // if this print is in response to an rcon command, add the character // to the rcon redirect buffer - if (rcon_redirect && rcon_redirect_bufferpos < (int)sizeof(rcon_redirect_buffer) - 1) + if (rcon_redirect_dest) + { rcon_redirect_buffer[rcon_redirect_bufferpos++] = c; + if(rcon_redirect_bufferpos >= (int)sizeof(rcon_redirect_buffer) - 1) + Con_Rcon_Redirect_Flush(); + } else if(*log_dest_udp.string) // don't duplicate rcon command responses here, these are sent another way { if(log_dest_buffer_pos == 0) @@ -1178,7 +1245,7 @@ float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float if(w == NULL) { ti->colorindex = -1; - return ti->fontsize * ti->font->width_of[0]; + return ti->fontsize * ti->font->maxwidth; } if(maxWidth >= 0) return DrawQ_TextWidth_Font_UntilWidth(w, length, false, ti->font, maxWidth / ti->fontsize) * ti->fontsize; @@ -1377,10 +1444,12 @@ void Con_DrawNotify (void) int colorindex = -1; // LordHavoc: speedup, and other improvements - if (chat_team) - sprintf(temptext, "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); + if (chat_mode < 0) + dpsnprintf(temptext, sizeof(temptext), "]%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); + else if(chat_mode) + dpsnprintf(temptext, sizeof(temptext), "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); else - sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); + dpsnprintf(temptext, sizeof(temptext), "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); // FIXME word wrap inputsize = (numChatlines ? con_chatsize : con_notifysize).value; @@ -1509,7 +1578,7 @@ void Con_DrawConsole (int lines) con_vislines = lines; // draw the background - DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic("gfx/conback", true) : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, cls.signon == SIGNONS ? scr_conalpha.value : 1.0, 0); // always full alpha when not in game + DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic ("gfx/conback") : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, cls.signon == SIGNONS ? scr_conalpha.value : 1.0, 0); // always full alpha when not in game DrawQ_String_Font(vid_conwidth.integer - DrawQ_TextWidth_Font(engineversion, 0, false, FONT_CONSOLE) * con_textsize.value, lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true, FONT_CONSOLE); // draw the text @@ -1547,19 +1616,19 @@ Prints not only map filename, but also its format (q1/q2/q3/hl) and even its message */ //[515]: here is an ugly hack.. two gotos... oh my... *but it works* -//LordHavoc: rewrote bsp type detection, added mcbsp support and rewrote message extraction to do proper worldspawn parsing +//LordHavoc: rewrote bsp type detection, rewrote message extraction to do proper worldspawn parsing //LordHavoc: added .ent file loading, and redesigned error handling to still try the .ent file even if the map format is not recognized, this also eliminated one goto //LordHavoc: FIXME: man this GetMapList is STILL ugly code even after my cleanups... qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength) { fssearch_t *t; - char message[64]; + char message[1024]; int i, k, max, p, o, min; unsigned char *len; qfile_t *f; unsigned char buf[1024]; - sprintf(message, "maps/%s*.bsp", s); + dpsnprintf(message, sizeof(message), "maps/%s*.bsp", s); t = FS_Search(message, 1, true); if(!t) return false; @@ -1588,7 +1657,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer char entfilename[MAX_QPATH]; strlcpy(message, "^1**ERROR**^7", sizeof(message)); p = 0; - f = FS_Open(t->filenames[i], "rb", true, false); + f = FS_OpenVirtualFile(t->filenames[i], true); if(f) { memset(buf, 0, 1024); @@ -1609,16 +1678,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer lumplen = LittleLong(header->lumps[Q2LUMP_ENTITIES].filelen); } } - else if (!memcmp(buf, "MCBSPpad", 8)) - { - p = LittleLong(((int *)buf)[2]); - if (p == MCBSPVERSION) - { - int numhulls = LittleLong(((int *)buf)[3]); - lumpofs = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+0]); - lumplen = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+1]); - } - } else if((p = LittleLong(((int *)buf)[0])) == BSPVERSION || p == 30) { dheader_t *header = (dheader_t *)buf; @@ -1679,7 +1738,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer case Q3BSPVERSION: strlcpy((char *)buf, "Q3", sizeof(buf));break; case Q2BSPVERSION: strlcpy((char *)buf, "Q2", sizeof(buf));break; case BSPVERSION: strlcpy((char *)buf, "Q1", sizeof(buf));break; - case MCBSPVERSION: strlcpy((char *)buf, "MC", sizeof(buf));break; case 30: strlcpy((char *)buf, "HL", sizeof(buf));break; default: strlcpy((char *)buf, "??", sizeof(buf));break; } @@ -1782,7 +1840,6 @@ void SanitizeString(char *in, char *out) } *out = 0; } -int Sbar_GetPlayer (int index); // <- safety? // Now it becomes TRICKY :D --blub static char Nicks_list[MAX_SCOREBOARD][MAX_SCOREBOARDNAME]; // contains the nicks with colors and all that @@ -1827,15 +1884,15 @@ int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) return Nicks_strncasecmp_nospaces(a, b, a_len); return strncasecmp(a, b, a_len); } - + space_char = (con_nickcompletion_flags.integer & NICKS_NO_SPACES) ? 'a' : ' '; - + // ignore non alphanumerics of B // if A contains a non-alphanumeric, B must contain it as well though! while(a_len) { qboolean alnum_a, alnum_b; - + if(tolower(*a) == tolower(*b)) { if(*a == 0) // end of both strings, they're equal @@ -1872,33 +1929,30 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) int match; int spos; int count = 0; - + if(!con_nickcompletion.integer) return 0; // changed that to 1 if(!line[0])// || !line[1]) // we want at least... 2 written characters return 0; - + for(i = 0; i < cl.maxclients; ++i) { - /*p = Sbar_GetPlayer(i); - if(p < 0) - break;*/ p = i; if(!cl.scores[p].name[0]) continue; SanitizeString(cl.scores[p].name, name); //Con_Printf("Sanitized: %s^7 -> %s", cl.scores[p].name, name); - + if(!name[0]) continue; - + length = strlen(name); match = -1; spos = pos - 1; // no need for a minimum of characters :) - + while(spos >= 0 && (spos - pos) < length) // search-string-length < name length { if(spos > 0 && line[spos-1] != ' ' && line[spos-1] != ';' && line[spos-1] != '\"' && line[spos-1] != '\'') @@ -1927,7 +1981,7 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) { Nicks_matchpos = match; } - + Nicks_offset[count] = s - (&line[match]); //Con_Printf("offset for %s: %i\n", name, Nicks_offset[count]); @@ -1954,7 +2008,7 @@ void Nicks_CutMatchesNormal(int count) l = strlen(Nicks_sanlist[i]) - 1; if(l < c) c = l; - + for(l = 0; l <= c; ++l) if(tolower(Nicks_sanlist[0][l]) != tolower(Nicks_sanlist[i][l])) { @@ -1989,7 +2043,7 @@ void Nicks_CutMatchesAlphaNumeric(int count) char tempstr[sizeof(Nicks_sanlist[0])]; char *a, *b; char space_char = (con_nickcompletion_flags.integer & NICKS_NO_SPACES) ? 'a' : ' '; // yes this is correct, we want NO spaces when no spaces - + c = strlen(Nicks_sanlist[0]); for(i = 0, l = 0; i < (int)c; ++i) { @@ -2001,7 +2055,7 @@ void Nicks_CutMatchesAlphaNumeric(int count) } } tempstr[l] = 0; - + for(i = 1; i < count; ++i) { a = tempstr; @@ -2047,7 +2101,7 @@ void Nicks_CutMatchesNoSpaces(int count) unsigned int c, l; char tempstr[sizeof(Nicks_sanlist[0])]; char *a, *b; - + c = strlen(Nicks_sanlist[0]); for(i = 0, l = 0; i < (int)c; ++i) { @@ -2057,7 +2111,7 @@ void Nicks_CutMatchesNoSpaces(int count) } } tempstr[l] = 0; - + for(i = 1; i < count; ++i) { a = tempstr; @@ -2117,7 +2171,7 @@ const char **Nicks_CompleteBuildList(int count) buf[bpos] = Nicks_sanlist[bpos] + Nicks_offset[bpos]; Nicks_CutMatches(count); - + buf[bpos] = NULL; return buf; } @@ -2127,14 +2181,14 @@ int Nicks_AddLastColor(char *buffer, int pos) qboolean quote_added = false; int match; char color = '7'; - + if(con_nickcompletion_flags.integer & NICKS_ADD_QUOTE && buffer[Nicks_matchpos-1] == '\"') { // we'll have to add a quote :) buffer[pos++] = '\"'; quote_added = true; } - + if((!quote_added && con_nickcompletion_flags.integer & NICKS_ADD_COLOR) || con_nickcompletion_flags.integer & NICKS_FORCE_COLOR) { // add color when no quote was added, or when flags &4? @@ -2165,7 +2219,7 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) { size_t len; char *msg; - + msg = Nicks_list[0]; len = min(size - Nicks_matchpos - 3, strlen(msg)); memcpy(&buffer[Nicks_matchpos], msg, len); @@ -2213,8 +2267,8 @@ void Con_CompleteCommandLine (void) char command[512]; int c, v, a, i, cmd_len, pos, k; int n; // nicks --blub - const char *space; - + const char *space, *patterns; + //find what we want to complete pos = key_linepos; while(--pos) @@ -2233,7 +2287,12 @@ void Con_CompleteCommandLine (void) if(space && pos == (space - key_lines[edit_line]) + 1) { strlcpy(command, key_lines[edit_line] + 1, min(sizeof(command), (unsigned int)(space - key_lines[edit_line]))); - if(!strcmp(command, "map") || !strcmp(command, "changelevel")) + + patterns = Cvar_VariableString(va("con_completion_%s", command)); // TODO maybe use a better place for this? + if(patterns && !*patterns) + patterns = NULL; // get rid of the empty string + + if(!strcmp(command, "map") || !strcmp(command, "changelevel") || (patterns && !strcmp(patterns, "map"))) { //maps search char t[MAX_QPATH]; @@ -2255,96 +2314,147 @@ void Con_CompleteCommandLine (void) } else { - const char *patterns = Cvar_VariableString(va("con_completion_%s", command)); // TODO maybe use a better place for this? - char t[MAX_QPATH]; - stringlist_t resultbuf; - - // Usage: - // // store completion patterns (space separated) for command foo in con_completion_foo - // set con_completion_foo "foodata/*.foodefault *.foo" - // foo - // - // Note: patterns with slash are always treated as absolute - // patterns; patterns without slash search in the innermost - // directory the user specified. There is no way to "complete into" - // a directory as of now, as directories seem to be unknown to the - // FS subsystem. - // - // Examples: - // set con_completion_playermodel "models/player/*.zym models/player/*.md3 models/player/*.psk models/player/*.dpm" - // set con_completion_playdemo "*.dem" - // set con_completion_play "*.wav *.ogg" - // - // TODO somehow add support for directories; these shall complete - // to their name + an appended slash. - - stringlistinit(&resultbuf); - while(COM_ParseToken_Simple(&patterns, false, false)) + if(patterns) { - fssearch_t *search; - if(strchr(com_token, '/')) + char t[MAX_QPATH]; + stringlist_t resultbuf, dirbuf; + + // Usage: + // // store completion patterns (space separated) for command foo in con_completion_foo + // set con_completion_foo "foodata/*.foodefault *.foo" + // foo + // + // Note: patterns with slash are always treated as absolute + // patterns; patterns without slash search in the innermost + // directory the user specified. There is no way to "complete into" + // a directory as of now, as directories seem to be unknown to the + // FS subsystem. + // + // Examples: + // set con_completion_playermodel "models/player/*.zym models/player/*.md3 models/player/*.psk models/player/*.dpm" + // set con_completion_playdemo "*.dem" + // set con_completion_play "*.wav *.ogg" + // + // TODO somehow add support for directories; these shall complete + // to their name + an appended slash. + + stringlistinit(&resultbuf); + stringlistinit(&dirbuf); + while(COM_ParseToken_Simple(&patterns, false, false)) { - search = FS_Search(com_token, true, true); + fssearch_t *search; + if(strchr(com_token, '/')) + { + search = FS_Search(com_token, true, true); + } + else + { + const char *slash = strrchr(s, '/'); + if(slash) + { + strlcpy(t, s, min(sizeof(t), (unsigned int)(slash - s + 2))); // + 2, because I want to include the slash + strlcat(t, com_token, sizeof(t)); + search = FS_Search(t, true, true); + } + else + search = FS_Search(com_token, true, true); + } + if(search) + { + for(i = 0; i < search->numfilenames; ++i) + if(!strncmp(search->filenames[i], s, strlen(s))) + if(FS_FileType(search->filenames[i]) == FS_FILETYPE_FILE) + stringlistappend(&resultbuf, search->filenames[i]); + FS_FreeSearch(search); + } } - else + + // In any case, add directory names { + fssearch_t *search; const char *slash = strrchr(s, '/'); if(slash) { strlcpy(t, s, min(sizeof(t), (unsigned int)(slash - s + 2))); // + 2, because I want to include the slash - strlcat(t, com_token, sizeof(t)); + strlcat(t, "*", sizeof(t)); search = FS_Search(t, true, true); } else - search = FS_Search(com_token, true, true); - } - if(search) - { - for(i = 0; i < search->numfilenames; ++i) - if(!strncmp(search->filenames[i], s, strlen(s))) - stringlistappend(&resultbuf, search->filenames[i]); - FS_FreeSearch(search); - } - } - - if(resultbuf.numstrings > 0) - { - const char *p, *q; - if(resultbuf.numstrings == 1) - { - dpsnprintf(t, sizeof(t), "%s ", resultbuf.strings[0]); + search = FS_Search("*", true, true); + if(search) + { + for(i = 0; i < search->numfilenames; ++i) + if(!strncmp(search->filenames[i], s, strlen(s))) + if(FS_FileType(search->filenames[i]) == FS_FILETYPE_DIRECTORY) + stringlistappend(&dirbuf, search->filenames[i]); + FS_FreeSearch(search); + } } - else + + if(resultbuf.numstrings > 0 || dirbuf.numstrings > 0) { - stringlistsort(&resultbuf); - Con_Printf("\n%i possible filenames\n", resultbuf.numstrings); - for(i = 0; i < resultbuf.numstrings; ++i) + const char *p, *q; + unsigned int matchchars; + if(resultbuf.numstrings == 0 && dirbuf.numstrings == 1) { - Con_Printf("%s\n", resultbuf.strings[i]); + dpsnprintf(t, sizeof(t), "%s/", dirbuf.strings[0]); + } + else + if(resultbuf.numstrings == 1 && dirbuf.numstrings == 0) + { + dpsnprintf(t, sizeof(t), "%s ", resultbuf.strings[0]); + } + else + { + stringlistsort(&resultbuf); // dirbuf is already sorted + Con_Printf("\n%i possible filenames\n", resultbuf.numstrings + dirbuf.numstrings); + for(i = 0; i < dirbuf.numstrings; ++i) + { + Con_Printf("%s/\n", dirbuf.strings[i]); + } + for(i = 0; i < resultbuf.numstrings; ++i) + { + Con_Printf("%s\n", resultbuf.strings[i]); + } + matchchars = sizeof(t) - 1; + if(resultbuf.numstrings > 0) + { + p = resultbuf.strings[0]; + q = resultbuf.strings[resultbuf.numstrings - 1]; + for(; *p && *p == *q; ++p, ++q); + matchchars = (unsigned int)(p - resultbuf.strings[0]); + } + if(dirbuf.numstrings > 0) + { + p = dirbuf.strings[0]; + q = dirbuf.strings[dirbuf.numstrings - 1]; + for(; *p && *p == *q; ++p, ++q); + matchchars = min(matchchars, (unsigned int)(p - dirbuf.strings[0])); + } + // now p points to the first non-equal character, or to the end + // of resultbuf.strings[0]. We want to append the characters + // from resultbuf.strings[0] to (not including) p as these are + // the unique prefix + strlcpy(t, (resultbuf.numstrings > 0 ? resultbuf : dirbuf).strings[0], min(matchchars + 1, sizeof(t))); } - p = resultbuf.strings[0]; - q = resultbuf.strings[resultbuf.numstrings - 1]; - for(; *p && *p == *q; ++p, ++q); - // now p points to the first non-equal character, or to the end - // of resultbuf.strings[0]. We want to append the characters - // from resultbuf.strings[0] to (not including) p as these are - // the unique prefix - strlcpy(t, resultbuf.strings[0], min((unsigned int)(p - resultbuf.strings[0] + 1), sizeof(t))); - } - // first move the cursor - key_linepos += (int)strlen(t) - (int)strlen(s); + // first move the cursor + key_linepos += (int)strlen(t) - (int)strlen(s); - // and now do the actual work - *s = 0; - strlcat(key_lines[edit_line], t, MAX_INPUTLINE); - strlcat(key_lines[edit_line], s2, MAX_INPUTLINE); //add back chars after cursor + // and now do the actual work + *s = 0; + strlcat(key_lines[edit_line], t, MAX_INPUTLINE); + strlcat(key_lines[edit_line], s2, MAX_INPUTLINE); //add back chars after cursor - // and fix the cursor - if(key_linepos > (int) strlen(key_lines[edit_line])) - key_linepos = (int) strlen(key_lines[edit_line]); + // and fix the cursor + if(key_linepos > (int) strlen(key_lines[edit_line])) + key_linepos = (int) strlen(key_lines[edit_line]); + } + stringlistfreecontents(&resultbuf); + stringlistfreecontents(&dirbuf); + + return; // bail out, when we complete for a command that wants a file name } - stringlistfreecontents(&resultbuf); } } @@ -2375,7 +2485,7 @@ void Con_CompleteCommandLine (void) } if (!(c + v + a + n)) // No possible matches - { + { if(s2[0]) strlcpy(&key_lines[edit_line][key_linepos], s2, sizeof(key_lines[edit_line]) - key_linepos); return; @@ -2389,7 +2499,7 @@ void Con_CompleteCommandLine (void) cmd = *(list[2] = Cmd_CompleteAliasBuildList(s)); if (n) cmd = *(list[3] = Nicks_CompleteBuildList(n)); - + for (cmd_len = (int)strlen(s);;cmd_len++) { const char **l;