aboutsummaryrefslogtreecommitdiff
path: root/libbb/last_char_is.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-24 21:55:55 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-24 21:55:55 +0000
commit3feb2fc535db445951314f57a8f7ecc460b456d9 (patch)
treee843dcb27558f2121d9b0ce351364aa07960610a /libbb/last_char_is.c
parentd031ffa623203b1dc756a1e02e06f261fdc30872 (diff)
downloadbusybox-w32-3feb2fc535db445951314f57a8f7ecc460b456d9.tar.gz
busybox-w32-3feb2fc535db445951314f57a8f7ecc460b456d9.tar.bz2
busybox-w32-3feb2fc535db445951314f57a8f7ecc460b456d9.zip
tar: fix multiple -t and/or -v options handling.
do not process list of files to tar up in reverse order.
Diffstat (limited to 'libbb/last_char_is.c')
-rw-r--r--libbb/last_char_is.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index 9194ac05f..80a6fe2e4 100644
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -7,20 +7,19 @@
7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 */ 8 */
9 9
10#include <string.h>
11#include "libbb.h" 10#include "libbb.h"
12 11
13/* Find out if the last character of a string matches the one given Don't 12/* Find out if the last character of a string matches the one given Don't
14 * underrun the buffer if the string length is 0. Also avoids a possible 13 * underrun the buffer if the string length is 0. Also avoids a possible
15 * space-hogging inline of strlen() per usage. 14 * space-hogging inline of strlen() per usage.
16 */ 15 */
17char * last_char_is(const char *s, int c) 16char* last_char_is(const char *s, int c)
18{ 17{
19 char *sret = (char *)s; 18 char *sret;
20 if (sret) { 19 if (s) {
21 sret = strrchr(sret, c); 20 sret = strrchr(s, c);
22 if(sret != NULL && *(sret+1) != 0) 21 if (sret && !sret[1])
23 sret = NULL; 22 return sret;
24 } 23 }
25 return sret; 24 return NULL;
26} 25}