diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /fs/devpts | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'fs/devpts')
| -rw-r--r-- | fs/devpts/inode.c | 8 | ||||
| -rw-r--r-- | fs/devpts/root.c | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 9ba675b16..78d3ae625 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -77,13 +77,15 @@ static int devpts_parse_options(char *options, struct devpts_sb_info *sbi) { int setuid = 0; int setgid = 0; - uid_t uid = 0; /* To shut up gcc */ + uid_t uid = 0; gid_t gid = 0; umode_t mode = 0600; char *this_char, *value; - if ( !options ) return 1; - for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) { + this_char = NULL; + if ( options ) + this_char = strtok(options,","); + for ( ; this_char; this_char = strtok(NULL,",")) { if ((value = strchr(this_char,'=')) != NULL) *value++ = 0; if (!strcmp(this_char,"uid")) { diff --git a/fs/devpts/root.c b/fs/devpts/root.c index e5930501c..04215ad40 100644 --- a/fs/devpts/root.c +++ b/fs/devpts/root.c @@ -29,6 +29,7 @@ static struct file_operations devpts_root_operations = { NULL, /* ioctl */ NULL, /* mmap */ NULL, /* open */ + NULL, /* flush */ NULL, /* release */ NULL, /* fsync */ NULL, /* fasync */ |