Merge branch 'master' of ssh://ltp.git.sourceforge.net/gitroot/ltp/ltp
Conflicts:
lib/parse_opts.c
testcases/Makefile
testcases/kernel/syscalls/lchown/lchown01.c
testcases/kernel/syscalls/lchown/lchown02.c
testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/clock_settime/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c
testcases/open_posix_testsuite/conformance/interfaces/fork/11-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/12-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/13-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/14-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/16-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/17-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/17-2.c
testcases/open_posix_testsuite/conformance/interfaces/fork/18-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/19-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/22-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/6-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/7-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c
testcases/open_posix_testsuite/conformance/interfaces/fork/9-1.c
testcases/open_posix_testsuite/conformance/interfaces/mlock/10-1.c
testcases/open_posix_testsuite/conformance/interfaces/mlock/12-1.c
testcases/open_posix_testsuite/conformance/interfaces/mlock/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/mlock/speculative/12-1.c
testcases/open_posix_testsuite/conformance/interfaces/mlockall/15-1.c
testcases/open_posix_testsuite/conformance/interfaces/mlockall/3-6.c
testcases/open_posix_testsuite/conformance/interfaces/mlockall/3-7.c
testcases/open_posix_testsuite/conformance/interfaces/mlockall/8-1.c
testcases/open_posix_testsuite/conformance/interfaces/mlockall/speculative/15-1.c
testcases/open_posix_testsuite/conformance/interfaces/mmap/18-1.c
testcases/open_posix_testsuite/conformance/interfaces/munlock/11-1.c
testcases/open_posix_testsuite/conformance/interfaces/munlock/7-1.c
testcases/open_posix_testsuite/conformance/interfaces/munlockall/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/1-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/2-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-3.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getinheritsched/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getschedpolicy/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getscope/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getstack/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getstacksize/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setinheritsched/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setinheritsched/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setinheritsched/2-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setinheritsched/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setschedparam/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setschedparam/1-4.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setschedpolicy/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setschedpolicy/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setschedpolicy/speculative/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setscope/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setscope/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setscope/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setstack/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setstack/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setstack/6-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setstack/7-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setstacksize/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setstacksize/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_barrier_wait/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_barrierattr_getpshared/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_cancel/5-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_create/8-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_exit/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_getschedparam/1-3.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_getschedparam/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_join/1-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_join/6-3.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_kill/1-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_kill/8-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_mutexattr_settype/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_mutexattr_settype/3-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_mutexattr_settype/3-3.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_mutexattr_settype/3-4.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-3.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_unlock/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlockattr_init/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/1-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/18-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/7-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_spin_init/2-2.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_spin_lock/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/pthread_spin_unlock/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/raise/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-3.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-4.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-3.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-4.c
testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/6-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/7-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/10-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/20-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/21-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/21-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-3.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-4.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-5.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-6.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-7.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/25-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/25-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/25-3.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/25-4.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/26-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/27-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/9-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/15-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/15-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/16-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/17-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/17-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/17-6.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/17-7.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/19-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/19-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/19-3.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/19-4.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/19-5.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/20-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/21-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/22-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/22-2.c
testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/sched_yield/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_close/3-2.c
testcases/open_posix_testsuite/conformance/interfaces/sem_destroy/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_init/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_init/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_init/2-2.c
testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-2.c
testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-3.c
testcases/open_posix_testsuite/conformance/interfaces/sem_init/7-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_open/1-3.c
testcases/open_posix_testsuite/conformance/interfaces/sem_open/1-4.c
testcases/open_posix_testsuite/conformance/interfaces/sem_open/10-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_open/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_open/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_post/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_post/1-2.c
testcases/open_posix_testsuite/conformance/interfaces/sem_post/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_post/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_post/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_post/6-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_post/8-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/11-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/2-2.c
testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/6-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/6-2.c
testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/9-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-2.c
testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/6-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/7-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/9-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_wait/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_wait/1-2.c
testcases/open_posix_testsuite/conformance/interfaces/sem_wait/11-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_wait/12-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_wait/13-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_wait/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_wait/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/sem_wait/7-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/11-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/13-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/14-2.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/16-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/17-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/18-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/20-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/20-2.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/20-3.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/23-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/26-2.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/28-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/28-2.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/28-3.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/32-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/34-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_open/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_unlink/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_unlink/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_unlink/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_unlink/5-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_unlink/6-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_unlink/8-1.c
testcases/open_posix_testsuite/conformance/interfaces/shm_unlink/9-1.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-1.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-10.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-11.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-12.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-13.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-14.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-15.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-16.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-17.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-18.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-19.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-2.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-20.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-21.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-22.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-23.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-24.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-25.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-26.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-3.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-4.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-5.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-6.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-7.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-8.c
testcases/open_posix_testsuite/conformance/interfaces/sigaction/28-9.c
testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c
testcases/open_posix_testsuite/conformance/interfaces/sigqueue/12-1.c
testcases/open_posix_testsuite/conformance/interfaces/sigqueue/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sigwait/1-1.c
testcases/open_posix_testsuite/conformance/interfaces/sigwait/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/sigwait/3-1.c
testcases/open_posix_testsuite/conformance/interfaces/sigwait/4-1.c
testcases/open_posix_testsuite/conformance/interfaces/sigwait/6-2.c
testcases/open_posix_testsuite/conformance/interfaces/sigwait/8-1.c
testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-4.c
testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-1.c
testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c
testcases/open_posix_testsuite/functional/mqueues/send_rev_2.c
testcases/open_posix_testsuite/functional/semaphores/sem_lock.c
testcases/open_posix_testsuite/functional/threads/pi_test/pitest-5.c
testcases/open_posix_testsuite/functional/timers/clocks/invaliddates.c
testcases/open_posix_testsuite/functional/timers/clocks/twopsetclock.c
testcases/open_posix_testsuite/functional/timers/timers/twoevtimers.c
testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_1.c
testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_2.c
testcases/open_posix_testsuite/stress/semaphores/multi_con_pro.c
testcases/open_posix_testsuite/stress/threads/fork/s-c1.c
testcases/open_posix_testsuite/stress/threads/pthread_cancel/stress.c
testcases/open_posix_testsuite/stress/threads/pthread_getschedparam/stress.c
testcases/open_posix_testsuite/stress/threads/pthread_kill/stress.c
testcases/open_posix_testsuite/stress/threads/pthread_once/stress.c
testcases/open_posix_testsuite/stress/threads/sem_getvalue/stress.c
testcases/open_posix_testsuite/stress/threads/sem_init/s-c1.c
testcases/open_posix_testsuite/stress/threads/sem_open/s-c1.c
diff --git a/tools/rand_lines.c b/tools/rand_lines.c
index ff29786..e3a343c 100644
--- a/tools/rand_lines.c
+++ b/tools/rand_lines.c
@@ -149,21 +149,21 @@
else
Progname++;
- while ((c = getopt (argc, argv, "hgS:l:")) != EOF){
+ while ((c = getopt (argc, argv, "hgS:l:")) != EOF) {
switch(c) {
case 'h':
help();
exit(0);
break;
case 'S': /* seed */
- if ( sscanf(optarg, "%li", &seed) != 1 ) {
+ if (sscanf(optarg, "%li", &seed) != 1) {
fprintf(stderr, "%s: --S option argument is invalid\n", Progname);
exit(1);
}
break;
case 'l': /* number of lines */
- if ( sscanf(optarg, "%i", &lsize) != 1 ) {
+ if (sscanf(optarg, "%i", &lsize) != 1) {
fprintf(stderr, "%s: --s option argument is invalid\n", Progname);
exit(1);
}
@@ -180,17 +180,17 @@
}
}
- if ( optind + 1 != argc ) {
+ if (optind + 1 != argc) {
fprintf(stderr, "%s: Missing argument.\n", Progname);
usage(stderr);
exit(1);
}
- if ( seed == -1 ) {
+ if (seed == -1) {
seed = time(0);
}
- if ( strcmp(argv[argc-1],"-") == 0 ) {
+ if (strcmp(argv[argc-1],"-") == 0) {
infile = stdin;
fprintf(stderr, "%s: Can not support stdin processing.\n",
Progname);
@@ -204,7 +204,7 @@
exit(1);
}
- if ( getfilelines ) {
+ if (getfilelines) {
lsize=get_numlines(infile);
}
@@ -253,7 +253,7 @@
char line[MAX_LN_SZ]; /* max size of a line */
int cnt=0;
- while ( fgets(line, MAX_LN_SZ, infile) != NULL ) {
+ while (fgets(line, MAX_LN_SZ, infile) != NULL) {
cnt++;
}
@@ -287,7 +287,7 @@
struct offset_t *offsets;
int memsize;
- if ( numlines <= 0 ) { /*use default */
+ if (numlines <= 0) { /*use default */
numlines = DEF_SIZE;
}
@@ -297,7 +297,7 @@
*/
memsize = sizeof(struct offset_t)*numlines;
- if ((offsets=(struct offset_t *)malloc(memsize)) == NULL ) {
+ if ((offsets=(struct offset_t *)malloc(memsize)) == NULL) {
fprintf(stderr, "Unable to malloc(%d): errno:%d\n", memsize, errno);
return -1;
}
@@ -306,7 +306,7 @@
coffset=0;
- while ( ! feof(infile) ) {
+ while (! feof(infile)) {
fseek(infile, coffset, SEEK_SET);
coffset=ftell(infile);
@@ -318,9 +318,9 @@
* into offsets array. Only numlines line can be randomized
* at a time.
*/
- while ( cnt < numlines && fgets(line, MAX_LN_SZ, infile) != NULL ) {
+ while (cnt < numlines && fgets(line, MAX_LN_SZ, infile) != NULL) {
- if ( rnd_insert(offsets, coffset, numlines) < 0 ) {
+ if (rnd_insert(offsets, coffset, numlines) < 0) {
fprintf(stderr, "%s:%d rnd_insert() returned -1 (fatal error)!\n",
__FILE__, __LINE__);
abort();
@@ -330,7 +330,7 @@
coffset=ftell(infile);
}
- if ( cnt == 0 ) {
+ if (cnt == 0) {
continue;
}
@@ -339,7 +339,7 @@
*/
for (cnt=0; cnt<numlines; cnt++) {
- if ( offsets[cnt].used ) {
+ if (offsets[cnt].used) {
fseek(infile, offsets[cnt].offset, SEEK_SET);
fgets(line, MAX_LN_SZ, infile);
fputs(line, stdout);
@@ -372,11 +372,11 @@
* Loop looking for random unused index.
* It will only be attempted 75 times.
*/
- while ( quick < 75 ) {
+ while (quick < 75) {
rand_num=random_range(0, size-1, 1, NULL);
- if ( ! offsets[rand_num].used ) {
+ if (! offsets[rand_num].used) {
offsets[rand_num].offset=offset;
offsets[rand_num].used++;
return rand_num;
@@ -391,7 +391,7 @@
for (ind=0; ind < size && offsets[ind].used != 0; ind++)
; /* do nothing */
- if ( ind >= size ) {
+ if (ind >= size) {
/*
* If called with an array where all offsets are used,
* we won't be able to find an open array location.
@@ -444,14 +444,14 @@
int memsize; /* amount of offset space to malloc */
int newbuffer = 1; /* need new buffer */
- if ( numlines <= 0 ) { /*use default */
+ if (numlines <= 0) { /*use default */
numlines = DEF_SIZE;
}
/*
* Malloc space for file contents
*/
- if ((buffer=(char *)malloc(space)) == NULL ) {
+ if ((buffer=(char *)malloc(space)) == NULL) {
fprintf(stderr, "Unable to malloc(%d): errno:%d\n", space, errno);
return -1;
}
@@ -462,7 +462,7 @@
*/
memsize = sizeof(struct offset_t)*numlines;
- if ((offsets=(struct offset_t *)malloc(memsize)) == NULL ) {
+ if ((offsets=(struct offset_t *)malloc(memsize)) == NULL) {
fprintf(stderr, "Unable to malloc(%d): errno:%d\n", memsize, errno);
return -1;
}
@@ -475,7 +475,7 @@
* Loop until read doesn't read anything
* If last line does not end in newline, it is not printed
*/
- while ( loopcntl ) {
+ while (loopcntl) {
/*
* read in file up to space size
* only works if used as filter.
@@ -484,7 +484,7 @@
*/
chr = buffer;
- if ((rdsz=fread((void *)rdbuff, sztord, 1, infile)) == 0 ) {
+ if ((rdsz=fread((void *)rdbuff, sztord, 1, infile)) == 0) {
fprintf(stderr, "input file is empty, done randomizing\n");
loopcntl=0;
return 0;
@@ -494,14 +494,14 @@
loffset= (long)buffer;
- while ( ! newbuffer ) {
+ while (! newbuffer) {
- while ( (long)chr < stopaddr && *chr != '\n' )
+ while ((long)chr < stopaddr && *chr != '\n')
chr++;
chr++;
- if ( (long)chr >= stopaddr ) {
+ if ((long)chr >= stopaddr) {
fprintf(stderr, "end of read in buffer\n");
@@ -510,13 +510,13 @@
*/
for (cnt=0; cnt<numlines; cnt++) {
- if ( offsets[cnt].used ) {
+ if (offsets[cnt].used) {
ptr = (char *)offsets[cnt].offset;
/*
* copy buffer characters into line for printing
*/
lptr = line;
- while ( *ptr != '\n' )
+ while (*ptr != '\n')
*lptr++ = *ptr++;
printf("%s\n", line);
@@ -534,7 +534,7 @@
newbuffer++;
}
- if ( rnd_insert(offsets, loffset, numlines) < 0 ) {
+ if (rnd_insert(offsets, loffset, numlines) < 0) {
fprintf(stderr, "%s:%d rnd_insert() returned -1 (fatal error)!\n",
__FILE__, __LINE__);
abort();