diff options
| author | melifaro <melifaro@FreeBSD.org> | 2014-10-09 15:35:28 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2014-10-09 15:35:28 +0000 |
| commit | d23efba7dd470e247cbcacf9ec6cf642d02d5b8c (patch) | |
| tree | 6d2822f6a5ff6c5c487b859a557d076b53b03c46 /sys/boot/i386/gptboot/gptboot.c | |
| parent | cab1d703b61e2216f130c6d1a23ca70b2b322386 (diff) | |
| parent | c47600c4ec062b8225ac1d48197a2a1de778760d (diff) | |
| download | FreeBSD-src-d23efba7dd470e247cbcacf9ec6cf642d02d5b8c.zip FreeBSD-src-d23efba7dd470e247cbcacf9ec6cf642d02d5b8c.tar.gz | |
Sync to HEAD@r272825.
Diffstat (limited to 'sys/boot/i386/gptboot/gptboot.c')
| -rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 0596499..4fa5227 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -136,6 +136,7 @@ int main(void) { char cmd[512], cmdtmp[512]; + ssize_t sz; int autoboot, dskupdated; ufs_ino_t ino; @@ -164,9 +165,10 @@ main(void) for (;;) { *kname = '\0'; if ((ino = lookup(PATH_CONFIG)) || - (ino = lookup(PATH_DOTCONFIG))) - fsread(ino, cmd, sizeof(cmd)); - + (ino = lookup(PATH_DOTCONFIG))) { + sz = fsread(ino, cmd, sizeof(cmd) - 1); + cmd[(sz < 0) ? 0 : sz] = '\0'; + } if (*cmd != '\0') { memcpy(cmdtmp, cmd, sizeof(cmdtmp)); if (parse(cmdtmp, &dskupdated)) |
