diff options
Diffstat (limited to 'src/utils.c')
| -rw-r--r-- | src/utils.c | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/src/utils.c b/src/utils.c index ff13a41..bed5f91 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,9 +1,9 @@ -/* $Id: utils.c 4453 2009-12-02 03:36:22Z astyanax $ */ +/* $Id: utils.c 4948 2014-06-09 14:23:53Z bens $ */ /************************************************************************** * utils.c * * * * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, * - * 2008, 2009 Free Software Foundation, Inc. * + * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 3, or (at your option) * @@ -72,6 +72,10 @@ bool parse_num(const char *str, ssize_t *val) assert(str != NULL); + /* The manual page for strtol() says this is required, and + * it looks like it is! */ + errno = 0; + j = (ssize_t)strtol(str, &first_error, 10); if (errno == ERANGE || *str == '\0' || *first_error != '\0') @@ -183,7 +187,7 @@ void sunder(char *str) * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301, USA. */ -#ifdef ENABLE_NANORC +#ifndef DISABLE_NANORC #ifndef HAVE_GETDELIM /* This function is equivalent to getdelim(). */ @@ -243,7 +247,7 @@ ssize_t ngetline(char **lineptr, size_t *n, FILE *stream) return getdelim(lineptr, n, '\n', stream); } #endif -#endif /* ENABLE_NANORC */ +#endif /* !DISABLE_NANORC */ #ifdef HAVE_REGEX_H /* Do the compiled regex in preg and the regex in string match the @@ -255,9 +259,10 @@ bool regexp_bol_or_eol(const regex_t *preg, const char *string) REG_NOMATCH); } -/* Fix the regex if we're on platforms which requires an adjustment - * from GNU-style to BSD-style word boundaries. */ -const char *fixbounds(const char *r) { +/* Fix the regex if we're on platforms which require an adjustment + * from GNU-style to BSD-style word boundaries. */ +const char *fixbounds(const char *r) +{ #ifndef GNU_WORDBOUNDS int i, j = 0; char *r2 = charalloc(strlen(r) * 5); @@ -268,15 +273,15 @@ const char *fixbounds(const char *r) { #endif for (i = 0; i < strlen(r); i++) { - if (r[i] != '\0' && r[i] == '\\' && (r[i+1] == '>' || r[i+1] == '<')) { - strcpy(&r2[j], "[[:"); - r2[j+3] = r[i+1]; - strcpy(&r2[j+4], ":]]"); - i++; - j += 6; - } else - r2[j] = r[i]; - j++; + if (r[i] != '\0' && r[i] == '\\' && (r[i + 1] == '>' || r[i + 1] == '<')) { + strcpy(&r2[j], "[[:"); + r2[j + 3] = r[i + 1]; + strcpy(&r2[j + 4], ":]]"); + i++; + j += 6; + } else + r2[j] = r[i]; + j++; } r2[j] = '\0'; r3 = mallocstrcpy(NULL, r2); @@ -472,7 +477,10 @@ size_t get_page_start(size_t column) * current_x. */ size_t xplustabs(void) { - return strnlenpt(openfile->current->data, openfile->current_x); + if (openfile->current) + return strnlenpt(openfile->current->data, openfile->current_x); + else + return 0; } /* Return the index in s of the character displayed at the given column, @@ -542,7 +550,7 @@ void new_magicline(void) openfile->filebot->next->prev = openfile->filebot; openfile->filebot->next->next = NULL; openfile->filebot->next->lineno = openfile->filebot->lineno + 1; -#ifdef ENABLE_COLOR +#ifndef DISABLE_COLOR openfile->filebot->next->multidata = NULL; #endif openfile->filebot = openfile->filebot->next; @@ -594,7 +602,7 @@ void mark_order(const filestruct **top, size_t *top_x, const filestruct *right_side_up = FALSE; } } -#endif +#endif /* !NANO_TINY */ /* Calculate the number of characters between begin and end, and return * it. */ @@ -626,7 +634,7 @@ size_t get_totsize(const filestruct *begin, const filestruct *end) return totsize; } -/* Get back a pointer given a line number in the current openfilestruct */ +/* Get back a pointer given a line number in the current openfilestruct. */ filestruct *fsfromline(ssize_t lineno) { filestruct *f = openfile->current; |