diff --git a/src/bin/Makefile b/src/bin/Makefile index 8313bf2..c9dfa4b 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -1,8 +1,8 @@ # $Id$ # The System Makefile (C) 2002 The UbixOS Project -all: init-bin login-bin shell-bin ls-bin clock-bin cp-bin fdisk-bin format-bin disklabel-bin ubistry-bin edit-bin ld-bin ttyd-bin stat-bin mount-bin -# test-bin pwd-bin cat-bin de-bin goofball-bin +all: init-bin login-bin shell-bin clock-bin cp-bin fdisk-bin format-bin disklabel-bin ubistry-bin edit-bin ld-bin ttyd-bin stat-bin +# test-bin pwd-bin cat-bin de-bin ls-bin goofball-bin mount-bin init-bin: init (cd init;make) diff --git a/src/bin/Makefile.inc b/src/bin/Makefile.inc index 8f7dae0..2101f00 100644 --- a/src/bin/Makefile.inc +++ b/src/bin/Makefile.inc @@ -4,6 +4,8 @@ INCLUDES = -I../../include -LIBRARIES = ../../lib/libc_old/math/*.o ../../lib/libc_old/quad/*.o ../../lib/libc_old/stdio/*.o ../../lib/libc_old/stdlib/*.o ../../lib/libc_old/sys/*.o ../../lib/libc_old/string/*.o ../../lib/libc_old/locale/*.o ../../lib/libc_old/gen/*.o ../../lib/libc_old/generic/*.o +#LIBRARIES = ../../lib/libc_old/math/*.o ../../lib/libc_old/quad/*.o ../../lib/libc_old/stdio/*.o ../../lib/libc_old/stdlib/*.o ../../lib/libc_old/sys/*.o ../../lib/libc_old/string/*.o ../../lib/libc_old/locale/*.o ../../lib/libc_old/gen/*.o ../../lib/libc_old/generic/*.o ../../lib/libc_old/*/*.o + +LIBRARIES = ../../lib/libc_old/*/*.o STARTUP = ../../lib/ubix/*.o diff --git a/src/bin/disklabel/ubixfs.h b/src/bin/disklabel/ubixfs.h index 0046bc7..1db61f3 100644 --- a/src/bin/disklabel/ubixfs.h +++ b/src/bin/disklabel/ubixfs.h @@ -59,26 +59,29 @@ struct directoryEntry { - uLong startCluster; //Starting Cluster Of File - uLong size; //Size Of File - uLong creationDate; //Date Created - uLong lastModified; //Date Last Modified - uLong uid; //UID Of Owner - uLong gid; //GID Of Owner - uShort attributes; //Files Attributes - uShort permissions; //Files Permissions + uInt32 startCluster; //Starting Cluster Of File + uInt32 size; //Size Of File + uInt32 creationDate; //Date Created + uInt32 lastModified; //Date Last Modified + uInt32 uid; //UID Of Owner + uInt32 gid; //GID Of Owner + uInt16 attributes; //Files Attributes + uInt16 permissions; //Files Permissions char fileName[256]; //File Name }; /*** $Log$ + Revision 1.1.1.1 2006/06/01 12:46:09 reddawg + ubix2 + Revision 1.2 2005/10/12 00:13:28 reddawg Removed - Revision 1.1.1.1 2005/09/26 17:13:58 reddawg + Revision 1.1.1.1 2005/09/26 17:13:59 reddawg no message - Revision 1.2 2004/05/24 13:42:29 reddawg + Revision 1.2 2004/05/24 13:54:52 reddawg Clean Up diff --git a/src/bin/edit/Makefile b/src/bin/edit/Makefile index 10f0e81..bdc3aa6 100644 --- a/src/bin/edit/Makefile +++ b/src/bin/edit/Makefile @@ -17,7 +17,9 @@ #Objects OBJS = main.o -LIBRARIES = ../../lib/libc_old/libc_old.so +INCLUDES = -I../../include.new + +LIBRARIES = ../../lib/libc/libc.so # Link The Binary $(BINARY) : $(OBJS) diff --git a/src/bin/fdisk/ubixfs.h b/src/bin/fdisk/ubixfs.h index d10ed4d..1db61f3 100644 --- a/src/bin/fdisk/ubixfs.h +++ b/src/bin/fdisk/ubixfs.h @@ -59,19 +59,22 @@ struct directoryEntry { - uLong startCluster; //Starting Cluster Of File - uLong size; //Size Of File - uLong creationDate; //Date Created - uLong lastModified; //Date Last Modified - uLong uid; //UID Of Owner - uLong gid; //GID Of Owner - uShort attributes; //Files Attributes - uShort permissions; //Files Permissions + uInt32 startCluster; //Starting Cluster Of File + uInt32 size; //Size Of File + uInt32 creationDate; //Date Created + uInt32 lastModified; //Date Last Modified + uInt32 uid; //UID Of Owner + uInt32 gid; //GID Of Owner + uInt16 attributes; //Files Attributes + uInt16 permissions; //Files Permissions char fileName[256]; //File Name }; /*** $Log$ + Revision 1.1.1.1 2006/06/01 12:46:09 reddawg + ubix2 + Revision 1.2 2005/10/12 00:13:28 reddawg Removed diff --git a/src/bin/ld/ld.h b/src/bin/ld/ld.h index deedd86..0255e4d 100644 --- a/src/bin/ld/ld.h +++ b/src/bin/ld/ld.h @@ -26,28 +26,6 @@ ldLibrary *ldAddLibrary(const char *); /*** - $Log$ - Revision 1.1.1.1 2006/06/01 12:46:09 reddawg - ubix2 - - Revision 1.2 2005/10/12 00:13:28 reddawg - Removed - - Revision 1.1.1.1 2005/09/26 17:14:01 reddawg - no message - - Revision 1.4 2004/06/17 14:10:34 reddawg - Fixed some potential problems - - Revision 1.3 2004/06/17 02:58:49 reddawg - Cleaned Out Dead Code - - Revision 1.2 2004/06/17 01:52:54 reddawg - Maybe? - - Revision 1.1 2004/06/16 23:11:34 reddawg - ld.so: now adds librarys it is a little more efficient does the lazy binding - END ***/ diff --git a/src/bin/ls/main.c b/src/bin/ls/main.c index 861eca8..cbde456 100644 --- a/src/bin/ls/main.c +++ b/src/bin/ls/main.c @@ -34,14 +34,14 @@ //UbixFS Directory Entry struct directoryEntry { - uInt32 startCluster; //Starting Cluster Of File - uInt32 size; //Size Of File - uInt32 creationDate; //Date Created - uInt32 lastModified; //Date Last Modified - uInt32 uid; //UID Of Owner - uInt32 gid; //GID Of Owner - uInt16 attributes; //Files Attributes - uInt16 permissions; //Files Permissions + u_int32_t startCluster; //Starting Cluster Of File + u_int32_t size; //Size Of File + u_int32_t creationDate; //Date Created + u_int32_t lastModified; //Date Last Modified + u_int32_t uid; //UID Of Owner + u_int32_t gid; //GID Of Owner + u_int16_t attributes; //Files Attributes + u_int16_t permissions; //Files Permissions char fileName[256]; //File Name };