options.c (97f2aab6698f3ab2552c41c1024a65ffd0763a6d) options.c (634725a92938b0f282b17cec0b007dca77adebd2)
1/*
2 * linux/fs/hfsplus/options.c
3 *
4 * Copyright (C) 2001
5 * Brad Boyer (flar@allandria.com)
6 * (C) 2003 Ardis Technologies <roman@ardistech.com>
7 *
8 * Option parsing

--- 69 unchanged lines hidden (view full) ---

78 while ((p = strsep(&input, ",")) != NULL) {
79 if (!*p)
80 continue;
81
82 token = match_token(p, tokens, args);
83 switch (token) {
84 case opt_creator:
85 if (match_fourchar(&args[0], &sbi->creator)) {
1/*
2 * linux/fs/hfsplus/options.c
3 *
4 * Copyright (C) 2001
5 * Brad Boyer (flar@allandria.com)
6 * (C) 2003 Ardis Technologies <roman@ardistech.com>
7 *
8 * Option parsing

--- 69 unchanged lines hidden (view full) ---

78 while ((p = strsep(&input, ",")) != NULL) {
79 if (!*p)
80 continue;
81
82 token = match_token(p, tokens, args);
83 switch (token) {
84 case opt_creator:
85 if (match_fourchar(&args[0], &sbi->creator)) {
86 printk("HFS+-fs: creator requires a 4 character value\n");
86 printk(KERN_ERR "hfs: creator requires a 4 character value\n");
87 return 0;
88 }
89 break;
90 case opt_type:
91 if (match_fourchar(&args[0], &sbi->type)) {
87 return 0;
88 }
89 break;
90 case opt_type:
91 if (match_fourchar(&args[0], &sbi->type)) {
92 printk("HFS+-fs: type requires a 4 character value\n");
92 printk(KERN_ERR "hfs: type requires a 4 character value\n");
93 return 0;
94 }
95 break;
96 case opt_umask:
97 if (match_octal(&args[0], &tmp)) {
93 return 0;
94 }
95 break;
96 case opt_umask:
97 if (match_octal(&args[0], &tmp)) {
98 printk("HFS+-fs: umask requires a value\n");
98 printk(KERN_ERR "hfs: umask requires a value\n");
99 return 0;
100 }
101 sbi->umask = (umode_t)tmp;
102 break;
103 case opt_uid:
104 if (match_int(&args[0], &tmp)) {
99 return 0;
100 }
101 sbi->umask = (umode_t)tmp;
102 break;
103 case opt_uid:
104 if (match_int(&args[0], &tmp)) {
105 printk("HFS+-fs: uid requires an argument\n");
105 printk(KERN_ERR "hfs: uid requires an argument\n");
106 return 0;
107 }
108 sbi->uid = (uid_t)tmp;
109 break;
110 case opt_gid:
111 if (match_int(&args[0], &tmp)) {
106 return 0;
107 }
108 sbi->uid = (uid_t)tmp;
109 break;
110 case opt_gid:
111 if (match_int(&args[0], &tmp)) {
112 printk("HFS+-fs: gid requires an argument\n");
112 printk(KERN_ERR "hfs: gid requires an argument\n");
113 return 0;
114 }
115 sbi->gid = (gid_t)tmp;
116 break;
117 case opt_part:
118 if (match_int(&args[0], &sbi->part)) {
113 return 0;
114 }
115 sbi->gid = (gid_t)tmp;
116 break;
117 case opt_part:
118 if (match_int(&args[0], &sbi->part)) {
119 printk("HFS+-fs: part requires an argument\n");
119 printk(KERN_ERR "hfs: part requires an argument\n");
120 return 0;
121 }
122 break;
123 case opt_session:
124 if (match_int(&args[0], &sbi->session)) {
120 return 0;
121 }
122 break;
123 case opt_session:
124 if (match_int(&args[0], &sbi->session)) {
125 printk("HFS+-fs: session requires an argument\n");
125 printk(KERN_ERR "hfs: session requires an argument\n");
126 return 0;
127 }
128 break;
129 case opt_nls:
130 if (sbi->nls) {
126 return 0;
127 }
128 break;
129 case opt_nls:
130 if (sbi->nls) {
131 printk("HFS+-fs: unable to change nls mapping\n");
131 printk(KERN_ERR "hfs: unable to change nls mapping\n");
132 return 0;
133 }
134 p = match_strdup(&args[0]);
135 sbi->nls = load_nls(p);
136 if (!sbi->nls) {
132 return 0;
133 }
134 p = match_strdup(&args[0]);
135 sbi->nls = load_nls(p);
136 if (!sbi->nls) {
137 printk("HFS+-fs: unable to load nls mapping \"%s\"\n", p);
137 printk(KERN_ERR "hfs: unable to load nls mapping \"%s\"\n", p);
138 kfree(p);
139 return 0;
140 }
141 kfree(p);
142 break;
143 case opt_decompose:
144 sbi->flags &= ~HFSPLUS_SB_NODECOMPOSE;
145 break;

--- 43 unchanged lines hidden --- 		138 kfree(p);
139 return 0;
140 }
141 kfree(p);
142 break;
143 case opt_decompose:
144 sbi->flags &= ~HFSPLUS_SB_NODECOMPOSE;
145 break;

--- 43 unchanged lines hidden ---