summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorEric Andersen2001-04-26 15:56:47 +0000
committerEric Andersen2001-04-26 15:56:47 +0000
commitc1bdffe99b6fa6fdb0f43e0dec85d8bbfcab1572 (patch)
tree3cf5b7c0c69bd8c802c4b080b6a5e94a4a401831 /libbb
parent3c3277f0bda79b66b35e5e965e5340624d29a459 (diff)
downloadbusybox-c1bdffe99b6fa6fdb0f43e0dec85d8bbfcab1572.zip
busybox-c1bdffe99b6fa6fdb0f43e0dec85d8bbfcab1572.tar.gz
Another nice cleanup from Larry. This adds a new last_char_is() function and
uses it to avoid possible buffer underruns whn strlen is zero, and avoid the possible space-hogging inline of strlen() in several cases. -Erik
Diffstat (limited to 'libbb')
-rw-r--r--libbb/last_char_is.c33
-rw-r--r--libbb/libbb.h1
2 files changed, 34 insertions, 0 deletions
diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
new file mode 100644
index 0000000..b4bb7ec
--- /dev/null
+++ b/libbb/last_char_is.c
@@ -0,0 +1,33 @@
+/*
+ * busybox library eXtended function
+ *
+ * Copyright (C) 2001 Larry Doolittle, <ldoolitt@recycle.lbl.gov>
+ *
+ * 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "libbb.h"
+
+/* Find out if the last character of a string matches the one given Don't
+ * underrun the buffer if the string length is 0. Also avoids a possible
+ * space-hogging inline of strlen() per usage.
+ */
+int last_char_is(const char *s, const int c)
+{
+ int l = strlen(s);
+ if (l==0) return 0;
+ return (s[l-1] == c);
+}
diff --git a/libbb/libbb.h b/libbb/libbb.h
index 2937b48..0ceb983 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -218,6 +218,7 @@ int klogctl(int type, char * b, int len);
char *xgetcwd(char *cwd);
char *concat_path_file(const char *path, const char *filename);
+int last_char_is(const char *s, const int c);
typedef struct ar_headers_s {
char *name;