summaryrefslogtreecommitdiff
path: root/systemv
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-10-01 03:01:10 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-10-01 03:01:10 +0000
commit5a9febac19255ab8aea598449ea63bda730b2fe0 (patch)
tree1ca7eead0982e5b8893cadd8b2215d1ea96171f7 /systemv
parent37e7e6e0b27c7db3be8e160e87a63fec66e0fcca (diff)
Merge changes from CUPS 1.7svn-r10629.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3933 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'systemv')
-rw-r--r--systemv/cupstestppd.c18
-rw-r--r--systemv/lpstat.c4
2 files changed, 11 insertions, 11 deletions
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index 6e5c50de9..491b14640 100644
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1880,7 +1880,7 @@ check_constraints(ppd_file_t *ppd, /* I - PPD file */
if (!_cups_strncasecmp(option, "Custom", 6) && !_cups_strcasecmp(choice, "True"))
{
_cups_strcpy(option, option + 6);
- strcpy(choice, "Custom");
+ strlcpy(choice, "Custom", sizeof(choice));
}
if ((o = ppdFindOption(ppd, option)) == NULL)
@@ -1981,13 +1981,13 @@ check_constraints(ppd_file_t *ppd, /* I - PPD file */
if (!_cups_strncasecmp(c->option1, "Custom", 6) &&
!_cups_strcasecmp(c->choice1, "True"))
{
- strcpy(option, c->option1 + 6);
- strcpy(choice, "Custom");
+ strlcpy(option, c->option1 + 6, sizeof(option));
+ strlcpy(choice, "Custom", sizeof(choice));
}
else
{
- strcpy(option, c->option1);
- strcpy(choice, c->choice1);
+ strlcpy(option, c->option1, sizeof(option));
+ strlcpy(choice, c->choice1, sizeof(choice));
}
if ((o = ppdFindOption(ppd, option)) == NULL)
@@ -2022,13 +2022,13 @@ check_constraints(ppd_file_t *ppd, /* I - PPD file */
if (!_cups_strncasecmp(c->option2, "Custom", 6) &&
!_cups_strcasecmp(c->choice2, "True"))
{
- strcpy(option, c->option2 + 6);
- strcpy(choice, "Custom");
+ strlcpy(option, c->option2 + 6, sizeof(option));
+ strlcpy(choice, "Custom", sizeof(choice));
}
else
{
- strcpy(option, c->option2);
- strcpy(choice, c->choice2);
+ strlcpy(option, c->option2, sizeof(option));
+ strlcpy(choice, c->choice2, sizeof(choice));
}
if ((o = ppdFindOption(ppd, option)) == NULL)
diff --git a/systemv/lpstat.c b/systemv/lpstat.c
index 20ef8bf00..fd36fe898 100644
--- a/systemv/lpstat.c
+++ b/systemv/lpstat.c
@@ -1437,7 +1437,7 @@ show_jobs(const char *dests, /* I - Destinations */
*/
if (!strftime(date, sizeof(date), "%b %d %H:%M", jobdate))
- strcpy(date, "Unknown");
+ strlcpy(date, "Unknown", sizeof(date));
_cupsLangPrintf(stdout, "%s;%s;%d;%s;%s",
temp, username ? username : "unknown",
@@ -1446,7 +1446,7 @@ show_jobs(const char *dests, /* I - Destinations */
else
{
if (!strftime(date, sizeof(date), "%c", jobdate))
- strcpy(date, "Unknown");
+ strlcpy(date, "Unknown", sizeof(date));
if (ranking)
_cupsLangPrintf(stdout, "%3d %-21s %-13s %8.0f %s",