aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fbmngplay/mng.c4
-rw-r--r--fbmngplay/mng.h4
-rw-r--r--scripts/splash.sh12
3 files changed, 9 insertions, 11 deletions
diff --git a/fbmngplay/mng.c b/fbmngplay/mng.c
index 9728975..d899bd0 100644
--- a/fbmngplay/mng.c
+++ b/fbmngplay/mng.c
@@ -26,13 +26,13 @@ unsigned long bufferpos = 0, buffersize = 0;
*/
/* memory allocation; data must be zeroed */
-mng_ptr mngalloc(mng_uint32 size)
+mng_ptr mngalloc(mng_size_t size)
{
return (mng_ptr) calloc(1, size);
}
/* memory deallocation */
-void mngfree(mng_ptr p, mng_uint32 size)
+void mngfree(mng_ptr p, mng_size_t size)
{
free(p);
return;
diff --git a/fbmngplay/mng.h b/fbmngplay/mng.h
index bbe8af2..db19b0a 100644
--- a/fbmngplay/mng.h
+++ b/fbmngplay/mng.h
@@ -17,8 +17,8 @@
extern mngstuff *mng;
-mng_ptr mngalloc(mng_uint32 size);
-void mngfree(mng_ptr p, mng_uint32 size);
+mng_ptr mngalloc(mng_size_t size);
+void mngfree(mng_ptr p, mng_size_t size);
mng_bool mngopenstream(mng_handle mng);
mng_bool mngclosestream(mng_handle mng);
mng_bool mngreadstream( mng_handle mng, mng_ptr buffer, mng_uint32 size, mng_uint32 * bytesread);
diff --git a/scripts/splash.sh b/scripts/splash.sh
index 90ead3c..d7e68f9 100644
--- a/scripts/splash.sh
+++ b/scripts/splash.sh
@@ -26,10 +26,10 @@ else
fi
gprintf() {
- # request translations to be always in UTF-8 with OUTPUT_CHARSET=UTF-8
- if [ -x /bin/gettext -a -n "$1" ]; then
+ # request translations to be always in UTF-8
+ if [ -x /bin/gettext -a -n "$1" ]; then
if [ -n "$GP_LANG" ]; then
- TEXT=`OUTPUT_CHARSET=UTF-8 LANGUAGE=$GP_LANG LANG=$LANGUAGE gettext -e --domain=$TEXTDOMAIN "$1"`
+ TEXT=`OUTPUT_CHARSET=UTF-8 LANGUAGE=$GP_LANG LANG=$GP_LANG gettext -e --domain=$TEXTDOMAIN "$1"`
else
TEXT=`OUTPUT_CHARSET=UTF-8 LANG=$LANGUAGE gettext -e --domain=$TEXTDOMAIN "$1"`
fi
@@ -57,7 +57,7 @@ fi
_shutdown="no"
_silent="no"
-grep -q silent /proc/cmdline && _silent="yes"
+grep -q silent /proc/cmdline && grep -q silent /proc/splash && _silent="yes"
test "$runlevel" == "6" -o "$runlevel" == "0" && _shutdown="yes"
if [ "$1" == "verbose" ]; then
@@ -186,7 +186,7 @@ if [ "$progress" == 1 -o "$1" == "start" ]; then
fi
_boot=$TEXT
if [ "$text_x" != "" -a "$text_y" != "" \
- -a "$text_color" != "" -a "$text_size" != "" -a "$_silent" == "yes" ]; then
+ -a "$text_color" != "" -a "$text_size" != "" -a "$_silent" == "yes" -o "$_shutdown" == "yes" ]; then
gprintf "Press Esc for verbose mode."
fbtruetype.static -x $text_x -y $text_y -t $text_color -s $text_size \
$custom_font "$_boot $TEXT"
@@ -196,5 +196,3 @@ fi
# Paint progressbar..
test -z "$progress_enable" && exit 0
echo "show $(( 65534 * ( $progress + 1 ) / $num ))" > /proc/splash
-
-