Changeset 1256 for branches/monitor-improvement/oscam-http.c

Timestamp:

01/16/10 19:00:23 (11 years ago)

Author:

Admin

Message:

Add cs_strncpy as a replacement for strncpy. This function always terminates the string and works pretty much like strlcpy but without return value.

File:

• branches/monitor-improvement/oscam-http.c (modified) (4 diffs)

branches/monitor-improvement/oscam-http.c

@@ -664 +664 @@
     char user[128];
 
-    if (strcmp(getParam(params, "action"), "Save As") == 0) strncpy(user, getParam(params, "newuser"), sizeof(user)/sizeof(char) - 1);
-    else strncpy(user, getParam(params, "user"), sizeof(user)/sizeof(char) - 1);
-    user[sizeof(user)/sizeof(char) - 1] = '\0';
+    if (strcmp(getParam(params, "action"), "Save As") == 0) cs_strncpy(user, getParam(params, "newuser"), sizeof(user)/sizeof(char));
+    else cs_strncpy(user, getParam(params, "user"), sizeof(user)/sizeof(char));
 
     int i;
@@ -691 +690 @@
       }
       memset(account, 0, sizeof(struct s_auth));
-            strncpy((char *)account->usr, user, sizeof(account->usr)-1);
+            cs_strncpy((char *)account->usr, user, sizeof(account->usr));
       account->au=(-1);
       account->monlvl=cfg->mon_level;
@@ -1053 +1052 @@
     int i;
 
-    strncpy(label, strtolower(getParam(params, "service")), sizeof(label)/sizeof(char) - 1);
-    label[sizeof(label)/sizeof(char) - 1] = '\0';
+    cs_strncpy(label, strtolower(getParam(params, "service")), sizeof(label)/sizeof(char));
 
     for (sidtab  = cfg->sidtab; sidtab != NULL && strcmp(label, sidtab->label) != 0; sidtab=sidtab->next);
@@ -1077 +1075 @@
       }
       memset(sidtab, 0, sizeof(struct s_sidtab));
-            strncpy((char *)sidtab->label, label, sizeof(sidtab->label)-1);
+            cs_strncpy((char *)sidtab->label, label, sizeof(sidtab->label));
 
             tpl_addVar(vars, 1, "MESSAGE", "<b>New service has been added</b><BR>");