version detect change

Author: macskas

cdocker.cpp

@@ -1,18 +1,14 @@
 #include "cdocker.h"
 
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
 #include <cctype>
 #include <stdexcept>
-#include <cerrno>
 #include <cstdio>
 
 extern "C" {
-#include <limits.h>
 #include <sys/dir.h>
 #include <unistd.h>
-#include <signal.h>
 #include <sched.h>
 #include <fcntl.h>
 #include <sys/types.h>
@@ -70,14 +66,14 @@ CDocker::CDocker() : dockerPath("/var/lib/docker/containers"), dockerConfig("con
 }
 
 void CDocker::loadConfigDirectory() {
-    DIR                 *dir = NULL;
+    DIR                 *dir = nullptr;
     const char          *dpath = this->dockerPath.c_str();
-    struct dirent       *ent = NULL;
+    struct dirent       *ent = nullptr;
     char                fbuf[PATH_MAX];
     memset(fbuf, 0, PATH_MAX);
 
-    if ((dir = opendir (dpath)) != NULL) {
-        while ((ent = readdir (dir)) != NULL) {
+    if ((dir = opendir (dpath)) != nullptr) {
+        while ((ent = readdir (dir)) != nullptr) {
             if (strcmp(ent->d_name, ".") == 0) {
                 continue;
             } else if (strcmp(ent->d_name, "..") == 0) {
@@ -87,7 +83,7 @@ void CDocker::loadConfigDirectory() {
             this->loadConfigV2((const char*)fbuf);
         }
         closedir(dir);
-        dir = NULL;
+        dir = nullptr;
     } else {
         perror("opendir()");
         throw std::runtime_error("opendir failed.");
@@ -97,7 +93,7 @@ void CDocker::loadConfigDirectory() {
 void CDocker::loadConfigV2(const char *configFile) {
     FILE        *f;
     size_t      lSize = 0;
-    char        *fcontent = NULL;
+    char        *fcontent = nullptr;
     std::string hostname;
     size_t      lRead = 0;
     int         pid;
@@ -115,7 +111,7 @@ void CDocker::loadConfigV2(const char *configFile) {
     }
 
     fcontent = (char*)calloc(lSize, sizeof(char));
-    if (fcontent == NULL) {
+    if (fcontent == nullptr) {
         fclose(f);
         throw std::runtime_error("Calloc failed. Out of memory");
     }
@@ -152,19 +148,19 @@ int CDocker::findKeyString(char *fcontent, const char *k, std::string *ret)
 {
     char fdata[DBUF_SIZE_SMALL];
     memset(fdata, 0, DBUF_SIZE_SMALL);
-    char *tmp = NULL;
-    char *tmp_e = NULL;
+    char *tmp = nullptr;
+    char *tmp_e = nullptr;
     std::string lookupString;
     lookupString += "\"";
     lookupString += k;
     lookupString += "\":";
     tmp = strstr(fcontent, lookupString.c_str());
-    if (tmp == NULL)
+    if (tmp == nullptr)
         return -1;
     if (strlen(tmp) > strlen(k)+4)
         tmp+=strlen(k)+4;
     tmp_e = strchr(tmp, '"');
-    if (tmp_e == NULL)
+    if (tmp_e == nullptr)
         return -2;
     if (tmp_e-tmp <= 1)
         return -3;
@@ -177,25 +173,25 @@ int CDocker::findKeyInt(char *fcontent, const char *k, int *ret)
 {
     char fdata[DBUF_SIZE_SMALL];
     memset(fdata, 0, DBUF_SIZE_SMALL);
-    char *tmp = NULL;
-    char *tmp_e = NULL;
+    char *tmp = nullptr;
+    char *tmp_e = nullptr;
     int rint = 0;
     std::string lookupString;
     lookupString += "\"";
     lookupString += k;
     lookupString += "\":";
     tmp = strstr(fcontent, lookupString.c_str());
-    if (tmp == NULL)
+    if (tmp == nullptr)
         return -1;
     if (strlen(tmp) > strlen(k)+3)
         tmp+=strlen(k)+3;
 
     tmp_e = tmp;
-    while (tmp_e != NULL && isdigit(*tmp_e)) {
+    while (tmp_e != nullptr && isdigit(*tmp_e)) {
         tmp_e++;
     }
 
-    if (tmp_e == NULL || tmp_e == tmp)
+    if (tmp_e == nullptr || tmp_e == tmp)
         return -2;
     if (tmp_e-tmp <= 1)
         return -3;
@@ -209,7 +205,7 @@ int CDocker::findKeyInt(char *fcontent, const char *k, int *ret)
 void CDocker::setNSByHostname(std::string hostname) {
     std::map<std::string, CDockerContainer>::iterator	it;
     char                                                fbuf[PATH_MAX];
-    NamespaceFile                                       *nsfile = NULL;
+    NamespaceFile                                       *nsfile = nullptr;
 
     std::vector<class NamespaceFile*>                   namespace_files;
     namespace_files.push_back(new NamespaceFile(CLONE_NEWIPC, "ipc"));
@@ -242,7 +238,7 @@ void CDocker::setNSByHostname(std::string hostname) {
         }
         nsfile->closefd();
         delete nsfile;
-        namespace_files[i] = NULL;
+        namespace_files[i] = nullptr;
     }
 }
 
@@ -254,7 +250,7 @@ int CDocker::run(std::string hostname, std::vector<std::string> args) {
     char           cwd[PATH_MAX];
     memset(cwd,0,PATH_MAX);
 
-    if (getcwd(cwd, PATH_MAX) == NULL) {
+    if (getcwd(cwd, PATH_MAX) == nullptr) {
         perror("ERROR: getcwd()");
         throw std::runtime_error( "getcwd failed" );
     }

cphprunner.cpp

@@ -7,9 +7,9 @@
 #include <iostream>
 
 extern "C" {
-    #include <limits.h>
-    #include <unistd.h>
-    #include <libgen.h>
+#include <limits.h>
+#include <unistd.h>
+#include <libgen.h>
 }
 
 CPHPRunner::CPHPRunner() : default_version("php72"), lockFile("/var/lock/nophp"), isPHPBin(true)
@@ -24,6 +24,9 @@ CPHPRunner::CPHPRunner() : default_version("php72"), lockFile("/var/lock/nophp")
     this->allowed_version.insert("php74");
     this->allowed_version.insert("php80");
     this->allowed_version.insert("php81");
+    this->allowed_version.insert("php82");
+    this->allowed_version.insert("php83");
+    this->allowed_version.insert("php84");
 
     if (this->isPHPLocked())
         throw std::runtime_error("PHP cli is temporarily disabled");
@@ -38,10 +41,10 @@ bool CPHPRunner::isPHPLocked() {
 void CPHPRunner::setDefaultVersion() {
     const char *default_php_file = "/etc/docker-runner.default_php";
     char        buffer[32];
-    char        *pos = NULL;
+    char        *pos = nullptr;
     memset(buffer, 0, 32);
 
-    FILE        *f;
+    FILE        *f = nullptr;
 
     if (access(default_php_file, R_OK) != 0)
         return;
@@ -50,7 +53,7 @@ void CPHPRunner::setDefaultVersion() {
     if (!f)
         return;
 
-    if (fgets(buffer, 32, f) == NULL) {
+    if (fgets(buffer, 32, f) == nullptr) {
         fclose(f);
         return;
     }
@@ -65,7 +68,6 @@ void CPHPRunner::setDefaultVersion() {
         this->default_version = buffer;
     }
     fclose(f);
-    return;
 }
 
 void CPHPRunner::selectPHPVersion(const char *argv0) {
@@ -82,16 +84,13 @@ void CPHPRunner::selectPHPVersion(const char *argv0) {
         this->isPHPBin = false;
     }
 
-    for (size_t i=0; i<bname_length; i++) {
-        if (isdigit(bname[i])) {
-           version = atoi(bname+i);
-           if (version > 50 && version < 90) {
-               snprintf(selected_version_local, 64, "php%d", version);
-               this->selected_version.assign(selected_version_local);
-               free(dupargv_original);
-               return;
-           }
-           break;
+    if (bname_length > 2 && isdigit(bname[bname_length-1]) && isdigit(bname[bname_length-2])) {
+        version = (int)strtol(bname+bname_length-2, nullptr, 10);
+        if (version > 50 && version < 90) {
+            snprintf(selected_version_local, 64, "php%d", version);
+            this->selected_version.assign(selected_version_local);
+            free(dupargv_original);
+            return;
         }
     }
 
@@ -114,7 +113,7 @@ void CPHPRunner::buildPHParguments(int argc, char **argv) {
     if (this->isPHPBin) {
         this->args.push_back("/usr/bin/php");
         for (int i=1; i<argc; i++) {
-            if (argv[i] == NULL)
+            if (argv[i] == nullptr)
                 break;
             if (i == 0)
                 args_merged += argv[i];
@@ -126,7 +125,7 @@ void CPHPRunner::buildPHParguments(int argc, char **argv) {
         }
     } else {
         for (int i=0; i<argc; i++) {
-            if (argv[i] == NULL)
+            if (argv[i] == nullptr)
                 break;
             if (i == 0)
                 args_merged += argv[i];