Browse Source

sanitize return value. NULL on failure, always.

OPENBSD_2_1
downsj 28 years ago
parent
commit
57597c7d5e
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      src/lib/libutil/readlabel.c

+ 4
- 3
src/lib/libutil/readlabel.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: readlabel.c,v 1.1 1996/12/03 01:05:35 downsj Exp $ */
/* $OpenBSD: readlabel.c,v 1.2 1996/12/04 21:25:33 downsj Exp $ */
/* /*
* Copyright (c) 1996, Jason Downs. All rights reserved. * Copyright (c) 1996, Jason Downs. All rights reserved.
@ -48,7 +48,7 @@ char *readlabelfs(device)
char *device; char *device;
{ {
char rpath[MAXPATHLEN]; char rpath[MAXPATHLEN];
char part;
char part, *type;
struct stat sbuf; struct stat sbuf;
struct disklabel dk; struct disklabel dk;
int fd; int fd;
@ -111,5 +111,6 @@ char *readlabelfs(device)
return(NULL); return(NULL);
} }
return(fstypesnames[dk.d_partitions[part - 'a'].p_fstype]);
type = fstypesnames[dk.d_partitions[part - 'a'].p_fstype];
return((type[0] == '\0') ? NULL : type);
} }

Loading…
Cancel
Save