From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-38665-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 21651 invoked by alias); 2 Apr 2005 20:25:37 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 21528 invoked from network); 2 Apr 2005 20:25:33 -0000
Received: from unknown (HELO sibelius.xs4all.nl) (82.92.89.47)
  by sourceware.org with SMTP; 2 Apr 2005 20:25:33 -0000
Received: from elgar.sibelius.xs4all.nl (root@elgar.sibelius.xs4all.nl [192.168.0.2])
	by sibelius.xs4all.nl (8.13.0/8.13.0) with ESMTP id j32KPSMJ011237
	for <gdb-patches@sourceware.org>; Sat, 2 Apr 2005 22:25:28 +0200 (CEST)
Received: from elgar.sibelius.xs4all.nl (kettenis@localhost.sibelius.xs4all.nl [127.0.0.1])
	by elgar.sibelius.xs4all.nl (8.13.3/8.13.3) with ESMTP id j32KPRwa006186
	for <gdb-patches@sourceware.org>; Sat, 2 Apr 2005 22:25:27 +0200 (CEST)
Received: (from kettenis@localhost)
	by elgar.sibelius.xs4all.nl (8.13.3/8.13.3/Submit) id j32KPRm6014345;
	Sat, 2 Apr 2005 22:25:27 +0200 (CEST)
Date: Sat, 02 Apr 2005 20:25:00 -0000
Message-Id: <200504022025.j32KPRm6014345@elgar.sibelius.xs4all.nl>
From: Mark Kettenis <mark.kettenis@xs4all.nl>
To: gdb-patches@sourceware.org
Subject: [COMMIT] Don't use strcpy and strcat in main.c
X-SW-Source: 2005-04/txt/msg00027.txt.bz2

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.  */