projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
lib
/
strftime.c
diff --git
a/lib/strftime.c
b/lib/strftime.c
index
c136125
..
45173dc
100644
(file)
--- a/
lib/strftime.c
+++ b/
lib/strftime.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,98
,99
Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@
-10,8
+10,8
@@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
+
Library
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
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
@@
-100,7
+100,7
@@
extern char *tzname[];
#endif
#ifndef __P
#endif
#ifndef __P
-# if defined
(__GNUC__) || (defined (__STDC__)
&& __STDC__)
+# if defined
__GNUC__ || (defined __STDC__
&& __STDC__)
# define __P(args) args
# else
# define __P(args) ()
# define __P(args) args
# else
# define __P(args) ()
@@
-1025,7
+1025,6
@@
my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp
add (1, *p = '\t');
break;
add (1, *p = '\t');
break;
- case 'f':
case 'u': /* POSIX.2 extension. */
DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);
case 'u': /* POSIX.2 extension. */
DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);
@@
-1220,7
+1219,7
@@
my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp
}
}
}
}
- if (p &&
i < maxsize
)
+ if (p &&
maxsize != 0
)
*p = '\0';
return i;
}
*p = '\0';
return i;
}