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


git-svn-id: svn://busybox.net/trunk/busybox@2450 69ca8d6d-28ef-0310-b511-8ec308f3f277

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 000000000..b4bb7ec32
--- /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 2937b4863..0ceb983cd 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;