diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2010-08-01 20:22:03 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2011-09-24 15:08:09 (GMT) |
| commit | 4bd78e91404e8b72b5aca483dc1f7ddf8da12f76 (patch) | |
| tree | b80111c645ed8b24ca6f980ba84f67f452c3f2cd | |
| parent | 61d348bc25d8b0f1a82344f38f4cc1d4a90bb2b7 (diff) | |
Fix stamps group scanning
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/tuxpaint.c | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -132,9 +132,6 @@ DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-dev MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man -# BASH tab-completion file: -COMPLETIONDIR:=$(DESTDIR)/etc/bash_completion.d - # 'System-wide' Config file: ifeq ($(PREFIX),/usr) CONFDIR:=$(DESTDIR)/etc/tuxpaint @@ -146,6 +143,9 @@ ifeq ($(SYSNAME),Haiku) CONFDIR:=$(shell finddir B_USER_SETTINGS_DIRECTORY)/TuxPaint endif +# BASH tab-completion file: +COMPLETIONDIR:=$(CONFDIR)/../bash_completion.d + # Icons and launchers: ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 6fafaf3..a7c9bf4 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -6793,6 +6793,7 @@ static void loadstamp_callback(SDL_Surface * screen, static void load_stamp_dir(SDL_Surface * screen, const char *const dir) { char buf[TP_FTW_PATHSIZE]; + char dir_buf[TP_FTW_PATHSIZE]; unsigned dirlen; if (dir[0] != '/') @@ -6807,7 +6808,8 @@ static void load_stamp_dir(SDL_Surface * screen, const char *const dir) buf[dirlen] = '\0'; } - load_stamp_basedir = dir; + strncpy(dir_buf, buf, TP_FTW_PATHSIZE); + load_stamp_basedir = dir_buf; tp_ftw(screen, buf, dirlen, 0, loadstamp_callback, NULL); } |