ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/utils.C
(Generate patch)

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.87 by sf-marcmagus, Sun Oct 11 01:35:53 2009 UTC vs.
Revision 1.92 by root, Tue Nov 3 23:18:23 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/*
25 * General convenience functions for crossfire. 26 * General convenience functions for deliantra.
26 */ 27 */
27 28
28#include <cstdlib> 29#include <cstdlib>
29#include <sys/types.h> 30#include <sys/types.h>
30#include <unistd.h> 31#include <unistd.h>
… …
409 } 410 }
410 } 411 }
411 result[resultlen] = '\0'; 412 result[resultlen] = '\0';
412} 413}
413 414
414/**
415 * Taking a string as an argument, mutate it into a string that looks like a list.
416 * a 'list' for the purposes here, is a string of items, seperated by commas, except
417 * for the last entry, which has an 'and' before it, and a full stop (period) after it.
418 * This function will also strip all trailing non alphanumeric characters.
419 * It does not insert an oxford comma.
420 */
421void
422make_list_like (char *input)
423{
424 char *p, tmp[MAX_BUF];
425 int i;
426
427 if (!input || strlen (input) > MAX_BUF - 5)
428 return;
429 /* bad stuff would happen if we continued here, the -5 is to make space for ' and ' */
430
431 strncpy (tmp, input, MAX_BUF - 5);
432 /*trim all trailing commas, spaces etc. */
433 for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--)
434 tmp[i] = '\0';
435
436 strcat (tmp, ".");
437
438 p = strrchr (tmp, ',');
439 if (p)
440 {
441 *p = '\0';
442 strcpy (input, tmp);
443 p++;
444 strcat (input, " and");
445 strcat (input, p);
446 }
447 else
448 strcpy (input, tmp);
449
450 return;
451}
452
453/******************************************************************************/ 415/******************************************************************************/
454 416
455/* Checks a player-provided string which will become the msg property of 417/* Checks a player-provided string which will become the msg property of
456 * an object for dangerous input. 418 * an object for dangerous input.
457 */ 419 */
… …
459msg_is_safe (const char *msg) 421msg_is_safe (const char *msg)
460{ 422{
461 bool safe = true; 423 bool safe = true;
462 424
463 /* Trying to cheat by getting data into the object */ 425 /* Trying to cheat by getting data into the object */
464 if (!strncmp (msg, "endmsg", strlen ("endmsg")) || strstr (msg, "\nendmsg")) 426 if (!strncmp (msg, "endmsg", sizeof ("endmsg") - 1)
427 || strstr (msg, "\nendmsg"))
465 safe = false; 428 safe = false;
466 429
467 /* Trying to make the object talk, and potentially access arbitrary code */ 430 /* Trying to make the object talk, and potentially access arbitrary code */
468 if (object::msg_has_dialogue (msg)) 431 if (object::msg_has_dialogue (msg))
469 safe = false; 432 safe = false;
… …
610 memcpy (dst, src, ++len); 573 memcpy (dst, src, ++len);
611 574
612 return len; 575 return len;
613} 576}
614 577
615const char * 578char *
579vformat (const char *format, va_list ap)
580{
581 static dynbuf_text buf; buf.clear ();
582 buf.vprintf (format, ap);
583 return buf;
584}
585
586char *
616format (const char *format, ...) 587format (const char *format, ...)
617{ 588{
618 static dynbuf_text buf;
619
620 buf.clear ();
621
622 va_list ap; 589 va_list ap;
623 va_start (ap, format); 590 va_start (ap, format);
624 buf.vprintf (format, ap); 591 char *buf = vformat (format, ap);
625 va_end (ap); 592 va_end (ap);
626 593
627 return buf; 594 return buf;
628} 595}
629 596

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines