← Back to branch summary

~ubuntu-branches/ubuntu/saucy/mousepad/saucy

« back to all changes in this revision

Viewing changes to src/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2008-11-16 10:46:37 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20081116104637-iv3al5ksp2jt1egn
Tags: 0.2.14-0ubuntu1
* Merge with Debian Xfce UNRELEASED, remaining Ubuntu changes:
  - debian/control: demote xfprint4 from Recommends to Suggests

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.c
65
65
                return -1;
66
66
        
67
67
        /* version num */
68
 
        fgets(buf, sizeof(buf), fp);
 
68
        if (!fgets(buf, sizeof(buf), fp)) return -1;
69
69
        num = g_strsplit(buf, "." , 3);
70
70
        if ((atoi(num[1]) >= 1) && (atoi(num[2]) >= 0)) {
71
 
                fgets(buf, sizeof(buf), fp);
72
 
                sd->conf.width = atoi(buf);
73
 
                fgets(buf, sizeof(buf), fp);
74
 
                sd->conf.height = atoi(buf);
75
 
                fgets(buf, sizeof(buf), fp);
 
71
                if (!fgets(buf, sizeof(buf), fp)) return -1;
 
72
                if (buf[0] >= '0' && buf[0] <= '9')
 
73
                        sd->conf.width = atoi(buf);
 
74
                else
 
75
                        return -1;
 
76
 
 
77
                if (!fgets(buf, sizeof(buf), fp)) return -1;
 
78
                if (buf[0] >= '0' && buf[0] <= '9')
 
79
                        sd->conf.height = atoi(buf);
 
80
                else
 
81
                        return -1;
 
82
 
 
83
                if (!fgets(buf, sizeof(buf), fp)) return -1;
76
84
                sd->conf.fontname = g_strdup(buf);
77
 
                fgets(buf, sizeof(buf), fp);
78
 
                sd->conf.wordwrap = atoi(buf);
79
 
                fgets(buf, sizeof(buf), fp);
80
 
                sd->conf.linenumbers = atoi(buf);
81
 
                fgets(buf, sizeof(buf), fp);
82
 
                sd->conf.autoindent = atoi(buf);
83
 
                fgets(buf, sizeof(buf), fp);
 
85
 
 
86
                if (!fgets(buf, sizeof(buf), fp)) return -1;
 
87
                if (buf[0] >= '0' && buf[0] <= '1')
 
88
                        sd->conf.wordwrap = atoi(buf);
 
89
                else
 
90
                        return -1;
 
91
 
 
92
                if (!fgets(buf, sizeof(buf), fp)) return -1;
 
93
                if (buf[0] >= '0' && buf[0] <= '1')
 
94
                        sd->conf.linenumbers = atoi(buf);
 
95
                else
 
96
                        return -1;
 
97
 
 
98
                if (!fgets(buf, sizeof(buf), fp)) return -1;
 
99
                if (buf[0] >= '0' && buf[0] <= '1')
 
100
                        sd->conf.autoindent = atoi(buf);
 
101
                else
 
102
                        return -1;
 
103
 
 
104
                if (!fgets(buf, sizeof(buf), fp)) return -1;
84
105
                if (strcmp(buf, "0") != 0)
85
106
                        sd->conf.charset = g_strdup(buf);
86
107
        }