Skip to content

Use cupsGetFile() API #1193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zdohnal merged 1 commit into from
Mar 11, 2025
Merged

Use cupsGetFile() API #1193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 12 additions & 32 deletions cgi-bin/admin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,34 +938,22 @@ do_am_printer(http_t *http, /* I - HTTP connection */
int fd; /* PPD file */
char filename[1024]; /* PPD filename */
ppd_file_t *ppd; /* PPD information */
char buffer[1024]; /* Buffer */
ssize_t bytes; /* Number of bytes */
http_status_t get_status; /* Status of GET */


/* TODO: Use cupsGetFile() API... */
snprintf(uri, sizeof(uri), "/printers/%s.ppd", name);

if (httpGet(http, uri))
httpGet(http, uri);

while ((get_status = httpUpdate(http)) == HTTP_STATUS_CONTINUE);

if (get_status != HTTP_STATUS_OK)
if ((fd = cupsCreateTempFd(NULL, NULL, filename, sizeof(filename))) < 0)
{
httpFlush(http);

fprintf(stderr, "ERROR: Unable to get PPD file %s: %d - %s\n",
uri, get_status, httpStatus(get_status));
fprintf(stderr, "ERROR: Unable to create temporary file: %s\n",
strerror(errno));
}
else if ((fd = cupsTempFd(filename, sizeof(filename))) >= 0)
else
{
while ((bytes = httpRead2(http, buffer, sizeof(buffer))) > 0)
write(fd, buffer, (size_t)bytes);

close(fd);

if ((ppd = ppdOpenFile(filename)) != NULL)
close(fd); // Close the temp fd since cupsGetFile will reopen it

if (cupsGetFile(http, uri, filename) != HTTP_STATUS_OK)
{
fprintf(stderr, "ERROR: Unable to get PPD file %s: %s\n",
uri, cupsGetErrorString());
}
else if ((ppd = ppdOpenFile(filename)) != NULL)
{
if (ppd->manufacturer)
cgiSetVariable("CURRENT_MAKE", ppd->manufacturer);
Expand All @@ -984,14 +972,6 @@ do_am_printer(http_t *http, /* I - HTTP connection */
filename, ppdErrorString(ppdLastError(&linenum)));
}
}
else
{
httpFlush(http);

fprintf(stderr,
"ERROR: Unable to create temporary file for PPD file: %s\n",
strerror(errno));
}
}

/*
Expand Down
Loading