[Mt-daapd-cvs] SF.net SVN: mt-daapd: [1429] trunk/src

[<rp...@us...>]

Revision: 1429
          http://svn.sourceforge.net/mt-daapd/?rev=1429&view=rev
Author:   rpedde
Date:     2006-11-13 17:40:22 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
PATH_MAX vs MAX_PATH fixes.  Stupid windows.

Modified Paths:
--------------
    trunk/src/mp3-scanner.c
    trunk/src/os-win32.c
    trunk/src/w32-eventlog.c
    trunk/src/w32-service.c

Modified: trunk/src/mp3-scanner.c
===================================================================
--- trunk/src/mp3-scanner.c	2006-11-13 00:09:16 UTC (rev 1428)
+++ trunk/src/mp3-scanner.c	2006-11-14 01:40:22 UTC (rev 1429)
@@ -82,7 +82,7 @@
 static int scan_path(char *path);
 static int scan_get_info(char *file, MP3FILE *pmp3);
 static int scan_freetags(MP3FILE *pmp3);
-static void scan_music_file(char *path, char *fname,struct stat *psb, int is_compdir); 
+static void scan_music_file(char *path, char *fname,struct stat *psb, int is_compdir);
 
 static TAGHANDLER *scan_gethandler(char *type);
 
@@ -227,7 +227,7 @@
             if(strrchr(pnext->path,PATHSEP)) {
                 file = strrchr(pnext->path,PATHSEP) + 1;
             }
-            
+
             if(strcasecmp(file,"iTunes Music Library.xml") == 0) {
                 if(conf_get_int("scanning","process_xml",1)) {
                     DPRINTF(E_INF,L_SCAN,"Scanning %s\n",pnext->path);
@@ -262,7 +262,7 @@
 int scan_init(char **patharray) {
     int err=0;
     int index=0;
-    char resolved_path[MAX_PATH];
+    char resolved_path[PATH_MAX];
 
     DPRINTF(E_DBG,L_SCAN,"Starting scan_init\n");
 
@@ -387,7 +387,7 @@
             DPRINTF(E_INF,L_SCAN,"Error statting %s: %s\n",mp3_path,strerror(errno));
         } else {
             if(S_ISDIR(sb.st_mode)) {  /* follow dir */
-                if(conf_get_int("scanning","ignore_appledouble",1) && 
+                if(conf_get_int("scanning","ignore_appledouble",1) &&
                    ((strcasecmp(pde->d_name,".AppleDouble") == 0) ||
                     (strcasecmp(pde->d_name,".AppleDesktop") == 0))) {
                     DPRINTF(E_DBG,L_SCAN,"Skipping appledouble folder\n");
@@ -476,11 +476,11 @@
         strcpy(base_path,path);
         ptr = base_path;
         while(*ptr) {
-            if((*ptr == '/') || (*ptr == '\\')) 
+            if((*ptr == '/') || (*ptr == '\\'))
                 *ptr = PATHSEP;
             ptr++;
         }
-        
+
         if((current=strrchr(base_path,PATHSEP))){
             *(current+1) = '\x0';
         } /* else something is fubar */
@@ -500,7 +500,7 @@
 
             ptr = linebuffer;
             while(*ptr) {
-                if((*ptr == '/') || (*ptr == '\\')) 
+                if((*ptr == '/') || (*ptr == '\\'))
                     *ptr = PATHSEP;
                 ptr++;
             }
@@ -539,7 +539,7 @@
 
 /**
  * here, we want to scan a file and add it (if necessary)
- * to the database.  
+ * to the database.
  *
  * @param path path of file to scan
  * @param compdir whether or not this is a compdir:

Modified: trunk/src/os-win32.c
===================================================================
--- trunk/src/os-win32.c	2006-11-13 00:09:16 UTC (rev 1428)
+++ trunk/src/os-win32.c	2006-11-14 01:40:22 UTC (rev 1429)
@@ -61,7 +61,7 @@
 
 /* Globals */
 OSFILEINFO file_info[MAXDESC];
-char os_config_file[_MAX_PATH];
+char os_config_file[PATH_MAX];
 char *os_w32_socket_states[] = {
     "Closed/Unused",
     "Open/Listening",
@@ -83,14 +83,14 @@
     int err;
     char *inifile;
     char drive_buffer[4];
-    char drive_map[MAX_PATH];
+    char drive_map[PATH_MAX];
     int drive_letter;
 
     inifile=_os_filepath("mapping.ini");
-    DPRINTF(E_LOG,L_MISC,"Building drive mapping table from %s\n",inifile);    
+    DPRINTF(E_LOG,L_MISC,"Building drive mapping table from %s\n",inifile);
     for(drive_letter = 'a'; drive_letter <= 'z'; drive_letter++) {
         sprintf(drive_buffer,"%c",drive_letter);
-        GetPrivateProfileString("mapping",drive_buffer,"",drive_map,MAX_PATH,inifile);
+        GetPrivateProfileString("mapping",drive_buffer,"",drive_map,PATH_MAX,inifile);
         if(strlen(drive_map)) {
             os_drive_maps[drive_letter - 'a'] = strdup(drive_map);
             DPRINTF(E_LOG,L_MISC,"Mapped %c to %s\n",drive_letter,drive_map);
@@ -100,9 +100,9 @@
     }
     os_maps_init=1;
     free(inifile);
-    
+
     _os_socket_startup();
-    
+
     if(!os_initialized) {
         _os_lock();
         if(!os_initialized) {
@@ -272,13 +272,13 @@
 
     while (((retval =
         accept(REALSOCK,(struct sockaddr *)(&netclient), &len)) == SOCKET_ERROR) &&
-               (WSAGetLastError() == WSAEINTR));  
+               (WSAGetLastError() == WSAEINTR));
 
     if (retval == INVALID_SOCKET) {
         DPRINTF(E_LOG,L_MISC,"Error accepting...\n");
         return _os_sock_to_fd(retval);
     }
-   
+
     *hostaddr = netclient.sin_addr;
     return _os_sock_to_fd(retval);
 }
@@ -294,12 +294,12 @@
         return -1;
 
     sock = REALSOCK;
- 
+
     /*
     if ((fd < 0) || (fd >= FD_SETSIZE)) {
         errno = EINVAL;
         return -1;
-    } 
+    }
     */
 
     FD_ZERO(&readset);
@@ -364,7 +364,7 @@
 }
 
 int os_opensocket(unsigned short port) {
-    int error;  
+    int error;
     struct sockaddr_in server;
     SOCKET sock;
     int true = 1;
@@ -387,18 +387,18 @@
     if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
                   sizeof(true)) == SOCKET_ERROR) {
         error = WSAGetLastError();
-        while ((closesocket(sock) == SOCKET_ERROR) && (WSAGetLastError() == WSAEINTR)); 
+        while ((closesocket(sock) == SOCKET_ERROR) && (WSAGetLastError() == WSAEINTR));
         errno = EINVAL; /* windows errnos suck */
         return -1;
     }
- 
+
     server.sin_family = AF_INET;
     server.sin_addr.s_addr = htonl(INADDR_ANY);
     server.sin_port = htons((short)port);
     if ((bind(sock, (struct sockaddr *)&server, sizeof(server)) == -1) ||
         (listen(sock, MAXBACKLOG) == -1)) {
         error = errno;
-        while ((closesocket(sock) == SOCKET_ERROR) && (WSAGetLastError() == WSAEINTR)); 
+        while ((closesocket(sock) == SOCKET_ERROR) && (WSAGetLastError() == WSAEINTR));
         errno = WSAGetLastError();
         return -1;
     }
@@ -410,7 +410,7 @@
 
 int os_write(int fd, void *buffer, unsigned int count) {
     int retval;
-    
+
     if(NOTSOCK) {
         retval = _write(fd,buffer,count);
     } else {
@@ -463,7 +463,7 @@
             closesocket(REALSOCK);
             SOCKSTATE = 0;
         }
-    } 
+    }
     return 0;
 }
 
@@ -492,18 +492,18 @@
         tz->tz_minuteswest = _timezone;
     }
     return (0);
-} 
+}
 
 
 /**
- * initialize winsock 
+ * initialize winsock
  */
 void _os_socket_startup(void) {
     WORD minver;
     int err;
- 
+
     minver = MAKEWORD( 2, 2 );
- 
+
     err = WSAStartup( minver, &w32_wsadata );
     if ( err != 0 ) {
         DPRINTF(E_FATAL,L_MISC,"Could not initialize winsock\n");
@@ -565,9 +565,9 @@
 char *_os_filepath(char *file) {
     char drive[_MAX_DRIVE];
     char dir[_MAX_DIR];
-    char path[_MAX_PATH];
+    char path[PATH_MAX];
 
-    GetModuleFileName(NULL,path,_MAX_PATH);
+    GetModuleFileName(NULL,path,PATH_MAX);
     _splitpath(path,drive,dir,NULL,NULL);
     _makepath(path,drive,dir,NULL,NULL);
     strcat(path,file);
@@ -580,9 +580,9 @@
  *
  */
 char *os_apppath(char *junk) {
-    char app_path[_MAX_PATH];
+    char app_path[PATH_MAX];
 
-    GetModuleFileName(NULL,app_path,_MAX_PATH);
+    GetModuleFileName(NULL,app_path,PATH_MAX);
     return strdup(app_path);
 }
 
@@ -616,7 +616,7 @@
         }
         index++;
     }
-    
+
     DPRINTF(E_DBG,L_MISC,"Nope!\n");
     return FALSE;
 }
@@ -687,7 +687,7 @@
 
     if (!(dirp = (DIR *) malloc (sizeof (DIR))))
         return NULL;
-    
+
     dirp->dir_find_handle = INVALID_HANDLE_VALUE;
     dirp->dd_fd = 0;
     dirp->dd_loc = 0;

Modified: trunk/src/w32-eventlog.c
===================================================================
--- trunk/src/w32-eventlog.c	2006-11-13 00:09:16 UTC (rev 1428)
+++ trunk/src/w32-eventlog.c	2006-11-14 01:40:22 UTC (rev 1429)
@@ -39,14 +39,14 @@
 int elog_register(void) {
     HKEY reg_key = NULL;
     DWORD err = 0;
-    char path[_MAX_PATH];
+    char path[PATH_MAX];
     DWORD event_types;
 
     wsprintf(path,"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\%s", PACKAGE);
     if((err=RegCreateKey(HKEY_LOCAL_MACHINE, path, &reg_key)) != ERROR_SUCCESS)
         return FALSE;
 
-    GetModuleFileName(NULL, path, _MAX_PATH );
+    GetModuleFileName(NULL, path, PATH_MAX);
 
     err=RegSetValueEx(reg_key, "EventMessageFile",0,REG_EXPAND_SZ,path,(DWORD)strlen(path) + 1);
     if(err != ERROR_SUCCESS) {
@@ -87,9 +87,9 @@
 }
 
 
-/** 
+/**
  * uninitialize the eventlog
- * 
+ *
  * @returns TRUE
  */
 int elog_deinit(void) {

Modified: trunk/src/w32-service.c
===================================================================
--- trunk/src/w32-service.c	2006-11-13 00:09:16 UTC (rev 1428)
+++ trunk/src/w32-service.c	2006-11-14 01:40:22 UTC (rev 1429)
@@ -225,9 +225,9 @@
 void service_register(void) {
     SC_HANDLE scm;
     SC_HANDLE svc;
-    char path[MAX_PATH];
+    char path[PATH_MAX];
 
-    GetModuleFileName(NULL, path, MAX_PATH );
+    GetModuleFileName(NULL, path, PATH_MAX );
 
     if(!(scm = OpenSCManager(0,0,SC_MANAGER_CREATE_SERVICE))) {
         DPRINTF(E_FATAL,L_MISC,"Cannot open service control manager\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.