instance: improve portability of setting resource limits

[project/procd.git] / service / instance.c

diff --git a/service/instance.c b/service/instance.c
index 27b81f5e2303cd7e996730161619085a112f927f..1b28a7a2407eaa38529affa277371a170b9bf27c 100644 (file)
--- a/service/instance.c
+++ b/service/instance.c
@@ -91,6 +91,7 @@ instance_limits(const char *limit, const char *value)
 {
        int i;
        struct rlimit rlim;
+       unsigned long cur, max;
 
        for (i = 0; rlimit_names[i].name != NULL; i++) {
                if (strcmp(rlimit_names[i].name, limit))
@@ -98,10 +99,20 @@ instance_limits(const char *limit, const char *value)
                if (!strcmp(value, "unlimited")) {
                        rlim.rlim_cur = RLIM_INFINITY;
                        rlim.rlim_max = RLIM_INFINITY;
+               } else {
+                       if (getrlimit(rlimit_names[i].resource, &rlim))
+                               return;
+
+                       cur = rlim.rlim_cur;
+                       max = rlim.rlim_max;
+
+                       if (sscanf(value, "%lu %lu", &cur, &max) < 1)
+                               return;
+
+                       rlim.rlim_cur = cur;
+                       rlim.rlim_max = max;
                }
-               else if (getrlimit(rlimit_names[i].resource, &rlim) ||
-                        sscanf(value, "%lu %lu", &rlim.rlim_cur, &rlim.rlim_max) == 0)
-                       return;
+
                setrlimit(rlimit_names[i].resource, &rlim);
                return;
        }
@@ -434,6 +445,7 @@ instance_config_cleanup(struct service_instance *in)
        blobmsg_list_free(&in->env);
        blobmsg_list_free(&in->data);
        blobmsg_list_free(&in->netdev);
+       blobmsg_list_free(&in->file);
        blobmsg_list_free(&in->limits);
 }
 
@@ -444,6 +456,7 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
        blobmsg_list_move(&in->env, &in_src->env);
        blobmsg_list_move(&in->data, &in_src->data);
        blobmsg_list_move(&in->netdev, &in_src->netdev);
+       blobmsg_list_move(&in->file, &in_src->file);
        blobmsg_list_move(&in->limits, &in_src->limits);
        in->trigger = in_src->trigger;
        in->command = in_src->command;