plugins: add strstr() to plugin API

Multiple plugins carry their own strstr() implementation because
the in-core version wasn't exported to the plugin API.

Change-Id: Ib57a9b63754c89fb3447ec1d3958963d23145105

apps/plugin.c

@@ -868,6 +868,7 @@ static const struct plugin_api rockbox_api = {
     gesture_vel_process,
     gesture_vel_get,
 #endif
+    strstr,
 };
 
 static int plugin_buffer_handle;

apps/plugin.h

@@ -1019,6 +1019,7 @@ struct plugin_api {
                                 const struct touchevent *ev);
     bool (*gesture_vel_get)(struct gesture_vel *gv, int *xvel, int *yvel);
 #endif
+    char* (*strstr)(const char *s1, const char *s2);
 };
 
 /* plugin header */

apps/plugins/imageviewer/imageviewer.c

@@ -953,7 +953,7 @@ reload_decoder:
             return change_filename(direction);
         }
     }
-    else if (ds_max < ds_min)
+    else if (ds_max < ds_min && !(ds_max == 1 && imgdec->unscaled_avail))
         ds_max = ds_min;
 
     ds = ds_max; /* initialize setting */

apps/plugins/lua/README

@@ -3,4 +3,3 @@ version 0.31 which is licensed under the GPL version 2:
 
     gmtime.c
     strftime.c
-    strstr.c

apps/plugins/lua/SOURCES

@@ -33,7 +33,6 @@ rocklib_img.c
 tlsf_helper.c
 strftime.c
 strpbrk.c
-strstr.c
 rocklua.c
 luadir.c
 rocklib_events.c

apps/plugins/lua/rockconf.h

@@ -64,6 +64,7 @@ int splash_scroller(int timeout, const char* str);
 #define strlen   rb->strlen
 #define strtol   rb->strtol
 #define strtoul  rb->strtoul
+#define strstr   rb->strstr
 #define yield()  rb->yield()
 
 #endif /* _ROCKCONF_H_ */

apps/plugins/lua/strstr.c

@@ -1,16 +0,0 @@
-#include "rocklibc.h"
-
-char *strstr(const char *haystack, const char *needle) {
-  size_t nl=strlen(needle);
-  size_t hl=strlen(haystack);
-  int i;
-  if (!nl) goto found;
-  if (nl>hl) return 0;
-  for (i=hl-nl+1; __likely(i); --i) {
-    if (*haystack==*needle && !memcmp(haystack,needle,nl))
-found:
-      return (char*)haystack;
-    ++haystack;
-  }
-  return 0;
-}

apps/plugins/mikmod/SOURCES

@@ -32,7 +32,6 @@ munitrk.c
 npertab.c
 sloader.c
 //strdup.c
-strstr.c
 virtch.c
 virtch2.c
 virtch_common.c

apps/plugins/mikmod/mikmod_supp.h

@@ -31,6 +31,8 @@
 #define strncmp(a,b,c)      rb->strncmp(a,b,c)
 #undef strcasecmp
 #define strcasecmp(a,b)     rb->strcasecmp(a,b)
+#undef strstr
+#define strstr(a,b)         rb->strstr(a,b)
 
 #undef open
 #define open(a,b)		rb->open(a,b)

apps/plugins/mikmod/strstr.c

@@ -1,21 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-
-#include "mikmod_supp.h"
-
-char *strstr(const char *haystack, const char *needle)
-{
-	const char *scan;
-	size_t len;
-	char firstc;
-
-	firstc = *needle;
-	len = strlen(needle);
-	for (scan = haystack; *scan != firstc || strncmp(scan, needle, len); )
-		if (!*scan++)
-			return NULL;
-	return (char *)scan;
-}

apps/plugins/pdbox/pdbox.h

@@ -195,6 +195,10 @@ void pd_init(void);
 #define ftoan rb_ftoan
 #undef strtok_r
 #define strtok_r rb->strtok_r
+
+// NOTE: historically strstr() was not exported in the plugin API so this
+//       has been defined as strcasestr(). It's likely this is wrong, but
+//       changing it now could break user scripts...
 #define strstr rb->strcasestr
 
 

apps/plugins/sdl/include/SDL_config_rockbox.h

@@ -88,6 +88,7 @@
 #define HAVE_STRLCPY      1
 #define HAVE_STRCMP       1
 #define HAVE_STRNCMP      1
+#define HAVE_STRSTR       1
 
 #undef strdup
 
@@ -172,7 +173,7 @@
 #define strpbrk strpbrk_wrapper
 #endif
 #define strrchr rb->strrchr
-#define strstr SDL_strstr
+#define strstr rb->strstr
 #define strtok strtok_wrapper
 #define strtok_r rb->strtok_r
 #define HAVE_STRTOL 1

apps/plugins/sdl/redefines.txt

@@ -345,7 +345,6 @@ SDL_strncasecmp rb_SDL_strncasecmp
 SDL_strncmp rb_SDL_strncmp
 SDL_strrchr rb_SDL_strrchr
 SDL_strrev rb_SDL_strrev
-SDL_strstr rb_SDL_strstr
 SDL_strtod rb_SDL_strtod
 SDL_strtoll.localalias.2 rb_SDL_strtoll.localalias.2
 SDL_strtoll rb_SDL_strtoll

manual/Makefile.pdflatex

@@ -16,8 +16,13 @@ buildmanual: rockbox-build.tex pdf
 buildhtml: rockbox-build.tex
 	@mkdir -p $(OBJDIR)/html
 	@$(HTLATEX) $(DOCUMENT) "$(HTOPTS1),$(SPLITHTML)" $(HTOPTS2) $(HTOPTS3) </dev/null
-	@cp --parent `cat $(OBJDIR)/html/*.html | sed -e '/\.js/!d;s/.*\"\(.*\.js\)\".*/\1/g;/</d' | uniq` $(OBJDIR)/html
+# (GNU cp --parents option not available on BSD/Darwin)
-	@cp --parent `cat $(OBJDIR)/html/*.html | sed -e '/[pj][np]g/!d;s/.*\"\(.*\.[pj][np]g\)\".*/\1/g;/</d'` $(OBJDIR)/html
+	@JS_FILES=`cat $(OBJDIR)/html/*.html | sed -e '/\.js/!d;s/.*\"\(.*\.js\)\".*/\1/g;/</d' | uniq`; \
+	IMG_FILES=`cat $(OBJDIR)/html/*.html | sed -e '/[pj][np]g/!d;s/.*\"\(.*\.[pj][np]g\)\".*/\1/g;/</d'`; \
+	for f in $$JS_FILES $$IMG_FILES; do \
+	  mkdir -p $(OBJDIR)/html/`dirname $$f`; \
+	  cp $$f $(OBJDIR)/html/$$f; \
+	done
 	@cp -r $(OBJDIR)/html $(OBJDIR)/../
 
 buildtxt: buildhtml