Attachment #49739 for bug #79845

Lines 878-884 Link Here

(-)abuse-2.00/abuse/src/dev.c (-1 / +2 lines)
878	} else if (!strcmp(argv[i],"-f"))	878	} else if (!strcmp(argv[i],"-f"))
879	{	879	{
880	i++;	880	i++;
881	strcpy(level_file,argv[i]);	881	strncpy(level_file,argv[i],sizeof(level_file)-1);
		882	level_file[sizeof(level_file)] = '\0';
882	} else if (!strcmp(argv[i],"-2"))	883	} else if (!strcmp(argv[i],"-2"))
883	start_doubled=1;	884	start_doubled=1;
884	else if (!strcmp(argv[i],"-demo"))	885	else if (!strcmp(argv[i],"-demo"))

Lines 74-80 Link Here

(-)abuse-2.00/abuse/src/innet.c (-1 / +2 lines)
74	} else if (!strcmp(argv[i],"-net") && i<argc-1)	74	} else if (!strcmp(argv[i],"-net") && i<argc-1)
75	{	75	{
76	i++;	76	i++;
77	strcpy(main_net_cfg->server_name,argv[i]);	77	strncpy(main_net_cfg->server_name,argv[i],sizeof(main_net_cfg->server_name)-1);
		78	main_net_cfg->server_name[sizeof(main_net_cfg->server_name)]='\0';
78	main_net_cfg->state=net_configuration::CLIENT;	79	main_net_cfg->state=net_configuration::CLIENT;
79	}	80	}
80	else if (!strcmp(argv[i],"-ndb"))	81	else if (!strcmp(argv[i],"-ndb"))




  if (fp->open_failure()) 
  { 
    delete fp;
    snprintf(fn,sizeof(fn),"art/%s",filename);  
    fp=open_file(fn,"rb");
    if (fp->open_failure()) 
    { 

      if (!strcmp(argv[i],"-lsf"))
      {
	i++;
	strncpy(lsf,argv[i],sizeof(lsf)-1);
	lsf[sizeof(lsf)]='\0';
      }
      if (!strcmp(argv[i],"-a"))
      {
	i++;
	snprintf(lsf,sizeof(lsf),"addon/%s/%s.lsp",argv[i],argv[i]);      
      }
    }
  } else if (!get_remote_lsf(net_server,lsf))

Lines 269-275 Link Here

(-)abuse-2.00/abuse/src/net/unix/engine.c (-1 / +3 lines)
269	else if (!strcmp(argv[i],"-game_port"))	269	else if (!strcmp(argv[i],"-game_port"))
270	game_port=atoi(argv[i+1]);	270	game_port=atoi(argv[i+1]);
271	else if (!strcmp(argv[i],"-net"))	271	else if (!strcmp(argv[i],"-net"))
272	{ strcpy(net_server,argv[i+1]); }	272	{ strncpy(net_server,argv[i+1],sizeof(net_server));
		273	net_server[sizeof(net_server)]='\0';
		274	}
273		275
274	if (game_port==-1) game_port=DEFAULT_GAME_PORT+1;	276	if (game_port==-1) game_port=DEFAULT_GAME_PORT+1;
275		277

Lines 81-87 Link Here

(-)abuse-2.00/abuse/src/old_server.c (-1 / +2 lines)
81	} else if (!strcmp(argv[i],"-name")) // name player uses when connecting	81	} else if (!strcmp(argv[i],"-name")) // name player uses when connecting
82	{	82	{
83	i++;	83	i++;
84	strcpy(name,argv[i]);	84	strncpy(name,argv[i],sizeof(name)-1);
		85	name[sizeof(name)]='\0';
85	} else if (!strcmp(argv[i],"-nonet"))	86	} else if (!strcmp(argv[i],"-nonet"))
86	{	87	{
87	dprintf("Network bypassed, no player will be able to connect\n");	88	dprintf("Network bypassed, no player will be able to connect\n");

Return to bug 79845

Lines 83-89 Link Here

(-)abuse-2.00/abuse/src/loader2.c (-3 / +4 lines)
83	if (fp->open_failure())	83	if (fp->open_failure())
84	{	84	{
85	delete fp;	85	delete fp;
86	sprintf(fn,"art/%s",filename);	86	snprintf(fn,sizeof(fn),"art/%s",filename);
87	fp=open_file(fn,"rb");	87	fp=open_file(fn,"rb");
88	if (fp->open_failure())	88	if (fp->open_failure())
89	{	89	{
Lines 303-314 Link Here
303	if (!strcmp(argv[i],"-lsf"))	303	if (!strcmp(argv[i],"-lsf"))
304	{	304	{
305	i++;	305	i++;
306	strcpy(lsf,argv[i]);	306	strncpy(lsf,argv[i],sizeof(lsf)-1);
		307	lsf[sizeof(lsf)]='\0';
307	}	308	}
308	if (!strcmp(argv[i],"-a"))	309	if (!strcmp(argv[i],"-a"))
309	{	310	{
310	i++;	311	i++;
311	sprintf(lsf,"addon/%s/%s.lsp",argv[i],argv[i]);	312	snprintf(lsf,sizeof(lsf),"addon/%s/%s.lsp",argv[i],argv[i]);
312	}	313	}
313	}	314	}
314	} else if (!get_remote_lsf(net_server,lsf))	315	} else if (!get_remote_lsf(net_server,lsf))