From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1647 invoked by alias); 24 Feb 2011 17:50:12 -0000 Received: (qmail 1631 invoked by uid 22791); 24 Feb 2011 17:50:10 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 24 Feb 2011 17:50:06 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id EE0512BADF2; Thu, 24 Feb 2011 12:50:04 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id xvBHJ9UQBlVW; Thu, 24 Feb 2011 12:50:04 -0500 (EST) Received: from kwai.gnat.com (kwai.gnat.com [205.232.38.4]) by rock.gnat.com (Postfix) with ESMTP id DAA4D2BADEA; Thu, 24 Feb 2011 12:50:04 -0500 (EST) Received: by kwai.gnat.com (Postfix, from userid 4233) id D7E1594677; Thu, 24 Feb 2011 12:50:04 -0500 (EST) From: Joel Brobecker To: gdb-patches@sourceware.org Cc: Joel Brobecker Subject: [PATCH 03/18] New general purpose routines in utils.c Date: Thu, 24 Feb 2011 17:50:00 -0000 Message-Id: <1298569763-18784-4-git-send-email-brobecker@adacore.com> In-Reply-To: <1298569763-18784-1-git-send-email-brobecker@adacore.com> References: <1298569763-18784-1-git-send-email-brobecker@adacore.com> Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-02/txt/msg00699.txt.bz2 These are some general-purpose routines that were added for the VxWorks port... Hopefully other parts of the GDB code will make use of them. gdb/ChangeLog: * utils.c (have_dos_based_filesystem, is_regular_file) (skip_whitespace, skip_until_character, skip_until_whitespace) (skip_space_delimited_token, get_space_delimited_token): New functions. * source.c (is_regular_file): Delete. Moved to utils.c. * defs.h (have_dos_based_filesystem, is_regular_file) (skip_whitespace, skip_until_character, skip_space_delimited_token) (get_space_delimited_token): Add declaration. --- gdb/defs.h | 12 ++++++ gdb/source.c | 18 --------- gdb/utils.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 18 deletions(-) diff --git a/gdb/defs.h b/gdb/defs.h index 9409dde..908d956 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -421,6 +421,18 @@ extern const char *gdb_bfd_errmsg (bfd_error_type error_tag, char **matching); extern int parse_pid_to_attach (char *args); +extern int have_dos_based_filesystem (void); + +extern int is_regular_file (const char *name); + +extern char *skip_whitespace (char *str); + +extern char *skip_until_character (char *str, char delimiter); + +extern char *skip_space_delimited_token (char *str); + +extern char *get_space_delimited_token (char *str, char **token); + /* From demangle.c */ extern void set_demangling_style (char *); diff --git a/gdb/source.c b/gdb/source.c index a14a802..9e35dd9 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -657,24 +657,6 @@ source_info (char *ignore, int from_tty) } -/* Return True if the file NAME exists and is a regular file. */ -static int -is_regular_file (const char *name) -{ - struct stat st; - const int status = stat (name, &st); - - /* Stat should never fail except when the file does not exist. - If stat fails, analyze the source of error and return True - unless the file does not exist, to avoid returning false results - on obscure systems where stat does not work as expected. */ - - if (status != 0) - return (errno != ENOENT); - - return S_ISREG (st.st_mode); -} - /* Open a file named STRING, searching path PATH (dir names sep by some char) using mode MODE in the calls to open. You cannot use this function to create files (O_CREAT). diff --git a/gdb/utils.c b/gdb/utils.c index 82e3adb..6f8926c 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3982,6 +3982,115 @@ parse_pid_to_attach (char *args) return pid; } +/* Return non-zero if the host has a dos-based file system. */ + +int +have_dos_based_filesystem (void) +{ +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + return 1; +#else + return 0; +#endif +} + +/* Return True if the file NAME exists and is a regular file. */ + +int +is_regular_file (const char *name) +{ + struct stat st; + const int status = stat (name, &st); + + /* Stat should never fail except when the file does not exist. + If stat fails, analyze the source of error and return True + unless the file does not exist, to avoid returning false results + on obscure systems where stat does not work as expected. */ + if (status != 0) + return (errno != ENOENT); + + return S_ISREG (st.st_mode); +} + +/* Return a pointer to the first non-whitepace character found + in the string. A whitespace is either a space or a tab. */ + +char * +skip_whitespace (char *str) +{ + char *index = str; + + while (*index == ' ' || *index == '\t') + index++; + + return index; +} + +/* Return a pointer to the first DELIMITER character in the given + string. Return a pointer to the end-of-line character if + DELIMITER was not found. */ + +char * +skip_until_character (char *str, char delimiter) +{ + char *index = str; + + while (*index != delimiter && *index != '\0') + index++; + + return index; +} + +/* return a pointer to the first whitespace character. If no whitespace + is found before the end of string, a pointer to the end of string + is returned. A whitespace is either a space or a tab. */ + +static char * +skip_until_whitespace (char *str) +{ + char *index = str; + + while (*index != ' ' && *index != '\t' && *index != '\0') + index++; + + return index; +} + +/* Return a pointer to the first white space after the next + whitespace-delimited token. */ + +char * +skip_space_delimited_token (char *str) +{ + char *index = str; + + index = skip_whitespace (index); + index = skip_until_whitespace (index); + + return index; +} + +/* Copy the next whitespace token into TOKEN. This string will be + allocated using malloc, and must be dealocated later. */ + +char * +get_space_delimited_token (char *str, char **token) +{ + char *start; + char *end; + char tmp; + + start = skip_whitespace (str); + end = skip_until_whitespace (start); + + tmp = *end; + *end = '\0'; + *token = xstrdup (start); + *end = tmp; + + return end; +} + /* Provide a prototype to silence -Wmissing-prototypes. */ extern initialize_file_ftype _initialize_utils; -- 1.7.0.4