fc12c41ca3
either COMMENT or DESCR from the command line. When a port is installed, one gets both +COMMENT and +DESCR files with a trailing '\n' character. However, +COMMENT does not contain a trailing '\n' when it is installed from a package due to this behavior of pkg_create. Therefore, make sure it behaves exactly the same regardless of where got its information; either command line or files. The modified functions are used by pkg_create. PR: 52097 Reviewed by: bento, kris, portmgr, re, Michael Nottebrock <michaelnottebrock@gmx.net>, Martin Horcicka <horcicka@FreeBSD.cz> Approved by: re (scottl) MFC after: 1 week
130 lines
2.6 KiB
C
130 lines
2.6 KiB
C
/*
|
|
* FreeBSD install - a package for the installation and maintainance
|
|
* of non-core utilities.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* Jordan K. Hubbard
|
|
* 18 July 1993
|
|
*
|
|
* Miscellaneous string utilities.
|
|
*
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include "lib.h"
|
|
|
|
char *
|
|
strconcat(const char *s1, const char *s2)
|
|
{
|
|
static char tmp[FILENAME_MAX];
|
|
|
|
tmp[0] = '\0';
|
|
strncpy(tmp, s1 ? s1 : s2, FILENAME_MAX); /* XXX: what if both are NULL? */
|
|
if (s1 && s2)
|
|
strncat(tmp, s2, FILENAME_MAX - strlen(tmp));
|
|
return tmp;
|
|
}
|
|
|
|
/* Get a string parameter as a file spec or as a "contents follow -" spec */
|
|
char *
|
|
get_dash_string(char **str)
|
|
{
|
|
char *s = *str;
|
|
|
|
if (*s == '-')
|
|
*str = copy_string_adds_newline(s + 1);
|
|
else
|
|
*str = fileGetContents(s);
|
|
return *str;
|
|
}
|
|
|
|
/* Rather Obvious */
|
|
char *
|
|
copy_string(const char *str)
|
|
{
|
|
return (str ? strdup(str) : NULL);
|
|
}
|
|
|
|
/* Rather Obvious but adds a trailing \n newline */
|
|
char *
|
|
copy_string_adds_newline(const char *str)
|
|
{
|
|
if (str == NULL) {
|
|
return (NULL);
|
|
} else {
|
|
char *copy;
|
|
size_t line_length;
|
|
|
|
line_length = strlen(str) + 2;
|
|
if ((copy = malloc(line_length)) == NULL)
|
|
return (NULL);
|
|
memcpy(copy, str, line_length - 2);
|
|
copy[line_length - 2] = '\n'; /* Adds trailing \n */
|
|
copy[line_length - 1] = '\0';
|
|
|
|
return (copy);
|
|
}
|
|
}
|
|
|
|
/* Return TRUE if 'str' ends in suffix 'suff' */
|
|
Boolean
|
|
suffix(const char *str, const char *suff)
|
|
{
|
|
char *idx;
|
|
Boolean ret = FALSE;
|
|
|
|
idx = strrchr(str, '.');
|
|
if (idx && !strcmp(idx + 1, suff))
|
|
ret = TRUE;
|
|
return ret;
|
|
}
|
|
|
|
/* Assuming str has a suffix, brutally murder it! */
|
|
void
|
|
nuke_suffix(char *str)
|
|
{
|
|
char *idx;
|
|
|
|
idx = strrchr(str, '.');
|
|
if (idx)
|
|
*idx = '\0'; /* Yow! Don't try this on a const! */
|
|
}
|
|
|
|
/* Lowercase a whole string */
|
|
void
|
|
str_lowercase(char *str)
|
|
{
|
|
while (*str) {
|
|
*str = tolower(*str);
|
|
++str;
|
|
}
|
|
}
|
|
|
|
char *
|
|
get_string(char *str, int max, FILE *fp)
|
|
{
|
|
int len;
|
|
|
|
if (!str)
|
|
return NULL;
|
|
str[0] = '\0';
|
|
while (fgets(str, max, fp)) {
|
|
len = strlen(str);
|
|
while (len && isspace(str[len - 1]))
|
|
str[--len] = '\0';
|
|
if (len)
|
|
return str;
|
|
}
|
|
return NULL;
|
|
}
|