summaryrefslogtreecommitdiff
path: root/nss/cmd/btoa/btoa.c
diff options
context:
space:
mode:
Diffstat (limited to 'nss/cmd/btoa/btoa.c')
-rw-r--r--nss/cmd/btoa/btoa.c194
1 files changed, 99 insertions, 95 deletions
diff --git a/nss/cmd/btoa/btoa.c b/nss/cmd/btoa/btoa.c
index 9416feb..2a5e6d4 100644
--- a/nss/cmd/btoa/btoa.c
+++ b/nss/cmd/btoa/btoa.c
@@ -9,8 +9,8 @@
#if defined(XP_WIN) || (defined(__sun) && !defined(SVR4))
#if !defined(WIN32)
-extern int fread(char *, size_t, size_t, FILE*);
-extern int fwrite(char *, size_t, size_t, FILE*);
+extern int fread(char *, size_t, size_t, FILE *);
+extern int fwrite(char *, size_t, size_t, FILE *);
extern int fprintf(FILE *, char *, ...);
#endif
#endif
@@ -20,16 +20,16 @@ extern int fprintf(FILE *, char *, ...);
#include "io.h"
#endif
-static PRInt32
-output_ascii (void *arg, const char *obuf, PRInt32 size)
+static PRInt32
+output_ascii(void *arg, const char *obuf, PRInt32 size)
{
FILE *outFile = arg;
int nb;
nb = fwrite(obuf, 1, size, outFile);
if (nb != size) {
- PORT_SetError(SEC_ERROR_IO);
- return -1;
+ PORT_SetError(SEC_ERROR_IO);
+ return -1;
}
return nb;
@@ -45,30 +45,32 @@ encode_file(FILE *outFile, FILE *inFile)
cx = NSSBase64Encoder_Create(output_ascii, outFile);
if (!cx) {
- return -1;
+ return -1;
}
for (;;) {
- if (feof(inFile)) break;
- nb = fread(ibuf, 1, sizeof(ibuf), inFile);
- if (nb != sizeof(ibuf)) {
- if (nb == 0) {
- if (ferror(inFile)) {
- PORT_SetError(SEC_ERROR_IO);
- goto loser;
- }
- /* eof */
- break;
- }
- }
-
- status = NSSBase64Encoder_Update(cx, ibuf, nb);
- if (status != SECSuccess) goto loser;
+ if (feof(inFile))
+ break;
+ nb = fread(ibuf, 1, sizeof(ibuf), inFile);
+ if (nb != sizeof(ibuf)) {
+ if (nb == 0) {
+ if (ferror(inFile)) {
+ PORT_SetError(SEC_ERROR_IO);
+ goto loser;
+ }
+ /* eof */
+ break;
+ }
+ }
+
+ status = NSSBase64Encoder_Update(cx, ibuf, nb);
+ if (status != SECSuccess)
+ goto loser;
}
status = NSSBase64Encoder_Destroy(cx, PR_FALSE);
if (status != SECSuccess)
- return status;
+ return status;
/*
* Add a trailing CRLF. Note this must be done *after* the call
@@ -78,28 +80,30 @@ encode_file(FILE *outFile, FILE *inFile)
fwrite("\r\n", 1, 2, outFile);
return SECSuccess;
- loser:
- (void) NSSBase64Encoder_Destroy(cx, PR_TRUE);
+loser:
+ (void)NSSBase64Encoder_Destroy(cx, PR_TRUE);
return status;
}
-static void Usage(char *progName)
+static void
+Usage(char *progName)
{
fprintf(stderr,
- "Usage: %s [-i input] [-o output]\n",
- progName);
+ "Usage: %s [-i input] [-o output]\n",
+ progName);
fprintf(stderr, "%-20s Define an input file to use (default is stdin)\n",
- "-i input");
+ "-i input");
fprintf(stderr, "%-20s Define an output file to use (default is stdout)\n",
- "-o output");
+ "-o output");
fprintf(stderr, "%-20s Wrap output in BEGIN/END lines and the given suffix\n",
- "-w suffix");
+ "-w suffix");
fprintf(stderr, "%-20s (use \"c\" as a shortcut for suffix CERTIFICATE)\n",
- "");
+ "");
exit(-1);
}
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
{
char *progName;
SECStatus rv;
@@ -112,88 +116,88 @@ int main(int argc, char **argv)
outFile = 0;
progName = strrchr(argv[0], '/');
if (!progName)
- progName = strrchr(argv[0], '\\');
- progName = progName ? progName+1 : argv[0];
+ progName = strrchr(argv[0], '\\');
+ progName = progName ? progName + 1 : argv[0];
/* Parse command line arguments */
optstate = PL_CreateOptState(argc, argv, "i:o:w:");
while ((status = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
- switch (optstate->option) {
- default:
- Usage(progName);
- break;
-
- case 'i':
- inFile = fopen(optstate->value, "rb");
- if (!inFile) {
- fprintf(stderr, "%s: unable to open \"%s\" for reading\n",
- progName, optstate->value);
- return -1;
- }
- break;
-
- case 'o':
- outFile = fopen(optstate->value, "wb");
- if (!outFile) {
- fprintf(stderr, "%s: unable to open \"%s\" for writing\n",
- progName, optstate->value);
- return -1;
- }
- break;
-
- case 'w':
- if (!strcmp(optstate->value, "c"))
- suffix = strdup("CERTIFICATE");
- else
- suffix = strdup(optstate->value);
- break;
- }
+ switch (optstate->option) {
+ default:
+ Usage(progName);
+ break;
+
+ case 'i':
+ inFile = fopen(optstate->value, "rb");
+ if (!inFile) {
+ fprintf(stderr, "%s: unable to open \"%s\" for reading\n",
+ progName, optstate->value);
+ return -1;
+ }
+ break;
+
+ case 'o':
+ outFile = fopen(optstate->value, "wb");
+ if (!outFile) {
+ fprintf(stderr, "%s: unable to open \"%s\" for writing\n",
+ progName, optstate->value);
+ return -1;
+ }
+ break;
+
+ case 'w':
+ if (!strcmp(optstate->value, "c"))
+ suffix = strdup("CERTIFICATE");
+ else
+ suffix = strdup(optstate->value);
+ break;
+ }
}
if (status == PL_OPT_BAD)
- Usage(progName);
+ Usage(progName);
if (!inFile) {
#if defined(WIN32)
- /* If we're going to read binary data from stdin, we must put stdin
- ** into O_BINARY mode or else incoming \r\n's will become \n's.
- */
-
- int smrv = _setmode(_fileno(stdin), _O_BINARY);
- if (smrv == -1) {
- fprintf(stderr,
- "%s: Cannot change stdin to binary mode. Use -i option instead.\n",
- progName);
- return smrv;
- }
+ /* If we're going to read binary data from stdin, we must put stdin
+ ** into O_BINARY mode or else incoming \r\n's will become \n's.
+ */
+
+ int smrv = _setmode(_fileno(stdin), _O_BINARY);
+ if (smrv == -1) {
+ fprintf(stderr,
+ "%s: Cannot change stdin to binary mode. Use -i option instead.\n",
+ progName);
+ return smrv;
+ }
#endif
- inFile = stdin;
+ inFile = stdin;
}
if (!outFile) {
#if defined(WIN32)
- /* We're going to write binary data to stdout. We must put stdout
- ** into O_BINARY mode or else outgoing \r\n's will become \r\r\n's.
- */
-
- int smrv = _setmode(_fileno(stdout), _O_BINARY);
- if (smrv == -1) {
- fprintf(stderr,
- "%s: Cannot change stdout to binary mode. Use -o option instead.\n",
- progName);
- return smrv;
- }
+ /* We're going to write binary data to stdout. We must put stdout
+ ** into O_BINARY mode or else outgoing \r\n's will become \r\r\n's.
+ */
+
+ int smrv = _setmode(_fileno(stdout), _O_BINARY);
+ if (smrv == -1) {
+ fprintf(stderr,
+ "%s: Cannot change stdout to binary mode. Use -o option instead.\n",
+ progName);
+ return smrv;
+ }
#endif
- outFile = stdout;
+ outFile = stdout;
}
if (suffix) {
- fprintf(outFile, "-----BEGIN %s-----\n", suffix);
+ fprintf(outFile, "-----BEGIN %s-----\n", suffix);
}
rv = encode_file(outFile, inFile);
if (rv != SECSuccess) {
- fprintf(stderr, "%s: lossage: error=%d errno=%d\n",
- progName, PORT_GetError(), errno);
- return -1;
+ fprintf(stderr, "%s: lossage: error=%d errno=%d\n",
+ progName, PORT_GetError(), errno);
+ return -1;
}
if (suffix) {
- fprintf(outFile, "-----END %s-----\n", suffix);
+ fprintf(outFile, "-----END %s-----\n", suffix);
}
return 0;
}
View Lorry Controller Status