mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 04:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moved time related stuff from lib/util.[ch] into lib/timefmt.[ch].

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2010-11-09 21:50:25 +03:00
parent 97aa4e99c9
commit 53ad349a36
9 changed files with 152 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.am
View File

@ -25,7 +25,7 @@ libmc_la_SOURCES = \
glibcompat.c glibcompat.h \
global.h \
lock.c lock.h \
timefmt.h
timefmt.c timefmt.h
if USE_MAINTAINER_MODE
libmc_la_SOURCES += logging.c logging.h

136
lib/timefmt.c Normal file
View File

@ -0,0 +1,136 @@
/* Time formatting functions
Copyright (C) 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
2004, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
Written 1994, 1995, 1996 by:
Miguel de Icaza, Janne Kukonlehto, Dugan Porter,
Jakub Jelinek, Mauricio Plaza.
The file_date routine is mostly from GNU's fileutils package,
written by Richard Stallman and David MacKenzie.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/** \file
* \brief Source: time formatting functions
*/
#include <config.h>
#include <stdlib.h>
#include "lib/global.h"
#include "lib/strutil.h"
#include "lib/timefmt.h"
/*** global variables ****************************************************************************/
char *user_recent_timeformat = NULL; /* time format string for recent dates */
char *user_old_timeformat = NULL; /* time format string for older dates */
/*** file scope macro definitions ****************************************************************/
/*** file scope type declarations ****************************************************************/
/*** file scope variables ************************************************************************/
/*
* Cache variable for the i18n_checktimelength function,
* initially set to a clearly invalid value to show that
* it hasn't been initialized yet.
*/
static size_t i18n_timelength_cache = MAX_I18NTIMELENGTH + 1;
/*** file scope functions ************************************************************************/
/*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */
/**
* Check strftime() results. Some systems (i.e. Solaris) have different
* short-month and month name sizes for different locales
*/
size_t
i18n_checktimelength (void)
{
size_t length = 0;
const time_t testtime = time (NULL);
struct tm *lt = localtime (&testtime);
if (i18n_timelength_cache <= MAX_I18NTIMELENGTH)
return i18n_timelength_cache;
if (lt == NULL)
{
/* huh, localtime() doesnt seem to work ... falling back to "(invalid)" */
length = str_term_width1 (_(INVALID_TIME_TEXT));
}
else
{
char buf[MB_LEN_MAX * MAX_I18NTIMELENGTH + 1];
/* We are interested in the longest possible date */
lt->tm_sec = lt->tm_min = lt->tm_hour = lt->tm_mday = 10;
/* Loop through all months to find out the longest one */
for (lt->tm_mon = 0; lt->tm_mon < 12; lt->tm_mon++)
{
strftime (buf, sizeof (buf) - 1, user_recent_timeformat, lt);
length = max ((size_t) str_term_width1 (buf), length);
strftime (buf, sizeof (buf) - 1, user_old_timeformat, lt);
length = max ((size_t) str_term_width1 (buf), length);
}
length = max ((size_t) str_term_width1 (_(INVALID_TIME_TEXT)), length);
}
/* Don't handle big differences. Use standard value (email bug, please) */
if (length > MAX_I18NTIMELENGTH || length < MIN_I18NTIMELENGTH)
length = STD_I18NTIMELENGTH;
/* Save obtained value to the cache */
i18n_timelength_cache = length;
return i18n_timelength_cache;
}
/* --------------------------------------------------------------------------------------------- */
const char *
file_date (time_t when)
{
static char timebuf[MB_LEN_MAX * MAX_I18NTIMELENGTH + 1];
time_t current_time = time ((time_t) 0);
const char *fmt;
if (current_time > when + 6L * 30L * 24L * 60L * 60L /* Old. */
|| current_time < when - 60L * 60L) /* In the future. */
/* The file is fairly old or in the future.
POSIX says the cutoff is 6 months old;
approximate this by 6*30 days.
Allow a 1 hour slop factor for what is considered "the future",
to allow for NFS server/client clock disagreement.
Show the year instead of the time of day. */
fmt = user_old_timeformat;
else
fmt = user_recent_timeformat;
FMT_LOCALTIME (timebuf, sizeof (timebuf), fmt, when);
return timebuf;
}
/* --------------------------------------------------------------------------------------------- */

13
lib/timefmt.h
View File

@ -1,6 +1,6 @@
/** \file timefmt.h
* \brief Header: time formating macroses
* \brief Header: time formating functions
*/
#ifndef MC__UTIL_TIMEFMT_H
@ -11,6 +11,9 @@
/*** typedefs(not structures) and defined constants **********************************************/
#define MAX_I18NTIMELENGTH 20
#define MIN_I18NTIMELENGTH 10
#define STD_I18NTIMELENGTH 12
#define INVALID_TIME_TEXT "(invalid)"
@ -43,8 +46,14 @@
/*** global variables defined in .c file *********************************************************/
extern char *user_recent_timeformat; /* time format string for recent dates */
extern char *user_old_timeformat; /* time format string for older dates */
/*** declarations of public functions ************************************************************/
size_t i18n_checktimelength (void);
const char *file_date (time_t);
/*** inline functions ****************************************************************************/
#endif /* !__UTIL_H */
#endif /* MC__UTIL_TIMEFMT_H */

86
lib/util.c
View File

@ -57,9 +57,6 @@
/*** global variables ****************************************************************************/
char *user_recent_timeformat = NULL; /* time format string for recent dates */
char *user_old_timeformat = NULL; /* time format string for older dates */
/*** file scope macro definitions ****************************************************************/
#define ismode(n,m) ((n & m) == m)
@ -80,13 +77,6 @@ char *user_old_timeformat = NULL; /* time format string for older dates */
/*** file scope variables ************************************************************************/
/*
* Cache variable for the i18n_checktimelength function,
* initially set to a clearly invalid value to show that
* it hasn't been initialized yet.
*/
static size_t i18n_timelength_cache = MAX_I18NTIMELENGTH + 1;
/*** file scope functions ************************************************************************/
/* --------------------------------------------------------------------------------------------- */
@ -842,82 +832,6 @@ load_mc_home_file (const char *from, const char *filename, char **allocated_file
return data;
}
/* --------------------------------------------------------------------------------------------- */
/**
* Check strftime() results. Some systems (i.e. Solaris) have different
* short-month and month name sizes for different locales
*/
size_t
i18n_checktimelength (void)
{
size_t length = 0;
const time_t testtime = time (NULL);
struct tm *lt = localtime (&testtime);
if (i18n_timelength_cache <= MAX_I18NTIMELENGTH)
return i18n_timelength_cache;
if (lt == NULL)
{
/* huh, localtime() doesnt seem to work ... falling back to "(invalid)" */
length = str_term_width1 (_(INVALID_TIME_TEXT));
}
else
{
char buf[MB_LEN_MAX * MAX_I18NTIMELENGTH + 1];
/* We are interested in the longest possible date */
lt->tm_sec = lt->tm_min = lt->tm_hour = lt->tm_mday = 10;
/* Loop through all months to find out the longest one */
for (lt->tm_mon = 0; lt->tm_mon < 12; lt->tm_mon++)
{
strftime (buf, sizeof (buf) - 1, user_recent_timeformat, lt);
length = max ((size_t) str_term_width1 (buf), length);
strftime (buf, sizeof (buf) - 1, user_old_timeformat, lt);
length = max ((size_t) str_term_width1 (buf), length);
}
length = max ((size_t) str_term_width1 (_(INVALID_TIME_TEXT)), length);
}
/* Don't handle big differences. Use standard value (email bug, please) */
if (length > MAX_I18NTIMELENGTH || length < MIN_I18NTIMELENGTH)
length = STD_I18NTIMELENGTH;
/* Save obtained value to the cache */
i18n_timelength_cache = length;
return i18n_timelength_cache;
}
/* --------------------------------------------------------------------------------------------- */
const char *
file_date (time_t when)
{
static char timebuf[MB_LEN_MAX * MAX_I18NTIMELENGTH + 1];
time_t current_time = time ((time_t) 0);
const char *fmt;
if (current_time > when + 6L * 30L * 24L * 60L * 60L /* Old. */
|| current_time < when - 60L * 60L) /* In the future. */
/* The file is fairly old or in the future.
POSIX says the cutoff is 6 months old;
approximate this by 6*30 days.
Allow a 1 hour slop factor for what is considered "the future",
to allow for NFS server/client clock disagreement.
Show the year instead of the time of day. */
fmt = user_old_timeformat;
else
fmt = user_recent_timeformat;
FMT_LOCALTIME (timebuf, sizeof (timebuf), fmt, when);
return timebuf;
}
/* --------------------------------------------------------------------------------------------- */
const char *

12
lib/util.h
View File

@ -13,13 +13,8 @@
#include <sys/stat.h>
#include <unistd.h>
/*** typedefs(not structures) and defined constants **********************************************/
#define MAX_I18NTIMELENGTH 20
#define MIN_I18NTIMELENGTH 10
#define STD_I18NTIMELENGTH 12
#ifndef MAXSYMLINKS
#define MAXSYMLINKS 32
#endif
@ -88,9 +83,6 @@ enum compression_type
/*** global variables defined in .c file *********************************************************/
extern char *user_recent_timeformat; /* time format string for recent dates */
extern char *user_old_timeformat; /* time format string for older dates */
extern struct sigaction startup_handler;
/*** declarations of public functions ************************************************************/
@ -189,10 +181,6 @@ void init_uid_gid_cache (void);
char *get_group (int);
char *get_owner (int);
size_t i18n_checktimelength (void);
const char *file_date (time_t);
int exist_file (const char *name);
/* Check if the file exists. If not copy the default */

1
src/filegui.c
View File

@ -84,6 +84,7 @@
#include "lib/vfs/mc-vfs/vfs.h"
#include "lib/strescape.h"
#include "lib/strutil.h"
#include "lib/timefmt.h" /* file_date() */
#include "setup.h" /* verbose */
#include "dialog.h" /* do_refresh() */

1
src/info.c
View File

@ -32,6 +32,7 @@
#include "lib/tty/mouse.h" /* Gpm_Event */
#include "lib/skin.h"
#include "lib/strutil.h"
#include "lib/timefmt.h" /* file_date() */
#include "dialog.h"
#include "widget.h" /* default_proc */

1
src/screen.c
View File

@ -42,6 +42,7 @@
#include "lib/mcconfig.h"
#include "lib/vfs/mc-vfs/vfs.h"
#include "lib/unixcompat.h"
#include "lib/timefmt.h"
#include "dir.h"
#include "panel.h"

2
src/setup.c
View File

@ -34,7 +34,7 @@
#include "lib/tty/key.h"
#include "lib/mcconfig.h"
#include "lib/fileloc.h"
#include "lib/util.h" /* time formats */
#include "lib/timefmt.h"
#include "lib/vfs/mc-vfs/vfs.h"