Hello community,
here is the log from the commit of package cronie for openSUSE:Factory checked
in at 2019-11-15 22:31:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cronie (Old)
and /work/SRC/openSUSE:Factory/.cronie.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cronie"
Fri Nov 15 22:31:34 2019 rev:76 rq:747186 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/cronie/cronie.changes 2019-11-07
23:15:11.996447597 +0100
+++ /work/SRC/openSUSE:Factory/.cronie.new.26869/cronie.changes 2019-11-15
22:31:36.196091058 +0100
@@ -1,0 +2,7 @@
+Tue Nov 5 16:07:57 UTC 2019 - Kristyna Streitova <kstreit...@suse.com>
+
+- update cronie-nheader_lines.diff so it doesn't print the first 3
+ crontab lines (static comments) with the 'crontab -l' command
+ [bsc#1155114]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cronie-nheader_lines.diff ++++++
--- /var/tmp/diff_new_pack.ahBIyA/_old 2019-11-15 22:31:37.648090421 +0100
+++ /var/tmp/diff_new_pack.ahBIyA/_new 2019-11-15 22:31:37.656090417 +0100
@@ -11,7 +11,44 @@
#define COMMENT_COLOR "\x1B[34m"
#define RESET_COLOR "\033[0m"
-@@ -500,7 +500,7 @@ static void edit_cmd(void) {
+@@ -394,7 +394,7 @@ static void parse_args(int argc, char *a
+ static void list_cmd(void) {
+ char n[MAX_FNAME];
+ FILE *f;
+- int ch;
++ int ch, x;
+ const int is_tty = isatty(STDOUT);
+ int new_line = 1;
+
+@@ -411,9 +411,25 @@ static void list_cmd(void) {
+ exit(ERROR_EXIT);
+ }
+
+- /* file is open. copy to stdout, close.
+- */
+ Set_LineNum(1)
++
++ /* ignore the top few comments since we probably put them there.
++ */
++ x = 0;
++ while (EOF != (ch = get_char(f))) {
++ if ('#' != ch) {
++ putchar(ch);
++ break;
++ }
++ while (EOF != (ch = get_char(f)))
++ if (ch == '\n')
++ break;
++ if (++x >= NHEADER_LINES)
++ break;
++ }
++
++ /* copy the rest of the crontab (if any) to the stdout.
++ */
+ while (EOF != (ch = get_char(f))) {
+ if (is_tty && new_line) {
+ if (ch == '#') {
+@@ -500,7 +516,7 @@ static void edit_cmd(void) {
char n[MAX_FNAME], q[MAX_TEMPSTR];
const char *editor;
FILE *f;
@@ -20,7 +57,7 @@
struct stat statbuf;
struct utimbuf utimebuf;
WAIT_T waiter;
-@@ -552,13 +552,25 @@ static void edit_cmd(void) {
+@@ -552,13 +568,25 @@ static void edit_cmd(void) {
}
Set_LineNum(1)
@@ -53,7 +90,7 @@
while (EOF != (ch = get_char(f)))
putc(ch, NewCrontab);
-@@ -766,6 +778,7 @@ static int replace_cmd(void) {
+@@ -766,6 +794,7 @@ static int replace_cmd(void) {
int error = 0;
entry *e;
uid_t file_owner;
@@ -61,7 +98,7 @@
char **envp;
char *safename;
int envs = 0, entries = 0;
-@@ -796,10 +809,10 @@ static int replace_cmd(void) {
+@@ -796,10 +825,10 @@ static int replace_cmd(void) {
*
* VERY IMPORTANT: make sure NHEADER_LINES agrees with this code.
*/
