make define __UNIX__ inherent

2 files changed, 206 insertions, 204 deletions

diff --git a/noncore/todayplugins/stockticker/libstocks/csv.c b/noncore/todayplugins/stockticker/libstocks/csv.c
index 99a44e4..27bcce6 100644
--- a/noncore/todayplugins/stockticker/libstocks/csv.c
+++ b/noncore/todayplugins/stockticker/libstocks/csv.c
@@ -11,3 +11,3 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-         * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
@@ -21,2 +21,3 @@
 #define __CSV_C__
+#ifdef __UNIX__
 
@@ -128,148 +129,148 @@ stock *parse_csv_file(char *csv)
       while ( (test = strstr(test, "N/A")) )
-        {
-          valid ++;
-          test = test +3;
-        }
+  {
+    valid ++;
+    test = test +3;
+  }
       
       if (valid < 6)
-        {
-          /* This Symbol is valid */
-
-          StockPtr = malloc_stock();
-          
-          ptr = csv_strtok(line, ",");
-          if (!ptr) return 0;
-
-          symbol = (char *)malloc(strlen(ptr)+1);
-          if (symbol==NULL)
-            {
-              fprintf(stderr,"Memory allocating error (%s line %d)\n"
-                      ,__FILE__, __LINE__);
-              exit(1);
-            }
-          strcpy((char *)(symbol), ptr);
-          StockPtr->Symbol = symbol;
-
-          ptr = csv_strtok(NULL, ",");
-          if (!ptr) return 0;
-
-          name = (char *)malloc(strlen(ptr)+1);
-          if (name==NULL)
-            {
-              fprintf(stderr,"Memory allocating error (%s line %d)\n"
-                      ,__FILE__, __LINE__);
-              exit(1);
-            }
-          strcpy((char *)(name), ptr);
-          StockPtr->Name = name;
-
-          ptr = csv_strtok(NULL, ",");
-          if (!ptr) return 0;
-          sscanf(ptr,"%f",&(StockPtr->CurrentPrice));
-
-          ptr = csv_strtok(NULL, ",");
-          if (!ptr) return 0;
-
-          date = (char *)malloc(strlen(ptr)+1);
-          if (date==NULL)
-            {
-              fprintf(stderr,"Memory allocating error (%s line %d)\n"
-                      ,__FILE__, __LINE__);
-              exit(1);
-            }
-          strcpy((char *)(date), ptr);
-          StockPtr->Date = date;
-
-          ptr = csv_strtok(NULL, ",");
-          if (!ptr) return 0;
-
-          time = (char *)malloc(strlen(ptr)+1);
-          if (time==NULL)
-            {
-              fprintf(stderr,"Memory allocating error (%s line %d)\n"
-                      ,__FILE__, __LINE__);
-              exit(1);
-            }
-          strcpy((char *)(time), ptr);
-          StockPtr->Time = time;
-          
-          ptr = csv_strtok(NULL, ",");
-          if (!ptr) return 0;
-          sscanf(ptr,"%f",&(StockPtr->Variation));      
-          
-          StockPtr->Pourcentage = 100 * StockPtr->Variation /
-            (StockPtr->CurrentPrice - StockPtr->Variation);
-
-          StockPtr->LastPrice = StockPtr->CurrentPrice - StockPtr->Variation;
-
-          ptr = csv_strtok(NULL, ",");
-          if (!ptr) return 0;
-          sscanf(ptr,"%f",&(StockPtr->OpenPrice));      
-
-          ptr = csv_strtok(NULL, ",");
-          if (!ptr) return 0;
-          sscanf(ptr,"%f",&(StockPtr->MaxPrice));      
-
-          ptr = csv_strtok(NULL, ",");
-          if (!ptr) return 0;
-          sscanf(ptr,"%f",&(StockPtr->MinPrice));      
+  {
+    /* This Symbol is valid */
+
+    StockPtr = malloc_stock();
+    
+    ptr = csv_strtok(line, ",");
+    if (!ptr) return 0;
+
+    symbol = (char *)malloc(strlen(ptr)+1);
+    if (symbol==NULL)
+      {
+        fprintf(stderr,"Memory allocating error (%s line %d)\n"
+          ,__FILE__, __LINE__);
+        exit(1);
+      }
+    strcpy((char *)(symbol), ptr);
+    StockPtr->Symbol = symbol;
+
+    ptr = csv_strtok(NULL, ",");
+    if (!ptr) return 0;
+
+    name = (char *)malloc(strlen(ptr)+1);
+    if (name==NULL)
+      {
+        fprintf(stderr,"Memory allocating error (%s line %d)\n"
+          ,__FILE__, __LINE__);
+        exit(1);
+      }
+    strcpy((char *)(name), ptr);
+    StockPtr->Name = name;
+
+    ptr = csv_strtok(NULL, ",");
+    if (!ptr) return 0;
+    sscanf(ptr,"%f",&(StockPtr->CurrentPrice));
+
+    ptr = csv_strtok(NULL, ",");
+    if (!ptr) return 0;
+
+    date = (char *)malloc(strlen(ptr)+1);
+    if (date==NULL)
+      {
+        fprintf(stderr,"Memory allocating error (%s line %d)\n"
+          ,__FILE__, __LINE__);
+        exit(1);
+      }
+    strcpy((char *)(date), ptr);
+    StockPtr->Date = date;
+
+    ptr = csv_strtok(NULL, ",");
+    if (!ptr) return 0;
+
+    time = (char *)malloc(strlen(ptr)+1);
+    if (time==NULL)
+      {
+        fprintf(stderr,"Memory allocating error (%s line %d)\n"
+          ,__FILE__, __LINE__);
+        exit(1);
+      }
+    strcpy((char *)(time), ptr);
+    StockPtr->Time = time;
+    
+    ptr = csv_strtok(NULL, ",");
+    if (!ptr) return 0;
+    sscanf(ptr,"%f",&(StockPtr->Variation));      
+    
+    StockPtr->Pourcentage = 100 * StockPtr->Variation /
+      (StockPtr->CurrentPrice - StockPtr->Variation);
+
+    StockPtr->LastPrice = StockPtr->CurrentPrice - StockPtr->Variation;
+
+    ptr = csv_strtok(NULL, ",");
+    if (!ptr) return 0;
+    sscanf(ptr,"%f",&(StockPtr->OpenPrice));      
+
+    ptr = csv_strtok(NULL, ",");
+    if (!ptr) return 0;
+    sscanf(ptr,"%f",&(StockPtr->MaxPrice));      
+
+    ptr = csv_strtok(NULL, ",");
+    if (!ptr) return 0;
+    sscanf(ptr,"%f",&(StockPtr->MinPrice));      
   
-          ptr = csv_strtok(NULL, ",");
-          if (!ptr) return 0;
-          StockPtr->Volume = atoi(ptr);
-
-          if( !FirstStockPtr ) 
-            {
-              FirstStockPtr = StockPtr;
-              StockPtr->PreviousStock = 0;
-            }
-          
-          StockPtr->NextStock = 0;
-        
-          if (LastStockPtr) 
-            {
-              LastStockPtr->NextStock = StockPtr;
-              StockPtr->PreviousStock = LastStockPtr;
-            }
-          
-          LastStockPtr = StockPtr;
-          
-        }
+    ptr = csv_strtok(NULL, ",");
+    if (!ptr) return 0;
+    StockPtr->Volume = atoi(ptr);
+
+    if( !FirstStockPtr ) 
+      {
+        FirstStockPtr = StockPtr;
+        StockPtr->PreviousStock = 0;
+      }
+    
+    StockPtr->NextStock = 0;
+  
+    if (LastStockPtr) 
+      {
+        LastStockPtr->NextStock = StockPtr;
+        StockPtr->PreviousStock = LastStockPtr;
+      }
+    
+    LastStockPtr = StockPtr;
+    
+  }
       else
-        {
-          /* this symbol is not valid */
-          /* Set the stock struct just with Symbol, all other are NULL */
-          /* This can be used to see if the symbol has been reached are not */
-
-          StockPtr = malloc_stock();
-          
-          ptr = csv_strtok(line, ",");
-          if (!ptr) return 0;
-
-          symbol = (char *)malloc(strlen(ptr)+1);
-          if (symbol==NULL)
-            {
-              fprintf(stderr,"Memory allocating error (%s line %d)\n"
-                      ,__FILE__, __LINE__);
-              exit(1);
-            }
-          strcpy((char *)(symbol), ptr);
-          StockPtr->Symbol = symbol;
-
-          if( !FirstStockPtr ) 
-            {
-              FirstStockPtr = StockPtr;
-              StockPtr->PreviousStock = 0;
-            }
-          
-          StockPtr->NextStock = 0;
-        
-          if (LastStockPtr) 
-            {
-              LastStockPtr->NextStock = StockPtr;
-              StockPtr->PreviousStock = LastStockPtr;
-            }
-          
-          LastStockPtr = StockPtr;
-        }
+  {
+    /* this symbol is not valid */
+    /* Set the stock struct just with Symbol, all other are NULL */
+    /* This can be used to see if the symbol has been reached are not */
+
+    StockPtr = malloc_stock();
+    
+    ptr = csv_strtok(line, ",");
+    if (!ptr) return 0;
+
+    symbol = (char *)malloc(strlen(ptr)+1);
+    if (symbol==NULL)
+      {
+        fprintf(stderr,"Memory allocating error (%s line %d)\n"
+          ,__FILE__, __LINE__);
+        exit(1);
+      }
+    strcpy((char *)(symbol), ptr);
+    StockPtr->Symbol = symbol;
+
+    if( !FirstStockPtr ) 
+      {
+        FirstStockPtr = StockPtr;
+        StockPtr->PreviousStock = 0;
+      }
+    
+    StockPtr->NextStock = 0;
+  
+    if (LastStockPtr) 
+      {
+        LastStockPtr->NextStock = StockPtr;
+        StockPtr->PreviousStock = LastStockPtr;
+      }
+    
+    LastStockPtr = StockPtr;
+  }
 
@@ -323,3 +324,3 @@ stock *parse_csv_history_file(char *csv_file)
       StockPtr = malloc_stock();
-          
+    
       /* Date */
@@ -342,7 +343,7 @@ stock *parse_csv_history_file(char *csv_file)
       if (date==NULL)
-        {
-          fprintf(stderr,"Memory allocating error (%s line %d)\n"
-                  ,__FILE__, __LINE__);
-          exit(1);
-        }
+  {
+    fprintf(stderr,"Memory allocating error (%s line %d)\n"
+      ,__FILE__, __LINE__);
+    exit(1);
+  }
       sprintf(date,"%.2d%.2d%.2d", year, month, day);
@@ -374,13 +375,13 @@ stock *parse_csv_history_file(char *csv_file)
       if (!ptr) 
-        /* It seems to be an indice */
-        /* No volume for indices */
-        StockPtr->Volume = 0;
+  /* It seems to be an indice */
+  /* No volume for indices */
+  StockPtr->Volume = 0;
       else
-        StockPtr->Volume = atoi(ptr);
+  StockPtr->Volume = atoi(ptr);
 
       if( !FirstStockPtr ) 
-        {
-          FirstStockPtr = StockPtr;
-          StockPtr->PreviousStock = 0;
-        }
+  {
+    FirstStockPtr = StockPtr;
+    StockPtr->PreviousStock = 0;
+  }
       
@@ -389,6 +390,6 @@ stock *parse_csv_history_file(char *csv_file)
       if (LastStockPtr) 
-        {
-          LastStockPtr->NextStock = StockPtr;
-          StockPtr->PreviousStock = LastStockPtr;
-        }
+  {
+    LastStockPtr->NextStock = StockPtr;
+    StockPtr->PreviousStock = LastStockPtr;
+  }
       
diff --git a/noncore/todayplugins/stockticker/libstocks/http.c b/noncore/todayplugins/stockticker/libstocks/http.c
index 462080d..3078746 100644
--- a/noncore/todayplugins/stockticker/libstocks/http.c
+++ b/noncore/todayplugins/stockticker/libstocks/http.c
@@ -11,3 +11,3 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-         * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
@@ -21,2 +21,3 @@
 #define __HTTP_C__
+#define __UNIX__
 
@@ -87,5 +88,5 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
 #ifdef DEBUG
-        printf(" gethostbyname : NOK\n");
+  printf(" gethostbyname : NOK\n");
 #endif
-        return ERRHOST;
+  return ERRHOST;
       }
@@ -123,3 +124,3 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
       sprintf(header,"GET http://%.128s:80%.256s HTTP/1.0\015\012\015\012",
-                     http_server, http_file);
+         http_server, http_file);
     }
@@ -140,3 +141,3 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
 #ifdef DEBUG
-        printf(" send header : NOK\n");
+  printf(" send header : NOK\n");
 #endif
@@ -159,32 +160,32 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
       if (r)
-        {
-          if(!data_lgr)
-            {
-              if((data = malloc(r+1))==NULL)
-                {
-                  fprintf(stderr,"Memory allocating error (%s line %d)\n"
-                          ,__FILE__, __LINE__);
-                  exit(1);
-                }
-              
-              memcpy(data,buf,r);
-              data_lgr = r;
-              data[r]=0;
-            }
-          else
-            {
-              if((temp = malloc(r+data_lgr+1))==NULL)
-                {
-                  fprintf(stderr,"Memory allocating error (%s line %d)\n"
-                          ,__FILE__, __LINE__);
-                  exit(1);
-                }
-              memcpy(temp, data, data_lgr);
-              memcpy(temp+data_lgr, buf, r);
-              temp[r+data_lgr]=0;
-              data_lgr += r;
-              free(data);
-              data = temp;
-            }
-        }
+  {
+    if(!data_lgr)
+      {
+        if((data = malloc(r+1))==NULL)
+    {
+      fprintf(stderr,"Memory allocating error (%s line %d)\n"
+        ,__FILE__, __LINE__);
+      exit(1);
+    }
+        
+        memcpy(data,buf,r);
+        data_lgr = r;
+        data[r]=0;
+      }
+    else
+      {
+        if((temp = malloc(r+data_lgr+1))==NULL)
+    {
+      fprintf(stderr,"Memory allocating error (%s line %d)\n"
+        ,__FILE__, __LINE__);
+      exit(1);
+    }
+        memcpy(temp, data, data_lgr);
+        memcpy(temp+data_lgr, buf, r);
+        temp[r+data_lgr]=0;
+        data_lgr += r;
+        free(data);
+        data = temp;
+      }
+  }
     }
@@ -212,10 +213,10 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
       if( *temp==0x0A )
-        {
-          /* test if it is the header end */
-          temp ++;
-          if (*temp == 0x0D) temp++;
-          if (*temp == 0x0A) header_founded = 1;
-        }
+  {
+    /* test if it is the header end */
+    temp ++;
+    if (*temp == 0x0D) temp++;
+    if (*temp == 0x0A) header_founded = 1;
+  }
       else
-        temp++;
+  temp++;
     }
@@ -240,3 +241,3 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
       fprintf(stderr,"Memory allocating error (%s line %d)\n"
-              ,__FILE__, __LINE__);
+        ,__FILE__, __LINE__);
       exit(1);