aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2012-11-16 15:36:01 -0600
committerRob Landley <rob@landley.net>2012-11-16 15:36:01 -0600
commitf6261b3a80a29da78d8b6976ceeb71dcb30f3745 (patch)
treeeecfed925ef90cf1dc9bebe12038a1f3fbb4ca38
parentea52189f6d88673c7d380d4808f8f78063ad5042 (diff)
downloadtoybox-f6261b3a80a29da78d8b6976ceeb71dcb30f3745.tar.gz
Refactor touch (cleanup whitespace, brackets, function order), code otherwise same.
-rw-r--r--toys/posix/touch.c158
1 files changed, 77 insertions, 81 deletions
diff --git a/toys/posix/touch.c b/toys/posix/touch.c
index 3f2becb5..9b8f7932 100644
--- a/toys/posix/touch.c
+++ b/toys/posix/touch.c
@@ -1,7 +1,7 @@
/* vi: set sw=4 ts=4:
*
* touch.c : change timestamp of a file
- * Copyright 2012 Choubey Ji <warior.linux@gmail.com>
+ * Copyright 2012 Choubey Ji <warior.linux@gmail.com>
*
* See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/touch.html
@@ -16,83 +16,18 @@ config TOUCH
-m change only the modification time
-r, --reference=FILE use this file's times instead of current time
-t STAMP use [[CC]YY]MMDDhhmm[.ss] instead of current time
-
*/
-
#include "toys.h"
-time_t get_time_sec(char *);
-
-void touch_main(void){
- int fd, touch_flag_t = 0, touch_flag_m = 0, touch_flag_r = 0;
- time_t now;
- struct utimbuf modinfo;
- struct stat filestat;
- if(!toys.optflags){
- time(&now);
- modinfo.modtime = now;
- modinfo.actime = now;
- }else{
- if(toys.optflags & 1){
- touch_flag_t = 1;
- if((toys.optflags >> 2) & 1){
- touch_flag_m = 1;
- }
- }
-
- if((toys.optflags >> 1) & 1)
- touch_flag_r = 1;
-
- if(toys.optflags >> 2)
- touch_flag_m = 1;
- }
-
- if(touch_flag_t){
- if(!check_date_format(toys.optargs[0])){
- modinfo.modtime = get_time_sec((char *)toys.optargs[0]);
- modinfo.actime = get_time_sec(toys.optargs[0]);
- }else{
- perror_msg("Invalid date format, -t [yyyyMMddhhmm.ss]");
- toys.exitval = EXIT_FAILURE;
- }
- }
- if(touch_flag_r){
- if(stat(toys.optargs[0], &filestat) < 0){
- printf("Error : unable to get information for file %s\n", toys.optargs[0]);
- toys.exitval = EXIT_FAILURE;
- }
- modinfo.modtime = filestat.st_mtime;
- modinfo.actime = filestat.st_atime;
- }
- if(touch_flag_m){
- if(stat(toys.optargs[toys.optc - 1], &filestat) < 0){
- toys.exitval = EXIT_FAILURE;
- return;
- }
- modinfo.actime = filestat.st_atime;
- if(!(touch_flag_r | touch_flag_t)){
- time(&now);
- modinfo.modtime = now;
- }
- }
- if(utime(toys.optargs[toys.optc - 1], &modinfo) == -1){
- if((fd = open(toys.optargs[toys.optc - 1],O_CREAT |O_RDWR, 0644)) != -1){
- close(fd);
- utime(toys.optargs[toys.optc - 1], &modinfo);
- }else{
- perror("unable to create the file");
- toys.exitval = EXIT_FAILURE;
- }
- }
-}
-
-int check_date_format(char *date_input){
+int check_date_format(char *date_input)
+{
int count_date_digit = 0;
unsigned long long flag_b4_sec;
int flag_af_sec;
char *date_store = (char *)malloc(12 * sizeof(char));
- while(date_input[count_date_digit] != '.'){
+
+ while(date_input[count_date_digit] != '.') {
date_store[count_date_digit] = date_input[count_date_digit];
count_date_digit++;
}
@@ -102,16 +37,14 @@ int check_date_format(char *date_input){
date_store[1] = date_input[count_date_digit];
date_store[2] = '\0';
flag_af_sec = atoi(date_store);
- if(date_store[0] == '0' && date_store[1] == '0')
- flag_af_sec = 1;
- if(flag_b4_sec && flag_af_sec)
- return 0;
- else
- return -1;
+ if(date_store[0] == '0' && date_store[1] == '0') flag_af_sec = 1;
+ if(flag_b4_sec && flag_af_sec) return 0;
+ else return -1;
}
/* function to return number of seconds since epoch till the given date */
-time_t get_time_sec(char *date_input){
+time_t get_time_sec(char *date_input)
+{
int count_date_digit = 0;
char temp_date[12];
char mm[2];
@@ -121,12 +54,12 @@ time_t get_time_sec(char *date_input){
char year[4];
time_t time_of_modify;
struct tm t_yyyymmddhhss;
- while(date_input[count_date_digit] != '.'){
- if(count_date_digit < 4){
+
+ while(date_input[count_date_digit] != '.') {
+ if(count_date_digit < 4)
year[count_date_digit] = date_input[count_date_digit];
- }
count_date_digit++;
- if(count_date_digit == 4){
+ if(count_date_digit == 4) {
year[count_date_digit] = '\0';
t_yyyymmddhhss.tm_year = atoi(year)-1900;
break;
@@ -155,3 +88,66 @@ time_t get_time_sec(char *date_input){
time_of_modify = mktime(&t_yyyymmddhhss);
return time_of_modify;
}
+
+void touch_main(void)
+{
+ int fd, touch_flag_t = 0, touch_flag_m = 0, touch_flag_r = 0;
+ time_t now;
+ struct utimbuf modinfo;
+ struct stat filestat;
+
+ if (!toys.optflags) {
+ time(&now);
+ modinfo.modtime = now;
+ modinfo.actime = now;
+ } else {
+ if (toys.optflags & 1) {
+ touch_flag_t = 1;
+ if ((toys.optflags >> 2) & 1) touch_flag_m = 1;
+ }
+
+ if ((toys.optflags >> 1) & 1) touch_flag_r = 1;
+
+ if (toys.optflags >> 2) touch_flag_m = 1;
+ }
+
+ if (touch_flag_t) {
+ if (!check_date_format(toys.optargs[0])) {
+ modinfo.modtime = get_time_sec((char *)toys.optargs[0]);
+ modinfo.actime = get_time_sec(toys.optargs[0]);
+ } else {
+ perror_msg("Invalid date format, -t [yyyyMMddhhmm.ss]");
+ toys.exitval = EXIT_FAILURE;
+ }
+ }
+ if(touch_flag_r) {
+ if(stat(toys.optargs[0], &filestat) < 0) {
+ printf("Error : unable to get information for file %s\n", toys.optargs[0]);
+ toys.exitval = EXIT_FAILURE;
+ }
+ modinfo.modtime = filestat.st_mtime;
+ modinfo.actime = filestat.st_atime;
+ }
+ if(touch_flag_m) {
+ if(stat(toys.optargs[toys.optc - 1], &filestat) < 0) {
+ toys.exitval = EXIT_FAILURE;
+ return;
+ }
+ modinfo.actime = filestat.st_atime;
+ if(!(touch_flag_r | touch_flag_t)) {
+ time(&now);
+ modinfo.modtime = now;
+ }
+ }
+ if (utime(toys.optargs[toys.optc - 1], &modinfo) == -1) {
+ if ((fd = open(toys.optargs[toys.optc - 1],O_CREAT |O_RDWR, 0644)) != -1) {
+ close(fd);
+ utime(toys.optargs[toys.optc - 1], &modinfo);
+ } else {
+ perror("unable to create the file");
+ toys.exitval = EXIT_FAILURE;
+ }
+ }
+}
+
+