diff -ru a/server.c b/server.c --- a/server.c 2019-10-25 01:26:12.433766827 +0300 +++ b/server.c 2019-10-25 21:16:51.837382620 +0300 @@ -1053,14 +1053,14 @@ if (argv == NULL) { #ifdef WIN32 GetDataPath (path); - strcat (path,"irserver.ini"); + strcat (path,"irtrans-server.ini"); #else - strcpy (path,"irserver.ini"); + strcpy (path,"irtrans-server.ini"); #endif fp = fopen (path,"r"); if (fp == NULL) { - log_print ("Unable to open parameter file irserver.ini\n",LOG_FATAL); + log_print ("Unable to open parameter file irtrans-server.ini\n",LOG_FATAL); return; } @@ -1314,13 +1314,13 @@ continue; } if (!strcmp (argv[1],"-daemon")) { - if (*logfile == 0) strcpy (logfile,"irserver.log"); + if (*logfile == 0) strcpy (logfile,"irtrans-server.log"); mode_flag |= DAEMON_MODE; continue; } #ifdef WIN32 if (!strcmp (argv[1],"-service")) { - if (*logfile == 0) strcpy (logfile,"irserver.log"); + if (*logfile == 0) strcpy (logfile,"irtrans-server.log"); mode_flag |= DAEMON_MODE | PARAMETER_FILE; if (device_wait == 5) device_wait = 180; continue; @@ -1335,7 +1335,7 @@ #ifdef WIN32 if (argc > 1 && !strcmp (argv[1],"-service")) { mode_flag |= PARAMETER_FILE | DAEMON_MODE; - if (*logfile == 0) strcpy (logfile,"irserver.log"); + if (*logfile == 0) strcpy (logfile,"irtrans-server.log"); if (device_wait == 5) device_wait = 180; } #endif @@ -1539,7 +1539,7 @@ fclose (stderr); stderr = NULL; setsid (); - fp = fopen ("/tmp/.irserver.pid","w"); + fp = fopen ("/tmp/.irtrans-server.pid","w"); if (fp) { fprintf (fp,"%d\n",getpid ()); fclose (fp); @@ -2974,7 +2974,7 @@ if (chdir (irdb_path)) return (ERR_NODATABASE); } else if (chdir ("./remotes") && !(home && chdir (st) == 0) && - chdir ("/etc/irserver/remotes") && chdir ("/usr/local/share/irtrans/remotes") && + chdir ("/etc/irtrans/remotes") && chdir ("/usr/local/share/irtrans/remotes") && chdir ("/usr/share/irtrans/remotes")) return (ERR_NODATABASE); } @@ -3048,7 +3048,7 @@ else if (chdir ("./remotes") && !(home && chdir (st) == 0) - && chdir ("/etc/irserver/remotes") + && chdir ("/etc/irtrans/remotes") && chdir ("/usr/local/share/irtrans/remotes") && chdir ("/usr/share/irtrans/remotes")) return (ERR_NODATABASE); }