Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / internal.h

diff --git a/internal.h b/internal.h
index a81651becbd0e1ba32cd252945aea6d8cb6548c9..697ce4778e7bfe36e1f724124d680e83501afdb0 100644 (file)
--- a/internal.h
+++ b/internal.h
@@ -33,6 +33,9 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <mntent.h>
+#if ! defined(__GLIBC__)
+#include <asm/string.h>
+#endif
 
 
 /* Some useful definitions */
@@ -90,21 +93,25 @@ enum Location {
        _BB_DIR_USR_SBIN
 };
 
-struct Applet {
+struct BB_applet {
        const   char*   name;
        int     (*main)(int argc, char** argv);
        enum    Location        location;
 };
+/* From busybox.c */
+extern const struct BB_applet applets[];
 
+extern int ar_main(int argc, char **argv);
 extern int basename_main(int argc, char **argv);
 extern int busybox_main(int argc, char** argv);
 extern int block_device_main(int argc, char** argv);
 extern int cat_main(int argc, char** argv);
-extern int cp_mv_main(int argc, char** argv);
 extern int chmod_chown_chgrp_main(int argc, char** argv);
 extern int chroot_main(int argc, char** argv);
 extern int chvt_main(int argc, char** argv);
 extern int clear_main(int argc, char** argv);
+extern int cp_mv_main(int argc, char** argv);
+extern int cut_main(int argc, char** argv);
 extern int date_main(int argc, char** argv);
 extern int dd_main(int argc, char** argv);
 extern int dirname_main(int argc, char** argv);
@@ -129,6 +136,7 @@ extern int halt_main(int argc, char** argv);
 extern int head_main(int argc, char** argv);
 extern int hostid_main(int argc, char** argv);
 extern int hostname_main(int argc, char** argv);
+extern int id_main(int argc, char** argv);
 extern int init_main(int argc, char** argv);
 extern int insmod_main(int argc, char** argv);
 extern int kill_main(int argc, char** argv);
@@ -144,13 +152,14 @@ extern int ls_main(int argc, char** argv);
 extern int lsmod_main(int argc, char** argv);
 extern int makedevs_main(int argc, char** argv);
 extern int math_main(int argc, char** argv);
+extern int md5sum_main(int argc, char** argv);
 extern int mkdir_main(int argc, char** argv);
 extern int mkfifo_main(int argc, char **argv);
 extern int mkfs_minix_main(int argc, char **argv);
 extern int mknod_main(int argc, char** argv);
 extern int mkswap_main(int argc, char** argv);
 extern int mktemp_main(int argc, char **argv);
-extern int mnc_main(int argc, char** argv);
+extern int nc_main(int argc, char** argv);
 extern int more_main(int argc, char** argv);
 extern int mount_main(int argc, char** argv);
 extern int mt_main(int argc, char** argv);
@@ -184,6 +193,8 @@ extern int true_main(int argc, char** argv);
 extern int tput_main(int argc, char** argv);
 extern int tryopen_main(int argc, char** argv);
 extern int tty_main(int argc, char** argv);
+extern int uuencode_main(int argc, char** argv);
+extern int uudecode_main(int argc, char** argv);
 extern int umount_main(int argc, char** argv);
 extern int uname_main(int argc, char** argv);
 extern int uptime_main(int argc, char** argv);
@@ -191,6 +202,7 @@ extern int uniq_main(int argc, char** argv);
 extern int update_main(int argc, char** argv);
 extern int usleep_main(int argc, char** argv);
 extern int wc_main(int argc, char** argv);
+extern int which_main(int argc, char** argv);
 extern int whoami_main(int argc, char** argv);
 extern int yes_main(int argc, char** argv);
 
@@ -214,8 +226,8 @@ int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
 void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
 void reset_ino_dev_hashtable(void);
 
-int copyFile(const char *srcName, const char *destName, int setModes,
-               int followLinks);
+int copyFile(const char *srcName, const char *destName,
+                int setModes, int followLinks, int forceFlag);
 char *buildName(const char *dirName, const char *fileName);
 int makeString(int argc, const char **argv, char *buf, int bufLen);
 char *getChunk(int size);
@@ -233,10 +245,7 @@ extern int createPath (const char *name, int mode);
 extern int parse_mode( const char* s, mode_t* theMode);
 
 extern int get_kernel_revision(void);
-extern uid_t my_getpwnam(char *name);
-extern gid_t my_getgrnam(char *name); 
-extern void my_getpwuid(char* name, uid_t uid);
-extern void my_getgrgid(char* group, gid_t gid);
+
 extern int get_console_fd(char* tty_name);
 extern struct mntent *findMountPoint(const char *name, const char *table);
 extern void write_mtab(char* blockDevice, char* directory, 
@@ -253,6 +262,15 @@ extern void *xmalloc (size_t size);
 extern int find_real_root_device_name(char* name);
 extern char *cstring_lineFromFile(FILE *f);
 
+/* These parse entries in /etc/passwd and /etc/group.  This is desirable
+ * for BusyBox since we want to avoid using the glibc NSS stuff, which
+ * increases target size and is often not needed embedded systems.  */
+extern unsigned long my_getpwnam(char *name);
+extern unsigned long my_getgrnam(char *name);
+extern void my_getpwuid(char *name, unsigned long uid);
+extern void my_getgrgid(char *group, unsigned long gid);
+extern unsigned long my_getpwnamegid(char *name);
+
 
 #if defined BB_INIT || defined BB_SYSLOGD
 extern int device_open(char *device, int mode);
@@ -273,20 +291,8 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags,
        char **extra_opts, char **mount_opts, int running_bg);
 #endif
 
-#if defined (BB_FSCK_MINIX) || defined (BB_MKFS_MINIX)
-/* Bit map related macros.  */
-#ifndef setbit
-#define CHAR_BITS      8 /* Number of bits in a `char'.  */
-#define setbit(a,i)     ((a)[(i)/CHAR_BITS] |= 1<<((i)%CHAR_BITS))
-#define clrbit(a,i)     ((a)[(i)/CHAR_BITS] &= ~(1<<((i)%CHAR_BITS)))
-#define isset(a,i)      ((a)[(i)/CHAR_BITS] & (1<<((i)%CHAR_BITS)))
-#define isclr(a,i)      (((a)[(i)/CHAR_BITS] & (1<<((i)%CHAR_BITS))) == 0)
-#endif
-#endif
-
-
 #ifndef RB_POWER_OFF
-/* Stop system and switch power off if possable.  */
+/* Stop system and switch power off if possible.  */
 #define RB_POWER_OFF   0x4321fedc
 #endif