projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We don't want to use copy() anymore; but kept it for concat() only
[mmh]
/
uip
/
annosbr.c
diff --git
a/uip/annosbr.c
b/uip/annosbr.c
index
db74870
..
e48f7d9
100644
(file)
--- a/
uip/annosbr.c
+++ b/
uip/annosbr.c
@@
-17,7
+17,7
@@
/*
** static prototypes
*/
/*
** static prototypes
*/
-static int annosbr (int, char *, char *, char *, int, int, int, int);
+static int annosbr(int, char *, char *, char *, int, int, int, int);
/*
** This "local" global and the annopreserve() function are a hack that
/*
** This "local" global and the annopreserve() function are a hack that
@@
-29,7
+29,7
@@
static int annosbr (int, char *, char *, char *, int, int, int, int);
static int preserve_actime_and_modtime = 0;
int
static int preserve_actime_and_modtime = 0;
int
-annotate (char *file, char *comp, char *text, int inplace, int datesw,
+annotate(char *file, char *comp, char *text, int inplace, int datesw,
int delete, int append)
{
int i, fd;
int delete, int append)
{
int i, fd;
@@
-37,13
+37,13
@@
annotate (char *file, char *comp, char *text, int inplace, int datesw,
struct stat s;
/* open and lock the file to be annotated */
struct stat s;
/* open and lock the file to be annotated */
- if ((fd = lkopen (file, O_RDWR, 0)) == NOTOK) {
+ if ((fd = lkopen(file, O_RDWR, 0)) == NOTOK) {
switch (errno) {
case ENOENT:
break;
default:
switch (errno) {
case ENOENT:
break;
default:
- admonish (file, "unable to lock and open");
+ admonish(file, "unable to lock and open");
break;
}
return 1;
break;
}
return 1;
@@
-57,12
+57,12
@@
annotate (char *file, char *comp, char *text, int inplace, int datesw,
b.actime = s.st_atime;
b.modtime = s.st_mtime;
b.actime = s.st_atime;
b.modtime = s.st_mtime;
- i = annosbr (fd, file, comp, text, inplace, datesw, delete, append);
+ i = annosbr(fd, file, comp, text, inplace, datesw, delete, append);
if (preserve_actime_and_modtime && utime(file, &b) == -1)
advise("can't set access and modification times for %s", file);
if (preserve_actime_and_modtime && utime(file, &b) == -1)
advise("can't set access and modification times for %s", file);
- lkclose (fd, file);
+ lkclose(fd, file);
return i;
}
return i;
}
@@
-162,7
+162,7
@@
annopreserve(int preserve)
}
static int
}
static int
-annosbr (int fd, char *file, char *comp, char *text, int inplace,
+annosbr(int fd, char *file, char *comp, char *text, int inplace,
int datesw, int delete, int append)
{
int mode, tmpfd;
int datesw, int delete, int append)
{
int mode, tmpfd;
@@
-178,10
+178,10
@@
annosbr (int fd, char *file, char *comp, char *text, int inplace,
int length; /* length of field name */
int n; /* number of bytes written */
int length; /* length of field name */
int n; /* number of bytes written */
- mode = fstat (fd, &st) != NOTOK ? (st.st_mode & 0777) : m_gmprot ();
+ mode = fstat(fd, &st) != NOTOK ? (st.st_mode & 0777) : m_gmprot();
- strncpy (tmpfil, m_mktemp2(file, "annotate", NULL, &tmp), sizeof(tmpfil));
- chmod (tmpfil, mode);
+ strncpy(tmpfil, m_mktemp2(file, "annotate", NULL, &tmp), sizeof(tmpfil));
+ chmod(tmpfil, mode);
/*
** We're going to need to copy some of the message file to the
/*
** We're going to need to copy some of the message file to the
@@
-373,7
+373,7
@@
annosbr (int fd, char *file, char *comp, char *text, int inplace,
}
if (datesw)
}
if (datesw)
- fprintf (tmp, "%s: %s\n", comp, dtimenow (0));
+ fprintf(tmp, "%s: %s\n", comp, dtimenow(0));
if ((cp = text)) {
do {
while (*cp == ' ' || *cp == '\t')
if ((cp = text)) {
do {
while (*cp == ' ' || *cp == '\t')
@@
-382,14
+382,14
@@
annosbr (int fd, char *file, char *comp, char *text, int inplace,
while (*cp && *cp++ != '\n')
continue;
if (cp - sp)
while (*cp && *cp++ != '\n')
continue;
if (cp - sp)
- fprintf (tmp, "%s: %*.*s", comp, (int)(cp - sp), (int)(cp - sp), sp);
+ fprintf(tmp, "%s: %*.*s", comp, (int)(cp - sp), (int)(cp - sp), sp);
} while (*cp);
if (cp[-1] != '\n' && cp != text)
} while (*cp);
if (cp[-1] != '\n' && cp != text)
- putc ('\n', tmp);
+ putc('\n', tmp);
}
}
}
}
- fflush (tmp);
+ fflush(tmp);
/*
** We've been messing with the input file position. Move the
/*
** We've been messing with the input file position. Move the
@@
-403,14
+403,14
@@
annosbr (int fd, char *file, char *comp, char *text, int inplace,
adios(NULL, "can't seek.");
}
adios(NULL, "can't seek.");
}
- cpydata (fd, fileno (tmp), file, tmpfil);
- fclose (tmp);
+ cpydata(fd, fileno(tmp), file, tmpfil);
+ fclose(tmp);
if (inplace) {
if (inplace) {
- if ((tmpfd = open (tmpfil, O_RDONLY)) == NOTOK)
- adios (tmpfil, "unable to open for re-reading");
+ if ((tmpfd = open(tmpfil, O_RDONLY)) == NOTOK)
+ adios(tmpfil, "unable to open for re-reading");
- lseek (fd, (off_t) 0, SEEK_SET);
+ lseek(fd, (off_t) 0, SEEK_SET);
/*
** We're making the file shorter if we're deleting a
/*
** We're making the file shorter if we're deleting a
@@
-421,25
+421,25
@@
annosbr (int fd, char *file, char *comp, char *text, int inplace,
if (delete >= -1 && ftruncate(fd, 0) == -1)
adios(tmpfil, "unable to truncate.");
if (delete >= -1 && ftruncate(fd, 0) == -1)
adios(tmpfil, "unable to truncate.");
- cpydata (tmpfd, fd, tmpfil, file);
- close (tmpfd);
- unlink (tmpfil);
+ cpydata(tmpfd, fd, tmpfil, file);
+ close(tmpfd);
+ unlink(tmpfil);
} else {
} else {
- strncpy (buffer, m_backup (file), sizeof(buffer));
- if (rename (file, buffer) == NOTOK) {
+ strncpy(buffer, m_backup(file), sizeof(buffer));
+ if (rename(file, buffer) == NOTOK) {
switch (errno) {
case ENOENT: /* unlinked early - no annotations */
switch (errno) {
case ENOENT: /* unlinked early - no annotations */
- unlink (tmpfil);
+ unlink(tmpfil);
break;
default:
break;
default:
- admonish (buffer, "unable to rename %s to", file);
+ admonish(buffer, "unable to rename %s to", file);
break;
}
return 1;
}
break;
}
return 1;
}
- if (rename (tmpfil, file) == NOTOK) {
- admonish (file, "unable to rename %s to", tmpfil);
+ if (rename(tmpfil, file) == NOTOK) {
+ admonish(file, "unable to rename %s to", tmpfil);
return 1;
}
}
return 1;
}
}