/[magellan-source]/trunk/mkinitrd-magellan/busybox/libbb/xfuncs_printf.c

Diff of /trunk/mkinitrd-magellan/busybox/libbb/xfuncs_printf.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 140 
 int FAST_FUNC xopen(const char *pathname
  	return xopen3(pathname, flags, 0666);
  }
+ /* Die if we can't open an existing file readonly with O_NONBLOCK
+  * and return the fd.
+  * Note that for ioctl O_RDONLY is sufficient.
+  */
+ int FAST_FUNC xopen_nonblocking(const char *pathname)
+ {
+ 	return xopen(pathname, O_RDONLY | O_NONBLOCK);
+ }
  // Warn if we can't open a file and return a fd.
  int FAST_FUNC open3_or_warn(const char *pathname, int flags, int mode)
  {
-Line 208 
 void FAST_FUNC xwrite(int fd, const void
+Line 217 
 void FAST_FUNC xwrite(int fd, const void
  			bb_error_msg_and_die("short write");
  	}
  }
+ void FAST_FUNC xwrite_str(int fd, const char *str)
+ {
+ 	xwrite(fd, str, strlen(str));
+ }
+ void FAST_FUNC xclose(int fd)
+ {
+ 	if (close(fd))
+ 		bb_perror_msg_and_die("close failed");
+ }
  // Die with an error message if we can't lseek to the right spot.
  off_t FAST_FUNC xlseek(int fd, off_t offset, int whence)
-Line 236 
 void FAST_FUNC die_if_ferror_stdout(void
+Line 255 
 void FAST_FUNC die_if_ferror_stdout(void
  	die_if_ferror(stdout, bb_msg_standard_output);
  }
- // Die with an error message if we have trouble flushing stdout.
+ int FAST_FUNC fflush_all(void)
- void FAST_FUNC xfflush_stdout(void)
  {
- 	if (fflush(stdout)) {
+ 	return fflush(NULL);
- 		bb_perror_msg_and_die(bb_msg_standard_output);
- 	}
  }
  int FAST_FUNC bb_putchar(int ch)
  {
- 	/* time.c needs putc(ch, stdout), not putchar(ch).
+ 	return putchar(ch);
- 	 * it does "stdout = stderr;", but then glibc's putchar()
- 	 * doesn't work as expected. bad glibc, bad */
- 	return putc(ch, stdout);
  }
  /* Die with an error message if we can't copy an entire FILE* to stdout,
   * then close that file. */
  void FAST_FUNC xprint_and_close_file(FILE *file)
  {
- 	fflush(stdout);
+ 	fflush_all();
  	// copyfd outputs error messages for us.
- 	if (bb_copyfd_eof(fileno(file), 1) == -1)
+ 	if (bb_copyfd_eof(fileno(file), STDOUT_FILENO) == -1)
  		xfunc_die();
  	fclose(file);
-Line 273 
 char* FAST_FUNC xasprintf(const char *fo
+Line 286 
 char* FAST_FUNC xasprintf(const char *fo
  	int r;
  	char *string_ptr;
- #if 1
- 	// GNU extension
  	va_start(p, format);
  	r = vasprintf(&string_ptr, format, p);
  	va_end(p);
- #else
- 	// Bloat for systems that haven't got the GNU extension.
- 	va_start(p, format);
- 	r = vsnprintf(NULL, 0, format, p);
- 	va_end(p);
- 	string_ptr = xmalloc(r+1);
- 	va_start(p, format);
- 	r = vsnprintf(string_ptr, r+1, format, p);
- 	va_end(p);
- #endif
  	if (r < 0)
  		bb_error_msg_and_die(bb_msg_memory_exhausted);
  	return string_ptr;
  }
- #if 0 /* If we will ever meet a libc which hasn't [f]dprintf... */
+ void FAST_FUNC xsetenv(const char *key, const char *value)
- int FAST_FUNC fdprintf(int fd, const char *format, ...)
  {
- 	va_list p;
+ 	if (setenv(key, value, 1))
- 	int r;
+ 		bb_error_msg_and_die(bb_msg_memory_exhausted);
- 	char *string_ptr;
+ }
- #if 1
+ /* Handles "VAR=VAL" strings, even those which are part of environ
- 	// GNU extension
+  * _right now_
- 	va_start(p, format);
+  */
- 	r = vasprintf(&string_ptr, format, p);
+ void FAST_FUNC bb_unsetenv(const char *var)
- 	va_end(p);
+ {
- #else
+ 	char *tp = strchr(var, '=');
- 	// Bloat for systems that haven't got the GNU extension.
- 	va_start(p, format);
- 	r = vsnprintf(NULL, 0, format, p) + 1;
- 	va_end(p);
- 	string_ptr = malloc(r);
- 	if (string_ptr) {
- 		va_start(p, format);
- 		r = vsnprintf(string_ptr, r, format, p);
- 		va_end(p);
- 	}
- #endif
- 	if (r >= 0) {
+ 	if (!tp) {
- 		full_write(fd, string_ptr, r);
+ 		unsetenv(var);
- 		free(string_ptr);
+ 		return;
  	}
- 	return r;
- }
- #endif
- void FAST_FUNC xsetenv(const char *key, const char *value)
+ 	/* In case var was putenv'ed, we can't replace '='
- {
+ 	 * with NUL and unsetenv(var) - it won't work,
- 	if (setenv(key, value, 1))
+ 	 * env is modified by the replacement, unsetenv
- 		bb_error_msg_and_die(bb_msg_memory_exhausted);
+ 	 * sees "VAR" instead of "VAR=VAL" and does not remove it!
+ 	 * horror :( */
+ 	tp = xstrndup(var, tp - var);
+ 	unsetenv(tp);
+ 	free(tp);
  }
  // Die with an error message if we can't set gid.  (Because resource limits may
  // limit this user to a given number of processes, and if that fills up the
  // setgid() will fail and we'll _still_be_root_, which is bad.)
-Line 393 
 int FAST_FUNC xsocket(int domain, int ty
+Line 384 
 int FAST_FUNC xsocket(int domain, int ty
  		const char *s = "INET";
  		if (domain == AF_PACKET) s = "PACKET";
  		if (domain == AF_NETLINK) s = "NETLINK";
- USE_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";)
+ IF_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";)
- 		bb_perror_msg_and_die("socket(AF_%s)", s);
+ 		bb_perror_msg_and_die("socket(AF_%s,%d,%d)", s, type, protocol);
  #else
  		bb_perror_msg_and_die("socket");
  #endif
-Line 417 
 void FAST_FUNC xlisten(int s, int backlo
+Line 408 
 void FAST_FUNC xlisten(int s, int backlo
  /* Die with an error message if sendto failed.
   * Return bytes sent otherwise  */
- ssize_t FAST_FUNC xsendto(int s, const  void *buf, size_t len, const struct sockaddr *to,
+ ssize_t FAST_FUNC xsendto(int s, const void *buf, size_t len, const struct sockaddr *to,
  				socklen_t tolen)
  {
  	ssize_t ret = sendto(s, buf, len, 0, to, tolen);

 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