Added support for ignoring '-g' per GNU ls, thanks to David Vrabel

[oweals/busybox.git] / internal.h

diff --git a/internal.h b/internal.h
index 9997f4dc46b0585437c7515c7d9c9966f34417ad..41a72e18a79dd70f56bef98463aa79f7cdb5ec2f 100644 (file)
--- a/internal.h
+++ b/internal.h
@@ -30,6 +30,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <mntent.h>
@@ -110,6 +111,7 @@ 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 dc_main(int argc, char** argv);
 extern int dd_main(int argc, char** argv);
 extern int dirname_main(int argc, char** argv);
 extern int deallocvt_main(int argc, char** argv);
@@ -148,7 +150,6 @@ extern int logname_main(int argc, char **argv);
 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);
@@ -257,7 +258,7 @@ extern long getNum (const char *cp);
 extern pid_t* findPidByName( char* pidName);
 extern void *xmalloc (size_t size);
 extern int find_real_root_device_name(char* name);
-extern char *cstring_lineFromFile(FILE *f);
+extern char *get_line_from_file(FILE *file);
 
 /* 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
@@ -293,5 +294,32 @@ int nfsmount(const char *spec, const char *node, unsigned long *flags,
 #define RB_POWER_OFF   0x4321fedc
 #endif
 
+/* Include our own copy of struct sysinfo to avoid binary compatability
+ * problems with Linux 2.4, which changed things.  Grumble, grumble. */
+struct sysinfo {
+       long uptime;                    /* Seconds since boot */
+       unsigned long loads[3];         /* 1, 5, and 15 minute load averages */
+       unsigned long totalram;         /* Total usable main memory size */
+       unsigned long freeram;          /* Available memory size */
+       unsigned long sharedram;        /* Amount of shared memory */
+       unsigned long bufferram;        /* Memory used by buffers */
+       unsigned long totalswap;        /* Total swap space size */
+       unsigned long freeswap;         /* swap space still available */
+       unsigned short procs;           /* Number of current processes */
+       unsigned long totalhigh;        /* Total high memory size */
+       unsigned long freehigh;         /* Available high memory size */
+       unsigned int mem_unit;          /* Memory unit size in bytes */
+       char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */
+};
+extern int sysinfo (struct sysinfo* info);
+
+/* Bit map related macros -- libc5 doens't provide these... sigh.  */
+#ifndef setbit
+#define NBBY            CHAR_BIT
+#define setbit(a,i)     ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
+#define clrbit(a,i)     ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
+#define isset(a,i)      ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
+#define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
+#endif
 
 #endif /* _BB_INTERNAL_H_ */