[ros-diffs] [cfinck] 30285: - Create the %AppData%\RosBE directory if it does not exist - Change all 'FILE *FILE' variables to 'FILE *fp' to avoid variable name/type name confusions

Author: cfinck
Date: Fri Nov  9 01:34:49 2007
New Revision: 30285

URL: http://svn.reactos.org/svn/reactos?rev=30285&view=rev
Log:
- Create the %AppData%\RosBE directory if it does not exist
- Change all 'FILE *FILE' variables to 'FILE *fp' to avoid variable
name/type name confusions

Modified:
    trunk/tools/RosBE/RosBE-Windows/Tools/scut.c

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Fri Nov  9 01:34:49 2007
@@ -22,6 +22,7 @@
 
 #define LINE_MAX 1024
 char* programname;
+char rosbeappdata[260];
 char shortcutfile[260];
 
 PSHORTCUT addshortcut(PSHORTCUT ptr, char* name, char* path);
@@ -43,8 +44,10 @@
     int removed = 0;
     programname = argv[0];
 
-    strcpy(shortcutfile, getenv("APPDATA"));
-    strcat(shortcutfile, "\\RosBE\\srclist.txt");
+    strcpy(rosbeappdata, getenv("APPDATA"));
+    strcat(rosbeappdata, "\\RosBE");
+    strcpy(shortcutfile, rosbeappdata);
+    strcat(shortcutfile, "\\srclist.txt");
     checkfile();
 
     if (argc > 4)
@@ -328,20 +331,29 @@
 
 void checkfile(void)
 {
-    FILE *FILE;
-
-    FILE = fopen(shortcutfile, "r");
-    if (!FILE)
-    {
-        FILE = fopen(shortcutfile, "w");
-        if (!FILE)
+    FILE *fp;
+
+    fp = fopen(shortcutfile, "r");
+    if (!fp)
+    {   
+        if(access(rosbeappdata, F_OK) == -1)
+        {
+            // Directory does not exist, create it
+            if(mkdir(rosbeappdata) == -1)
+            {
+                fprintf(stderr, "%s: Error creating the directory for the RosBE
files.\n", programname);
+            }
+        }
+        
+        fp = fopen(shortcutfile, "w");
+        if (!fp)
         {
             fprintf(stderr, "%s: Error creating file.\n", programname);
         }
         else
         {
-            fprintf(FILE, "Default,Default\n");
-            if (fclose(FILE))
+            fprintf(fp, "Default,Default\n");
+            if (fclose(fp))
             {
                 fprintf(stderr, "%s: Error closing file.\n", programname);
             }
@@ -349,7 +361,7 @@
     }
     else
     {
-        if (fclose(FILE))
+        if (fclose(fp))
         {
             fprintf(stderr, "%s: Error closing file.\n", programname);
         }
@@ -510,22 +522,22 @@
 
 PSHORTCUT readshortcuts(void)
 {
-    FILE *FILE;
+    FILE *fp;
     PSHORTCUT head = NULL;
     char strbuff[LINE_MAX];
     char *name = NULL, *path = NULL;
 
-    FILE = fopen(shortcutfile, "r");
-    if (!FILE)
+    fp = fopen(shortcutfile, "r");
+    if (!fp)
     {
         fprintf(stderr, "%s: Error file doesn't seem to exist.\n",
programname);
         return NULL;
     }
     else
     {
-        while(!feof(FILE))
-        {
-            fgets(strbuff, LINE_MAX, FILE);
+        while(!feof(fp))
+        {
+            fgets(strbuff, LINE_MAX, fp);
             name = strtok(strbuff, ",");
             path = strtok(NULL, "\n");
             if (name && path)
@@ -533,7 +545,7 @@
                 head = addshortcut(head, name, path);
             }
         }
-        if (fclose(FILE))
+        if (fclose(fp))
         {
             fprintf(stderr, "%s: Error closing file.\n", programname);
             freeshortcuts(head);
@@ -546,10 +558,10 @@
 
 int writeshortcuts(PSHORTCUT head)
 {
-    FILE *FILE;
-
-    FILE = fopen(shortcutfile, "w");
-    if (!FILE)
+    FILE *fp;
+
+    fp = fopen(shortcutfile, "w");
+    if (!fp)
     {
         fprintf(stderr, "%s: Error file doesn't seem to exist.\n",
programname);
         return -1;
@@ -558,10 +570,10 @@
     {
         while(head)
         {
-            fprintf(FILE, "%s,%s\n", head->name, head->path);
+            fprintf(fp, "%s,%s\n", head->name, head->path);
             head = head->next;
         }
-        if (fclose(FILE))
+        if (fclose(fp))
         {
             fprintf(stderr, "%s: Error closing file.\n", programname);
             return -1;