fixes an issue which caused an extra space to be printed after day number indicator when highlighted current day was friday. closes ashkang#1

Author: Ashkan Ghassemi

.gitignore

@@ -48,3 +48,4 @@ test_kit/jyinfo
 test_kit/leap
 test_kit/sec_converter
 docs/genpages.sh
+sources/compile

sources/libjalali/Makefile.am

@@ -14,7 +14,7 @@ libjalali_la_SOURCES = jalali.c jtime.c
 #      compatible (have not removed a function from the API, for
 #      example...)
 
-libjalali_la_LDFLAGS = -version-info 0:2:0
+libjalali_la_LDFLAGS = -version-info 0:5:0
 includedir= $(prefix)/include/jalali
 include_HEADERS = jalali.h jtime.h jconfig.h
 INCLUDES        =  -I. -I@includedir@

sources/libjalali/jalali.c

@@ -46,8 +46,7 @@ extern char* tzname[2];
  * The current 2820 year period started in the year AP 475 (AD 1096).
  */
 
-int
-jalali_is_jleap(int year)
+int jalali_is_jleap(int year)
 {
     int pr = year;
 
@@ -110,8 +109,7 @@ jalali_is_jleap(int year)
  * Creates absolute values for day, hour, minute and seconds from time_t.
  * Values are signed integers.
  */
-void
-jalali_create_time_from_secs(time_t t, struct ab_jtm* d)
+void jalali_create_time_from_secs(time_t t, struct ab_jtm* d)
 {
     d->ab_days = (t >= 0) ? (t / (time_t) J_DAY_LENGTH_IN_SECONDS) :
         ((t - (time_t) J_DAY_LENGTH_IN_SECONDS + (time_t) 1) /
@@ -137,8 +135,7 @@ jalali_create_time_from_secs(time_t t, struct ab_jtm* d)
  * Creates a timestamp from day, hour, minute and seconds.
  * Values are signed integers.
  */
-time_t
-jalali_create_secs_from_time(const struct ab_jtm* d)
+time_t jalali_create_secs_from_time(const struct ab_jtm* d)
 {
     return (time_t)
         ((time_t) d->ab_days * (time_t) J_DAY_LENGTH_IN_SECONDS +
@@ -152,8 +149,7 @@ jalali_create_secs_from_time(const struct ab_jtm* d)
  * Alters only tm_mday and tm_mon.
  * Zero on success, -1 on failure.
  */
-int
-jalali_create_date_from_days(struct jtm* j)
+int jalali_create_date_from_days(struct jtm* j)
 {
     int p = j->tm_yday;
     if (p > 365 || p < 0)
@@ -179,8 +175,7 @@ jalali_create_date_from_days(struct jtm* j)
 /*
  * Calculate day of year (0-365) based on month and day.
  */
-int
-jalali_create_days_from_date(struct jtm* j)
+int jalali_create_days_from_date(struct jtm* j)
 {
     int p = 0;
     int i;
@@ -207,8 +202,7 @@ jalali_create_days_from_date(struct jtm* j)
  * 3. Passed and remaining leap years in grand leap cycle. -pl, -rl
  * 4. Absolute passed leap years since grand leap cycle epoch (AP 475). -apl
  */
-void
-jalali_get_jyear_info(struct jyinfo* year)
+void jalali_get_jyear_info(struct jyinfo* year)
 {
     int y = year->y;
     year->lf = jalali_is_jleap(year->y);
@@ -245,8 +239,7 @@ jalali_get_jyear_info(struct jyinfo* year)
  * Calculates date (Jalali) based on difference factor from UTC Epoch by days.
  * 0 means 1 January 1970 (11 Dey 1348).
  */
-void
-jalali_get_date(int p, struct jtm* j)
+void jalali_get_date(int p, struct jtm* j)
 {
     time_t t;
     struct tm lt;
@@ -304,8 +297,7 @@ jalali_get_date(int p, struct jtm* j)
 /*
  * Calculates UTC epoch difference of a desired date by measure of days.
  */
-int
-jalali_get_diff(const struct jtm* j)
+int jalali_get_diff(const struct jtm* j)
 {
     int p = 0;
     int i;
@@ -349,8 +341,8 @@ jalali_get_diff(const struct jtm* j)
 /*
  * Updates a jalali date struct fields based on tm_year, tm_mon and tm_mday
  */
-void
-jalali_update(struct jtm* jtm) {
+void jalali_update(struct jtm* jtm)
+{
     int d;
 
     jalali_create_days_from_date(jtm);
@@ -362,8 +354,8 @@ jalali_update(struct jtm* jtm) {
  * Displays a jalali date struct fields.
  * should be used for debugging purposes only.
  */
-void
-jalali_show_time(const struct jtm* j) {
+void jalali_show_time(const struct jtm* j)
+{
     printf("%d/%02d/%02d (%02d:%02d:%02d) [%d]",
            j->tm_year, j->tm_mon + 1, j->tm_mday, j->tm_hour, j->tm_min,
            j->tm_sec, j->tm_wday);

sources/libjalali/jtime.c

@@ -67,8 +67,8 @@ static struct jtm in_jtm;
 
 extern char* tzname[2];
 
-void
-in_jasctime(const struct jtm* jtm, char* buf) {
+void in_jasctime(const struct jtm* jtm, char* buf)
+{
     if (!jtm)
         return;
 
@@ -96,8 +96,8 @@ in_jasctime(const struct jtm* jtm, char* buf) {
     }
 }
 
-void
-in_jlocaltime(const time_t* timep, struct jtm* result) {
+void in_jlocaltime(const time_t* timep, struct jtm* result)
+{
     if (!timep)
         return;
 
@@ -143,8 +143,8 @@ in_jlocaltime(const time_t* timep, struct jtm* result) {
     memcpy(&in_jtm, &c_jtm, sizeof(struct jtm));
 }
 
-void
-in_jctime(const time_t* timep, char* buf) {
+void in_jctime(const time_t* timep, char* buf)
+{
     if (!timep)
         return;
 
@@ -159,8 +159,8 @@ in_jctime(const time_t* timep, char* buf) {
     }
 }
 
-void
-in_jgmtime(const time_t* timep, struct jtm* result) {
+void in_jgmtime(const time_t* timep, struct jtm* result)
+{
     if (!timep)
         return;
 
@@ -191,43 +191,43 @@ in_jgmtime(const time_t* timep, struct jtm* result) {
     memcpy(&in_jtm, &c_jtm, sizeof(struct jtm));
 }
 
-char*
-jasctime(const struct jtm* jtm) {
+char* jasctime(const struct jtm* jtm)
+{
     if (!jtm)
         return 0;
 
     in_jasctime(jtm, 0);
     return in_buf;
 }
 
-char*
-jctime(const time_t* timep) {
+char* jctime(const time_t* timep)
+{
     if (!timep)
         return 0;
 
     in_jctime(timep, 0);
     return in_buf;
 }
 
-struct jtm*
-jgmtime(const time_t* timep) {
+struct jtm* jgmtime(const time_t* timep)
+{
     if (!timep)
         return 0;
     in_jgmtime(timep, 0);
     return &in_jtm;
 }
 
-struct jtm*
-jlocaltime(const time_t* timep) {
+struct jtm* jlocaltime(const time_t* timep)
+{
     if (!timep)
         return 0;
 
     in_jlocaltime(timep, 0);
     return &in_jtm;
 }
 
-time_t
-jmktime(const struct jtm* jtm) {
+time_t jmktime(const struct jtm* jtm)
+{
     if (!jtm)
         return (time_t) (-1);
     tzset();
@@ -242,8 +242,8 @@ jmktime(const struct jtm* jtm) {
     return t;
 }
 
-size_t
-jstrftime(char* s, size_t max, const char* format, const struct jtm* jtm) {
+size_t jstrftime(char* s, size_t max, const char* format, const struct jtm* jtm)
+{
     if (!s || max <= 0 || !format || !jtm)
         return -1;
 
@@ -641,8 +641,8 @@ jstrftime(char* s, size_t max, const char* format, const struct jtm* jtm) {
     return rb;
 }
 
-char*
-jstrptime(const char* s, const char* format, struct jtm* jtm) {
+char* jstrptime(const char* s, const char* format, struct jtm* jtm)
+{
     char buf[MAX_BUF_SIZE];
     char delim[MAX_BUF_SIZE];
 
@@ -844,8 +844,8 @@ jstrptime(const char* s, const char* format, struct jtm* jtm) {
     return (char*) &s[s_s];
 }
 
-char*
-jasctime_r(const struct jtm* jtm, char* buf) {
+char* jasctime_r(const struct jtm* jtm, char* buf)
+{
     if (!jtm || !buf)
         return 0;
 
@@ -854,8 +854,8 @@ jasctime_r(const struct jtm* jtm, char* buf) {
     return in_buf;
 }
 
-struct jtm*
-jlocaltime_r(const time_t* timep, struct jtm* result) {
+struct jtm* jlocaltime_r(const time_t* timep, struct jtm* result)
+{
     if (!timep || !result)
         return 0;
 
@@ -864,8 +864,8 @@ jlocaltime_r(const time_t* timep, struct jtm* result) {
     return &in_jtm;
 }
 
-struct jtm*
-jgmtime_r(const time_t* timep, struct jtm* result) {
+struct jtm* jgmtime_r(const time_t* timep, struct jtm* result)
+{
     if (!timep || !result)
         return 0;
 
@@ -874,8 +874,8 @@ jgmtime_r(const time_t* timep, struct jtm* result) {
     return &in_jtm;
 }
 
-char*
-jctime_r(const time_t* timep, char* buf) {
+char* jctime_r(const time_t* timep, char* buf)
+{
     if (!timep || !buf)
         return 0;
 
@@ -890,8 +890,12 @@ jctime_r(const time_t* timep, char* buf) {
  * jalali_to_farsi() converts an integer's digits to Arabic-Indic
  * padding works just like printf() field width.
  */
-int jalali_to_farsi(char* buf, size_t n, int padding, char* pad,
-                    int d) {
+int jalali_to_farsi(char* buf,
+                    size_t n,
+                    int padding,
+                    char* pad,
+                    int d)
+{
     char _buf[100] = {0};
     int i=0, j=0;
     int p = 0;

sources/src/jcal.c

@@ -148,8 +148,7 @@ int is_in_margin(struct cal_layout* l,
  * @Should not be used directly. (See display_cal())
  */
 
-void show_cal_matrix(struct cal_layout* l,
-                     struct cal_matrix* mat)
+void show_cal_matrix(struct cal_layout* l, struct cal_matrix* mat)
 {
     int i, j, m;
     char buf[100];
@@ -264,8 +263,7 @@ void show_cal_matrix(struct cal_layout* l,
  * and height according to number of calendars.
  */
 
-void create_cal_matrix(struct cal_layout* l,
-                       struct cal_matrix* mat)
+void create_cal_matrix(struct cal_layout* l, struct cal_matrix* mat)
 {
     mat->width = (mat->n * 7) + ((mat->n - 1) * l->margin) ;
     mat->height = 6;
@@ -407,8 +405,7 @@ void show_cal(struct cal_layout* l,
  * screen according to a given jalali date.
  */
 
-void show_3(struct cal_layout* l, 
-            struct jtm* j)
+void show_3(struct cal_layout* l, struct jtm* j)
 {
     struct jtm** _j;
     struct cal_matrix m;
@@ -451,8 +448,7 @@ void show_3(struct cal_layout* l,
  * Displays a calendar on standard screen according to a given jalali date.
  */
 
-void show_1(struct cal_layout* l,
-            struct jtm* j)
+void show_1(struct cal_layout* l, struct jtm* j)
 {
     struct jtm** _j;
     struct cal_matrix m;
@@ -476,8 +472,7 @@ void show_1(struct cal_layout* l,
  * to a given jalali date.
  */
 
-void show_year(struct cal_layout* l,
-               struct jtm* j)
+void show_year(struct cal_layout* l, struct jtm* j)
 {
     struct jtm _j[4];
 

sources/src/jcal.h

@@ -55,25 +55,20 @@ int is_in_margin(struct cal_layout* l,
                  struct cal_matrix* mat,
                  int c);
 
-void show_cal_matrix(struct cal_layout* l,
-                     struct cal_matrix* mat);
+void show_cal_matrix(struct cal_layout* l, struct cal_matrix* mat);
 
-void create_cal_matrix(struct cal_layout* l,
-                       struct cal_matrix* mat);
+void create_cal_matrix(struct cal_layout* l, struct cal_matrix* mat);
 
 void destroy_cal_matrix(struct cal_matrix* mat);
 
 void show_cal(struct cal_layout* l,
               struct cal_matrix* m,
               struct jtm** _j);
 
-void show_3(struct cal_layout* l,
-            struct jtm* j);
+void show_3(struct cal_layout* l, struct jtm* j);
 
-void show_1(struct cal_layout* l,
-            struct jtm* j);
+void show_1(struct cal_layout* l, struct jtm* j);
 
-void show_year(struct cal_layout* l,
-               struct jtm* j);
+void show_year(struct cal_layout* l, struct jtm* j);
 
 #endif /* JCAL_H */

sources/src/jdate.c

@@ -44,9 +44,7 @@ extern char* optarg;
  * otherwise: st_atime (last access time)
  */
 
-int mod_time(const char* path,
-             time_t* t,
-             int a)
+int mod_time(const char* path, time_t* t, int a)
 {
     struct stat st;
     int err;