freeldr/tools
diff -u -r1.2 -r1.3
--- deptool.c 9 Dec 2004 04:41:13 -0000 1.2
+++ deptool.c 9 Dec 2004 04:47:20 -0000 1.3
@@ -1,153 +1,129 @@
-/**
- *
- * deptool.c
- * Copyright (C) 2002 by Brian Palmer <brianp@sginet.com>
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define ERROR_SUCCESS 0
-#define ERROR_NOTENOUGHPARAMS 1
-#define ERROR_DEPENDFILENOTFOUND 2
-#define ERROR_OUTOFMEMORY 3
-#define ERROR_READERROR 4
-#define ERROR_WRITEERROR 5
-
-int main(int argc, char *argv[])
-{
- FILE* DependFile;
- int DependFileSize;
- char* DependFileData;
- char* NewDependFileData;
- int CurIdx;
- int CurIdx2;
- int RuleDependencySplit = 0;
-
- /**
- * Make sure they passed enough command line parameters
- */
- if (argc < 2)
- {
- printf("Usage: deptool srcfile.d\n");
- return ERROR_NOTENOUGHPARAMS;
- }
-
- /**
- * Try to open the dependency file
- */
- DependFile = fopen(argv[1], "r+t");
- if (DependFile == NULL)
- {
- printf("deptool: No such dependency file: %s\n", argv[1]);
- return ERROR_DEPENDFILENOTFOUND;
- }
-
- /**
- * Get the file size
- */
- fseek(DependFile, 0, SEEK_END);
- DependFileSize = ftell(DependFile);
- rewind(DependFile);
-
- /**
- * Allocate memory
- */
- DependFileData = (char *)malloc(DependFileSize);
- NewDependFileData = (char *)malloc(DependFileSize * 3);
- if (!DependFileData || !NewDependFileData)
- {
- printf("deptool: Out of memory!\n");
- fclose(DependFile);
- return ERROR_OUTOFMEMORY;
- }
- memset(DependFileData, 0, DependFileSize);
- memset(NewDependFileData, 0, DependFileSize * 3);
-
- /**
- * Read in file data
- */
- fread(DependFileData, 1, DependFileSize, DependFile);
- if (ferror(DependFile))
- {
- printf("deptool: Dependency file read error.\n");
- fclose(DependFile);
- return ERROR_READERROR;
- }
-
- /**
- * Loop through the dependency file data and
- * insert the rule for the dependency file itself
- */
- for (CurIdx=0,CurIdx2=0; DependFileData[CurIdx]; CurIdx++,CurIdx2++)
- {
- /**
- * Find the first colon ':' in the file and insert
- * the rule right before it
- */
- if (DependFileData[CurIdx] == ':')
- {
- NewDependFileData[CurIdx2] = ' ';
- CurIdx2++;
- strcat(&NewDependFileData[CurIdx2], argv[1]);
- CurIdx2 += strlen(argv[1]);
- NewDependFileData[CurIdx2] = ' ';
- CurIdx2++;
- strcat(NewDependFileData, &DependFileData[CurIdx]);
- CurIdx2 += 2;
- RuleDependencySplit = CurIdx + 2;
- break;
- }
- else
- {
- NewDependFileData[CurIdx2] = DependFileData[CurIdx];
- }
- }
-
- /**
- * Now loop through all the rule dependencies and
- * turn them into rules themselves
- */
- strcat(NewDependFileData, "\n\n");
- CurIdx = RuleDependencySplit;
- CurIdx2 = strlen(NewDependFileData);
- for (; DependFileData[CurIdx]; CurIdx++,CurIdx2++)
- {
- /**
- * If it's a line continuation char '\' then skip over it
- */
- if (DependFileData[CurIdx] == '\\')
- {
- CurIdx2--;
- continue;
- }
-
- /**
- * If it's a new line char '\n' then insert a colon ':' to make it a rule
- */
- if (DependFileData[CurIdx] == '\n')
- {
- NewDependFileData[CurIdx2] = ':';
- CurIdx2++;
- }
-
- NewDependFileData[CurIdx2] = DependFileData[CurIdx];
- }
-
- /**
- * Write out file data
- */
- rewind(DependFile);
- fwrite(NewDependFileData, 1, strlen(NewDependFileData), DependFile);
- if (ferror(DependFile))
- {
- printf("deptool: Dependency file write error.\n");
- fclose(DependFile);
- return ERROR_WRITEERROR;
- }
-
- fclose(DependFile);
- return ERROR_SUCCESS;
-}
+//
+// deptool.c
+// Copyright (C) 2002 by Brian Palmer <brianp@sginet.com>
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ERROR_SUCCESS 0
+#define ERROR_NOTENOUGHPARAMS 1
+#define ERROR_DEPENDFILENOTFOUND 2
+#define ERROR_OUTOFMEMORY 3
+#define ERROR_READERROR 4
+#define ERROR_WRITEERROR 5
+
+int main(int argc, char *argv[])
+{
+ FILE* DependFile;
+ int DependFileSize;
+ char* DependFileData;
+ char* NewDependFileData;
+ int CurIdx;
+ int CurIdx2;
+ int RuleDependencySplit = 0;
+
+ // Make sure they passed enough command line parameters
+ if (argc < 2)
+ {
+ printf("Usage: deptool srcfile.d\n");
+ return ERROR_NOTENOUGHPARAMS;
+ }
+
+ // Try to open the dependency file
+ DependFile = fopen(argv[1], "r+t");
+ if (DependFile == NULL)
+ {
+ printf("deptool: No such dependency file: %s\n", argv[1]);
+ return ERROR_DEPENDFILENOTFOUND;
+ }
+
+ // Get the file size
+ fseek(DependFile, 0, SEEK_END);
+ DependFileSize = ftell(DependFile);
+ rewind(DependFile);
+
+ // Allocate memory
+ DependFileData = (char *)malloc(DependFileSize);
+ NewDependFileData = (char *)malloc(DependFileSize * 3);
+ if (!DependFileData || !NewDependFileData)
+ {
+ printf("deptool: Out of memory!\n");
+ fclose(DependFile);
+ return ERROR_OUTOFMEMORY;
+ }
+ memset(DependFileData, 0, DependFileSize);
+ memset(NewDependFileData, 0, DependFileSize * 3);
+
+ // Read in file data
+ fread(DependFileData, 1, DependFileSize, DependFile);
+ if (ferror(DependFile))
+ {
+ printf("deptool: Dependency file read error.\n");
+ fclose(DependFile);
+ return ERROR_READERROR;
+ }
+
+ // Loop through the dependency file data and
+ // insert the rule for the dependency file itself
+ for (CurIdx=0,CurIdx2=0; DependFileData[CurIdx]; CurIdx++,CurIdx2++)
+ {
+ // Find the first colon ':' in the file and insert
+ // the rule right before it
+ if (DependFileData[CurIdx] == ':')
+ {
+ NewDependFileData[CurIdx2] = ' ';
+ CurIdx2++;
+ strcat(&NewDependFileData[CurIdx2], argv[1]);
+ CurIdx2 += strlen(argv[1]);
+ NewDependFileData[CurIdx2] = ' ';
+ CurIdx2++;
+ strcat(NewDependFileData, &DependFileData[CurIdx]);
+ CurIdx2 += 2;
+ RuleDependencySplit = CurIdx + 2;
+ break;
+ }
+ else
+ {
+ NewDependFileData[CurIdx2] = DependFileData[CurIdx];
+ }
+ }
+
+ // Now loop through all the rule dependencies and
+ // turn them into rules themselves
+ strcat(NewDependFileData, "\n\n");
+ CurIdx = RuleDependencySplit;
+ CurIdx2 = strlen(NewDependFileData);
+ for (; DependFileData[CurIdx]; CurIdx++,CurIdx2++)
+ {
+ // If it's a line continuation char '\' then skip over it
+ if (DependFileData[CurIdx] == '\\')
+ {
+ CurIdx2--;
+ continue;
+ }
+
+ // If it's a new line char '\n' then insert a colon ':' to make it a rule
+ if (DependFileData[CurIdx] == '\n')
+ {
+ NewDependFileData[CurIdx2] = ':';
+ CurIdx2++;
+ }
+
+ NewDependFileData[CurIdx2] = DependFileData[CurIdx];
+ }
+
+ // Write out file data
+ rewind(DependFile);
+ fwrite(NewDependFileData, 1, strlen(NewDependFileData), DependFile);
+ if (ferror(DependFile))
+ {
+ printf("deptool: Dependency file write error.\n");
+ fclose(DependFile);
+ return ERROR_WRITEERROR;
+ }
+
+ fclose(DependFile);
+ return ERROR_SUCCESS;
+}
freeldr/tools
diff -u -r1.2 -r1.3
--- hosttype.c 9 Dec 2004 04:41:13 -0000 1.2
+++ hosttype.c 9 Dec 2004 04:47:20 -0000 1.3
@@ -1,21 +1,21 @@
/**
- *
- * hosttype.c
- * Copyright (C) 2002 by Brian Palmer <brianp@sginet.com>
- *
+ *
+ * hosttype.c
+ * Copyright (C) 2002 by Brian Palmer <brianp@sginet.com>
+ *
*/
-
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-#if defined (__DJGPP__)
- printf("dos\n");
-#elif defined (__WIN32__)
- printf("win32\n");
-#else
- printf("linux\n");
-#endif // defined __DJGPP__
-
- return 0;
-}
+
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+#if defined (__DJGPP__)
+ printf("dos\n");
+#elif defined (__WIN32__)
+ printf("win32\n");
+#else
+ printf("linux\n");
+#endif // defined __DJGPP__
+
+ return 0;
+}