From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Wed, 26 Mar 2008 15:12:11 +0000 (-0000)
Subject: fbsplash: cosmetic comment and Config text fixes; rename .ini -> .cfg
X-Git-Tag: 1_11_0~408
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=25a9c17f558e74adc5ccaf9f55cd04e09ffb25a8;p=oweals%2Fbusybox.git

fbsplash: cosmetic comment and Config text fixes; rename .ini -> .cfg
---

diff --git a/miscutils/Config.in b/miscutils/Config.in
index 04c9a0c54..e740a4451 100644
--- a/miscutils/Config.in
+++ b/miscutils/Config.in
@@ -209,14 +209,14 @@ config FBSPLASH
 	  Can be used during boot phase of an embedded device. ~2kb.
 	  Usage:
 	  - use kernel option 'vga=xxx' or otherwise enable fb device.
-	  - put somewhere the fbsplash.ini file and image in .ppm format.
+	  - put somewhere fbsplash.cfg file and an image in .ppm format.
 	  - $ setsid fbsplash [params] &
-	       -c: hide cursor
-	       -d /dev/fbN: framebuffer device (if not /dev/fb0)
-	       -s path_of_image_file
-	       -i path_of_ini_file
-	       -f path_of_fifo (can be "-" for stdin)
-	  - if you want to run applet only in presence of kernel parameter:
+	    -c: hide cursor
+	    -d /dev/fbN: framebuffer device (if not /dev/fb0)
+	    -s path_to_image_file (can be "-" for stdin)
+	    -i path_to_cfg_file
+	    -f path_to_fifo (can be "-" for stdin)
+	  - if you want to run it only in presence of kernel parameter:
 	    grep -q "fbsplash=on" </proc/cmdline && setsid fbsplash [params] &
 	  - commands for fifo:
 	    "NN" (ASCII decimal number) - percentage to show on progress bar
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index d82bab499..a40c585a0 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -1,7 +1,5 @@
 /* vi: set sw=4 ts=4: */
 /*
- * splash implementation for busybox
- *
  * Copyright (C) 2008 Michele Sanges <michele.sanges@otomelara.it>,
  * <michele.sanges@gmail.it>
  *
@@ -9,34 +7,25 @@
  *
  * Usage:
  * - use kernel option 'vga=xxx' or otherwise enable framebuffer device.
- * - put somewhere the fbsplash.ini file and image in .ppm format.
- * - configure applet by editing .ini file.
+ * - put somewhere fbsplash.cfg file and an image in .ppm format.
  * - run applet: $ setsid fbsplash [params] &
  *	-c: hide cursor
  *	-d /dev/fbN: framebuffer device (if not /dev/fb0)
- *	-s path_of_image_file
- * 	-i path_of_ini_file
- * 	-f path_of_fifo (can be "-" for stdin)
- * - if you want to run the applet only in presence of a kernel parameter
- *   (for example fbsplash=on), type:
+ *	-s path_to_image_file (can be "-" for stdin)
+ * 	-i path_to_cfg_file
+ * 	-f path_to_fifo (can be "-" for stdin)
+ * - if you want to run it only in presence of a kernel parameter
+ *   (for example fbsplash=on), use:
  *   grep -q "fbsplash=on" </proc/cmdline && setsid fbsplash [params]
  * - commands for fifo:
  *   "NN" (ASCII decimal number) - percentage to show on progress bar.
  *   "exit" (or just close fifo) - well you guessed it.
  */
 
-/**
- * 	Splash implementation for busybox
- * \file: fbsplash.c
- * \author Michele Sanges <michele.sanges@otomelara.it> <michele.sanges@gmail.com>
- * \version 1.0.0
- * \date 07/03/2008
- */
-
 #include "libbb.h"
 #include <linux/fb.h>
 
-/* If you want logging messages on /tmp/fbsplash_log... */
+/* If you want logging messages on /tmp/fbsplash.log... */
 #define DEBUG 0
 
 #define BYTES_PER_PIXEL 2
@@ -355,7 +344,7 @@ static void init(const char *ini_filename)
 		case 7:
 			G.bdebug_messages = val;
 			if (G.bdebug_messages)
- 				G.logfile_fd = xfopen("/tmp/fbsplash_log", "w");
+ 				G.logfile_fd = xfopen("/tmp/fbsplash.log", "w");
 			break;
 #endif
  err:
diff --git a/miscutils/fbsplash.cfg b/miscutils/fbsplash.cfg
new file mode 100644
index 000000000..b6cf607eb
--- /dev/null
+++ b/miscutils/fbsplash.cfg
@@ -0,0 +1,9 @@
+# progress bar position
+BAR_LEFT=170
+BAR_TOP=300
+BAR_WIDTH=300
+BAR_HEIGHT=20
+# progress bar color
+BAR_R=80
+BAR_G=80
+BAR_B=130
diff --git a/miscutils/fbsplash.ini b/miscutils/fbsplash.ini
deleted file mode 100644
index b6cf607eb..000000000
--- a/miscutils/fbsplash.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-# progress bar position
-BAR_LEFT=170
-BAR_TOP=300
-BAR_WIDTH=300
-BAR_HEIGHT=20
-# progress bar color
-BAR_R=80
-BAR_G=80
-BAR_B=130