qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-01-22 16:01:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

char *buf; strn.* (..., sizeof(buf) ...) doesn't work so well :/

Browse source
This commit is contained in:
Bill Currie 2000-12-05 16:41:28 +00:00
parent eae11661e4
commit b34504057c
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/cl_demo.c
View file

@ -745,7 +745,7 @@ play [demoname]
*/ */
void CL_PlayDemo_f (void) void CL_PlayDemo_f (void)
{ {
char name[256]; char name[MAX_OSPATH];
if (Cmd_Argc() != 2) if (Cmd_Argc() != 2)
{ {

4
source/cmd.c
View file

@ -317,8 +317,8 @@ void Cmd_StuffCmds_f (void)
c = com_cmdline[j]; c = com_cmdline[j];
com_cmdline[j] = 0; com_cmdline[j] = 0;
strncat (build, com_cmdline+i, sizeof(build) - strlen (build)); strncat (build, com_cmdline+i, s - strlen (build));
strncat (build, "\n", sizeof(build) - strlen (build)); strncat (build, "\n", s - strlen (build));
com_cmdline[j] = c; com_cmdline[j] = c;
i = j-1; i = j-1;
} }

2
source/pr_cmds.c
View file

@ -722,7 +722,7 @@ void PF_stuffcmd (void)
buf = cl->stufftext_buf; buf = cl->stufftext_buf;
if (strlen(buf) + strlen(str) >= MAX_STUFFTEXT) if (strlen(buf) + strlen(str) >= MAX_STUFFTEXT)
PR_RunError ("stufftext buffer overflow"); PR_RunError ("stufftext buffer overflow");
strncat (buf, str, sizeof(buf) - strlen (buf)); strncat (buf, str, MAX_STUFFTEXT - strlen (buf));
for (i = strlen(buf); i >= 0; i--) for (i = strlen(buf); i >= 0; i--)
{ {

6
source/quakefs.c
View file

@ -405,7 +405,7 @@ void
COM_CreatePath ( char *path ) COM_CreatePath ( char *path )
{ {
char *ofs; char *ofs;
char e_path[PATH_MAX]; char e_path[MAX_OSPATH];
Qexpand_squiggle (path, e_path); Qexpand_squiggle (path, e_path);
path = e_path; path = e_path;
@ -872,7 +872,7 @@ COM_AddDirectory (char *dir)
{ {
searchpath_t *search; searchpath_t *search;
char *p; char *p;
char e_dir[PATH_MAX]; char e_dir[MAX_OSPATH];
Qexpand_squiggle (dir, e_dir); Qexpand_squiggle (dir, e_dir);
dir = e_dir; dir = e_dir;
@ -1145,5 +1145,5 @@ void COM_DefaultExtension (char *path, char *extension)
src--; src--;
} }
strncat (path, extension, sizeof(path) - strlen (path)); strncat (path, extension, MAX_OSPATH - strlen (path));
} }

8
source/quakeio.c
View file

@ -31,12 +31,12 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_MALLOC_H #ifdef HAVE_MALLOC_H
# include <malloc.h> # include <malloc.h>
#endif #endif
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <quakeio.h>
#include <string.h> #include <string.h>
#ifdef WIN32 #ifdef WIN32
# include <io.h> # include <io.h>
@ -47,12 +47,14 @@
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
# define _POSIX_ # define _POSIX_
#endif #endif
#include <limits.h> #include <limits.h>
#include "quakeio.h"
#include "quakefs.h"
#ifdef WIN32 #ifdef WIN32
#ifndef __BORLANDC__ #ifndef __BORLANDC__
# define setmode _setmode # define setmode _setmode
@ -82,7 +84,7 @@ Qexpand_squiggle(const char *path, char *dest)
if (home) { if (home) {
strcpy (dest, home); strcpy (dest, home);
strncat (dest, path+1, sizeof(dest) - strlen (dest)); // skip leading ~ strncat (dest, path+1, MAX_OSPATH - strlen (dest)); // skip leading ~
} else } else
strcpy (dest,path); strcpy (dest,path);
} }