Magellan Linux

Diff of /trunk/mkinitrd-magellan/busybox/shell/shell_common.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1126 by niro, Wed Aug 18 21:56:57 2010 UTC revision 1127 by niro, Wed Aug 18 22:00:50 2010 UTC
# Line 428  shell_builtin_ulimit(char **argv) Line 428  shell_builtin_ulimit(char **argv)
428   val <<= l->factor_shift;   val <<= l->factor_shift;
429   }   }
430  //bb_error_msg("opt %c val_str:'%s' val:%lld", opt_char, val_str, (long long)val);  //bb_error_msg("opt %c val_str:'%s' val:%lld", opt_char, val_str, (long long)val);
431     /* from man bash: "If neither -H nor -S
432     * is specified, both the soft and hard
433     * limits are set. */
434     if (!opts)
435     opts = OPT_hard + OPT_soft;
436   if (opts & OPT_hard)   if (opts & OPT_hard)
437   limit.rlim_max = val;   limit.rlim_max = val;
438   if ((opts & OPT_soft) || opts == 0)   if (opts & OPT_soft)
439   limit.rlim_cur = val;   limit.rlim_cur = val;
440  //bb_error_msg("setrlimit(%d, %lld, %lld)", l->cmd, (long long)limit.rlim_cur, (long long)limit.rlim_max);  //bb_error_msg("setrlimit(%d, %lld, %lld)", l->cmd, (long long)limit.rlim_cur, (long long)limit.rlim_max);
441   if (setrlimit(l->cmd, &limit) < 0) {   if (setrlimit(l->cmd, &limit) < 0) {

Legend:
Removed from v.1126  
changed lines
  Added in v.1127