/[magellan-source]/trunk/mkinitrd-magellan/busybox/include/libbb.h

Diff of /trunk/mkinitrd-magellan/busybox/include/libbb.h

Parent Directory | Revision Log | View Patch Patch

-revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
+revision 1123 by niro,
Wed Aug 18 21:56:57 2010 UTC
 Line 20
  #include <netdb.h>
  #include <setjmp.h>
  #include <signal.h>
+ #include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <stdarg.h>
-Line 29
+Line 30
  #include <sys/ioctl.h>
  #include <sys/mman.h>
  #include <sys/socket.h>
- #if defined __FreeBSD__
- # include <netinet/in.h>
- # include <arpa/inet.h>
- #endif
  #include <sys/stat.h>
  #include <sys/time.h>
  #include <sys/types.h>
-Line 43
+Line 40
  /* Try to pull in PATH_MAX */
  #include <limits.h>
  #include <sys/param.h>
- #ifndef PATH_MAX
- # define PATH_MAX 256
- #endif
- #ifndef BUFSIZ
- # define BUFSIZ 4096
- #endif
  #ifdef HAVE_MNTENT_H
  #include <mntent.h>
  #endif
  #ifdef HAVE_SYS_STATFS_H
  #include <sys/statfs.h>
  #endif
  #if ENABLE_SELINUX
  #include <selinux/selinux.h>
  #include <selinux/context.h>
  #include <selinux/flask.h>
  #include <selinux/av_permissions.h>
  #endif
  #if ENABLE_LOCALE_SUPPORT
  # include <locale.h>
  #else
  # define setlocale(x,y) ((void)0)
  #endif
  #ifdef DMALLOC
  # include <dmalloc.h>
  #endif
  #include <pwd.h>
  #include <grp.h>
  #if ENABLE_FEATURE_SHADOWPASSWDS
-Line 86
+Line 70
  #  include <shadow.h>
  # endif
  #endif
+ #if defined __FreeBSD__
+ # include <netinet/in.h>
+ # include <arpa/inet.h>
+ #elif defined __APPLE__
+ # include <netinet/in.h>
+ #else
+ # include <arpa/inet.h>
+ # if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED)
+ /* We #define socklen_t *after* includes, otherwise we get
+  * typedef redefinition errors from system headers
+  * (in case "is it defined already" detection above failed)
+  */
+ #  define socklen_t bb_socklen_t
+    typedef unsigned socklen_t;
+ # endif
+ #endif
  /* Some libc's forget to declare these, do it ourself */
-Line 120 
 struct sysinfo {
+Line 121 
 struct sysinfo {
  	char _f[20 - 2 * sizeof(long) - sizeof(int)]; /* Padding: libc5 uses this.. */
  };
  int sysinfo(struct sysinfo* info);
+ #ifndef PATH_MAX
+ # define PATH_MAX 256
+ #endif
+ #ifndef BUFSIZ
+ # define BUFSIZ 4096
+ #endif
  /* Make all declarations hidden (-fvisibility flag only affects definitions) */
-Line 256 
 extern void chomp(char *s) FAST_FUNC;
+Line 263 
 extern void chomp(char *s) FAST_FUNC;
  extern void trim(char *s) FAST_FUNC;
  extern char *skip_whitespace(const char *) FAST_FUNC;
  extern char *skip_non_whitespace(const char *) FAST_FUNC;
+ extern char *skip_dev_pfx(const char *tty_name) FAST_FUNC;
  extern char *strrstr(const char *haystack, const char *needle) FAST_FUNC;
  //TODO: supply a pointer to char[11] buffer (avoid statics)?
-Line 332 
 void xmove_fd(int, int) FAST_FUNC;
+Line 341 
 void xmove_fd(int, int) FAST_FUNC;
  DIR *xopendir(const char *path) FAST_FUNC;
  DIR *warn_opendir(const char *path) FAST_FUNC;
- /* UNUSED: char *xmalloc_realpath(const char *path) FAST_FUNC RETURNS_MALLOC; */
+ char *xmalloc_realpath(const char *path) FAST_FUNC RETURNS_MALLOC;
  char *xmalloc_readlink(const char *path) FAST_FUNC RETURNS_MALLOC;
  char *xmalloc_readlink_or_warn(const char *path) FAST_FUNC RETURNS_MALLOC;
  /* !RETURNS_MALLOC: it's a realloc-like function */
-Line 399 
 void xchdir(const char *path) FAST_FUNC;
+Line 408 
 void xchdir(const char *path) FAST_FUNC;
  void xchroot(const char *path) FAST_FUNC;
  void xsetenv(const char *key, const char *value) FAST_FUNC;
  void bb_unsetenv(const char *key) FAST_FUNC;
+ void bb_unsetenv_and_free(char *key) FAST_FUNC;
  void xunlink(const char *pathname) FAST_FUNC;
  void xstat(const char *pathname, struct stat *buf) FAST_FUNC;
  int xopen(const char *pathname, int flags) FAST_FUNC;
-Line 412 
 int rename_or_warn(const char *oldpath,
+Line 422 
 int rename_or_warn(const char *oldpath,
  off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC;
  off_t fdlength(int fd) FAST_FUNC;
+ uoff_t FAST_FUNC get_volume_size_in_bytes(int fd,
+                 const char *override,
+                 unsigned override_units,
+                 int extend);
  void xpipe(int filedes[2]) FAST_FUNC;
  /* In this form code with pipes is much more readable */
  struct fd_pair { int rd; int wr; };
-Line 518 
 int create_and_connect_stream_or_die(con
+Line 533 
 int create_and_connect_stream_or_die(con
  int xconnect_stream(const len_and_sockaddr *lsa) FAST_FUNC;
  /* Get local address of bound or accepted socket */
  len_and_sockaddr *get_sock_lsa(int fd) FAST_FUNC RETURNS_MALLOC;
+ /* Get remote address of connected or accepted socket */
+ len_and_sockaddr *get_peer_lsa(int fd) FAST_FUNC RETURNS_MALLOC;
  /* Return malloc'ed len_and_sockaddr with socket address of host:port
   * Currently will return IPv4 or IPv6 sockaddrs only
   * (depending on host), but in theory nothing prevents e.g.
-Line 576 
 char *strncpy_IFNAMSIZ(char *dst, const
+Line 593 
 char *strncpy_IFNAMSIZ(char *dst, const
  /* Guaranteed to NOT be a macro (smallest code). Saves nearly 2k on uclibc.
   * But potentially slow, don't use in one-billion-times loops */
  int bb_putchar(int ch) FAST_FUNC;
+ /* Note: does not use stdio, writes to fd 2 directly */
+ int bb_putchar_stderr(char ch) FAST_FUNC;
  char *xasprintf(const char *format, ...) __attribute__ ((format(printf, 1, 2))) FAST_FUNC RETURNS_MALLOC;
- /* Prints unprintable chars ch as ^C or M-c to file
-  * (M-c is used only if ch is ORed with PRINTABLE_META),
-  * else it is printed as-is (except for ch = 0x9b) */
- enum { PRINTABLE_META = 0x100 };
- void fputc_printable(int ch, FILE *file) FAST_FUNC;
  // gcc-4.1.1 still isn't good enough at optimizing it
  // (+200 bytes compared to macro)
  //static ALWAYS_INLINE
-Line 594 
 void fputc_printable(int ch, FILE *file)
+Line 608 
 void fputc_printable(int ch, FILE *file)
  #define NOT_LONE_CHAR(s,c) ((s)[0] != (c) || (s)[1])
  #define DOT_OR_DOTDOT(s) ((s)[0] == '.' && (!(s)[1] || ((s)[1] == '.' && !(s)[2])))
+ typedef struct uni_stat_t {
+ 	unsigned byte_count;
+ 	unsigned unicode_count;
+ 	unsigned unicode_width;
+ } uni_stat_t;
+ /* Returns a string with unprintable chars replaced by '?' or
+  * SUBST_WCHAR. This function is unicode-aware. */
+ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str);
+ /* Prints unprintable char ch as ^C or M-c to file
+  * (M-c is used only if ch is ORed with PRINTABLE_META),
+  * else it is printed as-is (except for ch = 0x9b) */
+ enum { PRINTABLE_META = 0x100 };
+ void fputc_printable(int ch, FILE *file) FAST_FUNC;
  /* dmalloc will redefine these to it's own implementation. It is safe
   * to have the prototypes here unconditionally.  */
  void *malloc_or_warn(size_t size) FAST_FUNC RETURNS_MALLOC;
-Line 626 
 extern char *xmalloc_reads(int fd, char
+Line 654 
 extern char *xmalloc_reads(int fd, char
  extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
  /* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */
  extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
+ /* Autodetects gzip/bzip2 formats. fd may be in the middle of the file! */
+ #if ENABLE_FEATURE_SEAMLESS_LZMA \
+  || ENABLE_FEATURE_SEAMLESS_BZ2 \
+  || ENABLE_FEATURE_SEAMLESS_GZ \
+  /* || ENABLE_FEATURE_SEAMLESS_Z */
+ extern void setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) FAST_FUNC;
+ #else
+ # define setup_unzip_on_fd(...) ((void)0)
+ #endif
  /* Autodetects .gz etc */
  extern int open_zipped(const char *fname) FAST_FUNC;
  extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
-Line 638 
 extern ssize_t safe_write(int fd, const
+Line 675 
 extern ssize_t safe_write(int fd, const
  extern ssize_t full_write(int fd, const void *buf, size_t count) FAST_FUNC;
  extern void xwrite(int fd, const void *buf, size_t count) FAST_FUNC;
  extern void xwrite_str(int fd, const char *str) FAST_FUNC;
+ extern ssize_t full_write1_str(const char *str) FAST_FUNC;
+ extern ssize_t full_write2_str(const char *str) FAST_FUNC;
  extern void xopen_xwrite_close(const char* file, const char *str) FAST_FUNC;
  /* Close fd, but check for failures (some types of write errors) */
-Line 713 
 const char *make_human_readable_str(unsi
+Line 752 
 const char *make_human_readable_str(unsi
  		unsigned long block_size, unsigned long display_unit) FAST_FUNC;
  /* Put a string of hex bytes ("1b2e66fe"...), return advanced pointer */
  char *bin2hex(char *buf, const char *cp, int count) FAST_FUNC;
+ /* Reverse */
+ char* hex2bin(char *dst, const char *str, int count) FAST_FUNC;
  /* Generate a UUID */
  void generate_uuid(uint8_t *buf) FAST_FUNC;
-Line 773 
 void die_if_bad_username(const char* nam
+Line 814 
 void die_if_bad_username(const char* nam
  #define die_if_bad_username(name) ((void)(name))
  #endif
+ #if ENABLE_FEATURE_UTMP
+ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, const char *username, const char *hostname);
+ void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const char *username, const char *hostname);
+ #else
+ # define write_new_utmp(pid, new_type, tty_name, username, hostname) ((void)0)
+ # define update_utmp(pid, new_type, tty_name, username, hostname) ((void)0)
+ #endif
  int execable_file(const char *name) FAST_FUNC;
  char *find_execable(const char *filename, char **PATHp) FAST_FUNC;
  int exists_execable(const char *filename) FAST_FUNC;
-Line 790 
 int bb_execvp(const char *file, char *co
+Line 839 
 int bb_execvp(const char *file, char *co
  #define BB_EXECVP(prog,cmd)     execvp(prog,cmd)
  #define BB_EXECLP(prog,cmd,...) execlp(prog,cmd, __VA_ARGS__)
  #endif
+ int BB_EXECVP_or_die(char **argv) NORETURN FAST_FUNC;
+ /* xvfork() can't be a _function_, return after vfork mangles stack
+  * in the parent. It must be a macro. */
+ #define xvfork() \
+ ({ \
+ 	pid_t bb__xvfork_pid = vfork(); \
+ 	if (bb__xvfork_pid < 0) \
+ 		bb_perror_msg_and_die("vfork"); \
+ 	bb__xvfork_pid; \
+ })
+ #if BB_MMU
+ pid_t xfork(void) FAST_FUNC;
+ #endif
- /* NOMMU friendy fork+exec */
+ /* NOMMU friendy fork+exec: */
  pid_t spawn(char **argv) FAST_FUNC;
  pid_t xspawn(char **argv) FAST_FUNC;
  pid_t safe_waitpid(pid_t pid, int *wstat, int options) FAST_FUNC;
- /* Unlike waitpid, waits ONLY for one process.
+ pid_t wait_any_nohang(int *wstat) FAST_FUNC;
+ /* wait4pid: unlike waitpid, waits ONLY for one process.
+  * Returns sig + 0x180 if child is killed by signal.
   * It's safe to pass negative 'pids' from failed [v]fork -
   * wait4pid will return -1 (and will not clobber [v]fork's errno).
   * IOW: rc = wait4pid(spawn(argv));
   *      if (rc < 0) bb_perror_msg("%s", argv[0]);
-  *      if (rc > 0) bb_error_msg("exit code: %d", rc);
+  *      if (rc > 0) bb_error_msg("exit code: %d", rc & 0xff);
   */
  int wait4pid(pid_t pid) FAST_FUNC;
- pid_t wait_any_nohang(int *wstat) FAST_FUNC;
+ /* Same as wait4pid(spawn(argv)), but with NOFORK/NOEXEC if configured: */
- /* wait4pid(spawn(argv)) + NOFORK/NOEXEC (if configured) */
  int spawn_and_wait(char **argv) FAST_FUNC;
  struct nofork_save_area {
  	jmp_buf die_jmp;
-Line 835 
 int run_nofork_applet_prime(struct nofor
+Line 899 
 int run_nofork_applet_prime(struct nofor
   * Both of the above will redirect fd 0,1,2 to /dev/null and drop ctty
   * (will do setsid()).
   *
-  * fork_or_rexec(argv) = bare-bones "fork" on MMU,
+  * fork_or_rexec(argv) = bare-bones fork on MMU,
   *      "vfork + re-exec ourself" on NOMMU. No fd redirection, no setsid().
   *      On MMU ignores argv.
   *
-Line 851 
 enum {
+Line 915 
 enum {
  	DAEMON_ONLY_SANITIZE = 8, /* internal use */
  };
  #if BB_MMU
-   pid_t fork_or_rexec(void) FAST_FUNC;
    enum { re_execed = 0 };
- # define fork_or_rexec(argv)                fork_or_rexec()
+ # define fork_or_rexec(argv)                xfork()
  # define bb_daemonize_or_rexec(flags, argv) bb_daemonize_or_rexec(flags)
  # define bb_daemonize(flags)                bb_daemonize_or_rexec(flags, bogus)
  #else
+   extern bool re_execed;
    void re_exec(char **argv) NORETURN FAST_FUNC;
    pid_t fork_or_rexec(char **argv) FAST_FUNC;
-   extern bool re_execed;
    int  BUG_fork_is_unavailable_on_nommu(void) FAST_FUNC;
    int  BUG_daemon_is_unavailable_on_nommu(void) FAST_FUNC;
    void BUG_bb_daemonize_is_unavailable_on_nommu(void) FAST_FUNC;
  # define fork()          BUG_fork_is_unavailable_on_nommu()
+ # define xfork()         BUG_fork_is_unavailable_on_nommu()
  # define daemon(a,b)     BUG_daemon_is_unavailable_on_nommu()
  # define bb_daemonize(a) BUG_bb_daemonize_is_unavailable_on_nommu()
  #endif
-Line 1076 
 typedef struct parser_t {
+Line 1140 
 typedef struct parser_t {
  } parser_t;
  parser_t* config_open(const char *filename) FAST_FUNC;
  parser_t* config_open2(const char *filename, FILE* FAST_FUNC (*fopen_func)(const char *path)) FAST_FUNC;
+ /* delims[0] is a comment char (use '\0' to disable), the rest are token delimiters */
  int config_read(parser_t *parser, char **tokens, unsigned flags, const char *delims) FAST_FUNC;
  #define config_read(parser, tokens, max, min, str, flags) \
  	config_read(parser, tokens, ((flags) | (((min) & 0xFF) << 8) | ((max) & 0xFF)), str)
-Line 1106 
 char *bb_simplify_abs_path_inplace(char
+Line 1171 
 char *bb_simplify_abs_path_inplace(char
  extern void bb_do_delay(int seconds) FAST_FUNC;
  extern void change_identity(const struct passwd *pw) FAST_FUNC;
  extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) NORETURN FAST_FUNC;
- extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) FAST_FUNC;
  #if ENABLE_SELINUX
  extern void renew_current_security_context(void) FAST_FUNC;
  extern void set_current_security_context(security_context_t sid) FAST_FUNC;
-Line 1118 
 extern void selinux_preserve_fcontext(in
+Line 1182 
 extern void selinux_preserve_fcontext(in
  #define selinux_preserve_fcontext(fdesc) ((void)0)
  #endif
  extern void selinux_or_die(void) FAST_FUNC;
- extern int restricted_shell(const char *shell) FAST_FUNC;
  /* setup_environment:
+  * if chdir pw->pw_dir: ok: else if to_tmp == 1: goto /tmp else: goto / or die
   * if clear_env = 1: cd(pw->pw_dir), clear environment, then set
   *   TERM=(old value)
   *   USER=pw->pw_name, LOGNAME=pw->pw_name
-Line 1134 
 extern int restricted_shell(const char *
+Line 1198 
 extern int restricted_shell(const char *
   *   SHELL=shell
   * else does nothing
   */
- extern void setup_environment(const char *shell, int clear_env, int change_env, const struct passwd *pw) FAST_FUNC;
+ #define SETUP_ENV_CHANGEENV (1 << 0)
+ #define SETUP_ENV_CLEARENV  (1 << 1)
+ #define SETUP_ENV_TO_TMP    (1 << 2)
+ extern void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC;
  extern int correct_password(const struct passwd *pw) FAST_FUNC;
  /* Returns a malloced string */
  #if !ENABLE_USE_BB_CRYPT
-Line 1251 
 enum {
+Line 1318 
 enum {
   * Return of -1 means EOF or error (errno == 0 on EOF).
   * buffer[0] is used as a counter of buffered chars and must be 0
   * on first call.
+  * timeout:
+  * -2: do not poll for input;
+  * -1: poll(-1) (i.e. block);
+  * >=0: poll for TIMEOUT milliseconds, return -1/EAGAIN on timeout
   */
- int64_t read_key(int fd, char *buffer) FAST_FUNC;
+ int64_t read_key(int fd, char *buffer, int timeout) FAST_FUNC;
+ void read_key_ungets(char *buffer, const char *str, unsigned len) FAST_FUNC;
  #if ENABLE_FEATURE_EDITING
-Line 1466 
 typedef struct bb_progress_t {
+Line 1538 
 typedef struct bb_progress_t {
  	off_t lastsize;
  	unsigned lastupdate_sec;
  	unsigned start_sec;
+ 	smallint inited;
  } bb_progress_t;
  void bb_progress_init(bb_progress_t *p) FAST_FUNC;
-Line 1533 
 extern struct globals *const ptr_to_glob
+Line 1606 
 extern struct globals *const ptr_to_glob
   * use bb_default_login_shell and following defines.
   * If you change LIBBB_DEFAULT_LOGIN_SHELL,
   * don't forget to change increment constant. */
- #define LIBBB_DEFAULT_LOGIN_SHELL      "-/bin/sh"
+ #define LIBBB_DEFAULT_LOGIN_SHELL  "-/bin/sh"
  extern const char bb_default_login_shell[];
  /* "/bin/sh" */
- #define DEFAULT_SHELL     (bb_default_login_shell+1)
+ #define DEFAULT_SHELL              (bb_default_login_shell+1)
  /* "sh" */
- #define DEFAULT_SHELL_SHORT_NAME     (bb_default_login_shell+6)
+ #define DEFAULT_SHELL_SHORT_NAME   (bb_default_login_shell+6)
  #if ENABLE_FEATURE_DEVFS
  # define CURRENT_VC "/dev/vc/0"
-Line 1547 
 extern const char bb_default_login_shell
+Line 1620 
 extern const char bb_default_login_shell
  # define VC_3 "/dev/vc/3"
  # define VC_4 "/dev/vc/4"
  # define VC_5 "/dev/vc/5"
- #if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
+ # if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
  /* Yes, this sucks, but both SH (including sh64) and H8 have a SCI(F) for their
     respective serial ports .. as such, we can't use the common device paths for
     these. -- PFM */
  #  define SC_0 "/dev/ttsc/0"
  #  define SC_1 "/dev/ttsc/1"
  #  define SC_FORMAT "/dev/ttsc/%d"
- #else
+ # else
  #  define SC_0 "/dev/tts/0"
  #  define SC_1 "/dev/tts/1"
  #  define SC_FORMAT "/dev/tts/%d"
- #endif
+ # endif
  # define VC_FORMAT "/dev/vc/%d"
  # define LOOP_FORMAT "/dev/loop/%d"
  # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1)
-Line 1571 
 extern const char bb_default_login_shell
+Line 1644 
 extern const char bb_default_login_shell
  # define VC_3 "/dev/tty3"
  # define VC_4 "/dev/tty4"
  # define VC_5 "/dev/tty5"
- #if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
+ # if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
  #  define SC_0 "/dev/ttySC0"
  #  define SC_1 "/dev/ttySC1"
  #  define SC_FORMAT "/dev/ttySC%d"
- #else
+ # else
  #  define SC_0 "/dev/ttyS0"
  #  define SC_1 "/dev/ttyS1"
  #  define SC_FORMAT "/dev/ttyS%d"
- #endif
+ # endif
  # define VC_FORMAT "/dev/tty%d"
  # define LOOP_FORMAT "/dev/loop%d"
  # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1)

 Legend:



Removed from v.984
 


changed lines


 
Added in v.1123
 Legend:



Removed from v.984
 


changed lines


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