/[magellan-source]/trunk/mkinitrd-magellan/busybox/miscutils/fbsplash.c

Diff of /trunk/mkinitrd-magellan/busybox/miscutils/fbsplash.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 1
  /* vi: set sw=4 ts=4: */
  /*
-  * Copyright (C) 2008 Michele Sanges <michele.sanges@otomelara.it>,
+  * Copyright (C) 2008 Michele Sanges <michele.sanges@gmail.com>
-  * <michele.sanges@gmail.it>
   *
   * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
   *
-Line 85 
 static void fb_open(const char *strfb_de
+Line 84 
 static void fb_open(const char *strfb_de
  	// map the device in memory
  	G.addr = mmap(NULL,
  			G.scr_var.xres * G.scr_var.yres
- 			* BYTES_PER_PIXEL /*(G.scr_var.bits_per_pixel / 8)*/ ,
+ 			* BYTES_PER_PIXEL /*(G.scr_var.bits_per_pixel / 8)*/,
  			PROT_WRITE, MAP_SHARED, fbfd, 0);
  	if (G.addr == MAP_FAILED)
- 		bb_perror_msg_and_die("can't mmap %s", strfb_device);
+ 		bb_perror_msg_and_die("mmap");
  	close(fbfd);
  }
-Line 122 
 static void fb_drawrectangle(void)
+Line 121 
 static void fb_drawrectangle(void)
  	// vertical lines
  	ptr1 = (DATA*)(G.addr + (G.nbar_posy * G.scr_var.xres + G.nbar_posx) * BYTES_PER_PIXEL);
  	ptr2 = (DATA*)(G.addr + (G.nbar_posy * G.scr_var.xres + G.nbar_posx + G.nbar_width - 1) * BYTES_PER_PIXEL);
- 	cnt = G.nbar_posy + G.nbar_height - 1 - G.nbar_posy;
+ 	cnt = G.nbar_height - 1;
  	do {
  		*ptr1 = thispix; ptr1 += G.scr_var.xres;
  		*ptr2 = thispix; ptr2 += G.scr_var.xres;
-Line 217 
 static void fb_drawprogressbar(unsigned
+Line 216 
 static void fb_drawprogressbar(unsigned
   */
  static void fb_drawimage(void)
  {
- 	char head[256];
- 	char s[80];
  	FILE *theme_file;
+ 	char *read_ptr;
  	unsigned char *pixline;
  	unsigned i, j, width, height, line_size;
- 	memset(head, 0, sizeof(head));
+ 	if (LONE_DASH(G.image_filename)) {
- 	theme_file = xfopen_stdin(G.image_filename);
+ 		theme_file = stdin;
+ 	} else {
+ 		int fd = open_zipped(G.image_filename);
+ 		if (fd < 0)
+ 			bb_simple_perror_msg_and_die(G.image_filename);
+ 		theme_file = xfdopen_for_read(fd);
+ 	}
- 	// parse ppm header
+ 	/* Parse ppm header:
+ 	 * - Magic: two characters "P6".
+ 	 * - Whitespace (blanks, TABs, CRs, LFs).
+ 	 * - A width, formatted as ASCII characters in decimal.
+ 	 * - Whitespace.
+ 	 * - A height, ASCII decimal.
+ 	 * - Whitespace.
+ 	 * - The maximum color value, ASCII decimal, in 0..65535
+ 	 * - Newline or other single whitespace character.
+ 	 *   (we support newline only)
+ 	 * - A raster of Width * Height pixels in triplets of rgb
+ 	 *   in pure binary by 1 or 2 bytes. (we support only 1 byte)
+ 	 */
+ #define concat_buf bb_common_bufsiz1
+ 	read_ptr = concat_buf;
  	while (1) {
- 		if (fgets(s, sizeof(s), theme_file) == NULL)
+ 		int w, h, max_color_val;
- 			bb_error_msg_and_die("bad PPM file '%s'", G.image_filename);
+ 		int rem = concat_buf + sizeof(concat_buf) - read_ptr;
+ 		if (rem < 2
- 		if (s[0] == '#')
+ 		 || fgets(read_ptr, rem, theme_file) == NULL
- 			continue;
+ 		) {
- 		if (strlen(head) + strlen(s) >= sizeof(head))
  			bb_error_msg_and_die("bad PPM file '%s'", G.image_filename);
+ 		}
- 		strcat(head, s);
+ 		read_ptr = strchrnul(read_ptr, '#');
- 		if (head[0] != 'P' || head[1] != '6')
+ 		*read_ptr = '\0'; /* ignore #comments */
- 			bb_error_msg_and_die("bad PPM file '%s'", G.image_filename);
+ 		if (sscanf(concat_buf, "P6 %u %u %u", &w, &h, &max_color_val) == 3
+ 		 && max_color_val <= 255
- 		// width, height, max_color_val
+ 		) {
- 		if (sscanf(head, "P6 %u %u %u", &width, &height, &i) == 3)
+ 			width = w; /* w is on stack, width may be in register */
+ 			height = h;
  			break;
- // TODO: i must be <= 255!
+ 		}
  	}
  	line_size = width*3;
+ 	pixline = xmalloc(line_size);
  	if (width > G.scr_var.xres)
  		width = G.scr_var.xres;
  	if (height > G.scr_var.yres)
  		height = G.scr_var.yres;
- 	pixline = xmalloc(line_size);
  	for (j = 0; j < height; j++) {
- 		unsigned char *pixel = pixline;
+ 		unsigned char *pixel;
- 		DATA *src = (DATA *)(G.addr + j * G.scr_fix.line_length);
+ 		DATA *src;
  		if (fread(pixline, 1, line_size, theme_file) != line_size)
  			bb_error_msg_and_die("bad PPM file '%s'", G.image_filename);
+ 		pixel = pixline;
+ 		src = (DATA *)(G.addr + j * G.scr_fix.line_length);
  		for (i = 0; i < width; i++) {
  			unsigned thispix;
  			thispix = (((unsigned)pixel[0] << 8) & 0xf800)
-Line 280 
 static void fb_drawimage(void)
+Line 299 
 static void fb_drawimage(void)
   */
  static void init(const char *cfg_filename)
  {
- 	static const char const param_names[] ALIGN1 =
+ 	static const char param_names[] ALIGN1 =
  		"BAR_WIDTH\0" "BAR_HEIGHT\0"
  		"BAR_LEFT\0" "BAR_TOP\0"
  		"BAR_R\0" "BAR_G\0" "BAR_B\0"
-Line 291 
 static void init(const char *cfg_filenam
+Line 310 
 static void init(const char *cfg_filenam
  	char *token[2];
  	parser_t *parser = config_open2(cfg_filename, xfopen_stdin);
  	while (config_read(parser, token, 2, 2, "#=",
- 				    (PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
+ 				(PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
  		unsigned val = xatoi_u(token[1]);
  		int i = index_in_strings(param_names, token[0]);
  		if (i < 0)
- 			bb_error_msg_and_die("syntax error: '%s'", token[0]);
+ 			bb_error_msg_and_die("syntax error: %s", token[0]);
  		if (i >= 0 && i < 7)
  			G.ns[i] = val;
  #if DEBUG
-Line 377 
 int fbsplash_main(int argc UNUSED_PARAM,
+Line 396 
 int fbsplash_main(int argc UNUSED_PARAM,
  		num = atoi(num_buf);
  		if (isdigit(num_buf[0]) && (num <= 100)) {
  #if DEBUG
- 			char strVal[10];
+ 			DEBUG_MESSAGE(itoa(num));
- 			sprintf(strVal, "%d", num);
- 			DEBUG_MESSAGE(strVal);
  #endif
  			fb_drawprogressbar(num);
  		}

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984