[COMMIT] Don't use strcpy and strcat in main.c

[COMMIT] Don't use strcpy and strcat in main.c

[Mark Kettenis]

Committed as obvious.

Mark


Index: ChangeLog
from  Mark Kettenis  <kettenis@gnu.org>

	* main.c: Update copyright year.
	(captured_main): Avois using strcpy and strcat.

Index: main.c
===================================================================
RCS file: /cvs/src/src/gdb/main.c,v
retrieving revision 1.50
diff -u -p -r1.50 main.c
--- main.c 10 Mar 2005 20:49:08 -0000 1.50
+++ main.c 2 Apr 2005 20:24:35 -0000
@@ -1,8 +1,8 @@
 /* Top level stuff for GDB, the GNU debugger.
 
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
-   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -143,7 +143,7 @@ captured_main (void *data)
   int ndir;
 
   struct stat homebuf, cwdbuf;
-  char *homedir, *homeinit;
+  char *homedir;
 
   int i;
 
@@ -600,11 +600,7 @@ extern int gdbtk_test (char *);
   homedir = getenv ("HOME");
   if (homedir)
     {
-      homeinit = (char *) alloca (strlen (homedir) +
-				  strlen (gdbinit) + 10);
-      strcpy (homeinit, homedir);
-      strcat (homeinit, "/");
-      strcat (homeinit, gdbinit);
+      char *homeinit = xstrprintf ("%s/%s", homedir, gdbinit);
 
       if (!inhibit_gdbinit)
 	{
@@ -622,6 +618,7 @@ extern int gdbtk_test (char *);
       stat (homeinit, &homebuf);
       stat (gdbinit, &cwdbuf);	/* We'll only need this if
 				   homedir was set.  */
+      xfree (homeinit);
     }
 
   /* Now perform all the actions indicated by the arguments.  */

Re: [COMMIT] Don't use strcpy and strcat in main.c

[Eli Zaretskii]

> Date: Sat, 2 Apr 2005 22:25:27 +0200 (CEST)
> From: Mark Kettenis <mark.kettenis@xs4all.nl>
> 
> Index: ChangeLog
> from  Mark Kettenis  <kettenis@gnu.org>
> 
> 	* main.c: Update copyright year.
> 	(captured_main): Avois using strcpy and strcat.
                         ^^^^^
A typo.

> -      homeinit = (char *) alloca (strlen (homedir) +
> -				  strlen (gdbinit) + 10);
> -      strcpy (homeinit, homedir);
> -      strcat (homeinit, "/");
> -      strcat (homeinit, gdbinit);
> +      char *homeinit = xstrprintf ("%s/%s", homedir, gdbinit);

Why was the original code unworthy? because it used alloca?