X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvsched.c;h=358d139b298bfb1dcf869272ae63f09a0dd09b2b;hb=bd9b1a68c9b4855e2dab03fc2b84e174446cbef5;hp=bf6603f2a3c4567b8e3182c4ad8286d7d37791e4;hpb=93c4a7d40d5bedb16f2cdc9f8fb7629418275a9f;p=util-vserver.git diff --git a/src/vsched.c b/src/vsched.c index bf6603f..358d139 100644 --- a/src/vsched.c +++ b/src/vsched.c @@ -143,6 +143,8 @@ static void do_dir_entry(struct vc_set_sched *sched, const char *name) char buf[128]; signed long val; struct sched_opt *opt; + ssize_t len; + char *newline; for (opt = FILE_OPTIONS; opt->name != 0; opt++) { if (strcmp(name, opt->name) == 0) @@ -150,8 +152,11 @@ static void do_dir_entry(struct vc_set_sched *sched, const char *name) } fd = Eopen(name, O_RDONLY, 0); - Eread(fd, buf, sizeof(buf)); + len = Eread(fd, buf, sizeof(buf)-1); Eclose(fd); + buf[len] = '\0'; + if ((newline=strchr(buf, '\n')) != NULL) + *newline = '\0'; if (!isNumber(buf, &val, true)) { WRITE_MSG(2, ENSC_WRAPPERS_PREFIX); @@ -161,7 +166,7 @@ static void do_dir_entry(struct vc_set_sched *sched, const char *name) } if (opt->offset != offsetof(struct vc_set_sched, set_mask)) - *(((char *)sched)+opt->offset) = (int_least32_t) val; + *(int_least32_t *)(((char *)sched)+opt->offset) = (int_least32_t) val; sched->set_mask |= opt->mask; }